From 969c81925b3aad43bd65c032a2a88c3b118ae576 Mon Sep 17 00:00:00 2001 From: Frane Date: Sun, 29 Aug 2021 12:41:15 +0800 Subject: [PATCH] 20210829 --- DataBase/版本日志/SGGLDB_V2021-08-29-001.sql | 11 ++++++++ .../HSSE/SitePerson/PersonIn.aspx.cs | 4 +++ .../HSSE/SitePerson/PersonInfo.aspx | 6 +---- .../HSSE/SitePerson/PersonInfoEdit.aspx.cs | 15 +++-------- .../ZHGL/RealName/SynchroSet.aspx.cs | 27 +++++++++++++++++-- 5 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2021-08-29-001.sql diff --git a/DataBase/版本日志/SGGLDB_V2021-08-29-001.sql b/DataBase/版本日志/SGGLDB_V2021-08-29-001.sql new file mode 100644 index 00000000..8889819f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-08-29-001.sql @@ -0,0 +1,11 @@ +ALTER TABLE [dbo].[SitePerson_Checking] DROP CONSTRAINT [FK_SitePerson_Checking_WBS_UnitWork] +GO + +alter table [dbo].[SitePerson_Checking] alter column WorkAreaId nvarchar(max) +go +alter table [dbo].[SitePerson_Checking] alter column IdentityCard nvarchar(50) +go +alter table [dbo].[SitePerson_Checking] alter column Address nvarchar(2000) +go +alter table [dbo].[SitePerson_Checking] alter column WorkAreaName nvarchar(max) +go \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs index 096a6fa7..0ee77d6c 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs @@ -250,6 +250,10 @@ namespace FineUIPro.Web.HSSE.SitePerson { result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "[" + col4 + "]已存在！" + "|"; } + if (!IDCardValid.CheckIDCard(col4)) + { + result += "第" + (i + 2).ToString() + "行," + "身份证号码" + "," + "[" + col4 + "]非法！" + "|"; + } } else { diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx index b4e90ec9..b09316e1 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx @@ -90,7 +90,6 @@ - @@ -133,10 +132,7 @@ function reloadGrid() { __doPostBack(null, 'reloadGrid'); } - - function onGridDataLoad(event) { - this.mergeColumns(['UnitName']); - } + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs index 0613b768..9668d231 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfoEdit.aspx.cs @@ -120,11 +120,7 @@ namespace FineUIPro.Web.HSSE.SitePerson if (person != null) { idCards += person.IdentityCard + ","; - workAreaIds += person.WorkAreaId; - if (!string.IsNullOrEmpty(person.WorkAreaId)) - { - workAreaNames += BLL.UnitWorkService.getUnitWorkByUnitWorkId(person.WorkAreaId).UnitWorkName + ","; - } + workAreaIds += person.WorkAreaId; } } if (!string.IsNullOrEmpty(idCards)) @@ -134,11 +130,8 @@ namespace FineUIPro.Web.HSSE.SitePerson if (!string.IsNullOrEmpty(workAreaIds)) { this.drpWorkArea.SelectedValueArray = workAreaIds.Split(','); - } - if (!string.IsNullOrEmpty(workAreaNames)) - { - this.txtWorkArea.Text = workAreaNames.Substring(0, workAreaNames.LastIndexOf(',')); - } + this.txtWorkArea.Text = UnitWorkService.GetUnitWorkName(workAreaIds); + } } } #endregion @@ -258,7 +251,7 @@ namespace FineUIPro.Web.HSSE.SitePerson if (!string.IsNullOrEmpty(person.WorkAreaId)) { personInfo.WorkAreaId = person.WorkAreaId; - personInfo.WorkAreaName = BLL.UnitWorkService.getUnitWorkByUnitWorkId(person.WorkAreaId).UnitWorkName; + personInfo.WorkAreaName = BLL.UnitWorkService.GetUnitWorkName(person.WorkAreaId); } } personInfo.Address = this.txtAddress.Text.Trim(); diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs index 87f776d2..bd06966f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs @@ -109,6 +109,7 @@ namespace FineUIPro.Web.ZHGL.RealName } #endregion + #region 推送参建企业 /// /// 推送参建企业 /// @@ -118,7 +119,9 @@ namespace FineUIPro.Web.ZHGL.RealName { ShowNotify(BLL.SynchroSetService.PushCollCompany(), MessageBoxIcon.Information); } + #endregion + #region 推送项目参建单位 /// /// 推送项目参建单位 /// @@ -139,7 +142,9 @@ namespace FineUIPro.Web.ZHGL.RealName ShowNotify("当前项目还没有与实名制对接！", MessageBoxIcon.Information); } } + #endregion + #region 推送施工队 /// /// 推送施工队 /// @@ -160,6 +165,7 @@ namespace FineUIPro.Web.ZHGL.RealName ShowNotify("当前项目还没有与实名制对接！", MessageBoxIcon.Information); } } + #endregion /// /// 推送人员信息 @@ -301,8 +307,9 @@ namespace FineUIPro.Web.ZHGL.RealName } } + #region 考勤记录 去重 /// - /// + /// 考勤记录 去重 /// /// /// @@ -369,7 +376,14 @@ namespace FineUIPro.Web.ZHGL.RealName return; } } + #endregion + #region 人员批量单条推送 + /// + /// 新增 + /// + /// + /// protected void btnAllPushData_Click(object sender, EventArgs e) { string message = string.Empty; @@ -399,6 +413,8 @@ namespace FineUIPro.Web.ZHGL.RealName } } } + + SynchroSetService.InsertRealNamePushLog(projectId, proCode, "单条人员批量推送（增加）", "推送完成", null, message); if (string.IsNullOrEmpty(message)) { ShowNotify("同步完成！" + count.ToString() + "条", MessageBoxIcon.Success); @@ -408,7 +424,11 @@ namespace FineUIPro.Web.ZHGL.RealName Alert.ShowInParent("同步完成！" + count.ToString() + "条；" + message, MessageBoxIcon.Warning); } } - + /// + /// 更新 + /// + /// + /// protected void btnUpdate_Click(object sender, EventArgs e) { string message = string.Empty; @@ -438,6 +458,8 @@ namespace FineUIPro.Web.ZHGL.RealName } } } + + SynchroSetService.InsertRealNamePushLog(projectId, proCode, "单条人员批量推送（更新）", "推送完成", null, message); if (string.IsNullOrEmpty(message)) { ShowNotify("同步完成！" + count.ToString() + "条", MessageBoxIcon.Success); @@ -447,5 +469,6 @@ namespace FineUIPro.Web.ZHGL.RealName Alert.ShowInParent("同步完成！" + count.ToString() + "条；" + message, MessageBoxIcon.Warning); } } + #endregion } } \ No newline at end of file