20210829

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

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
                         {

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonInfo.aspx

@@ -90,7 +90,6 @@
                         </f:TemplateField>
                     </Columns>
                     <Listeners>
-                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                     </Listeners>
                     <PageItems>
@@ -133,10 +132,7 @@
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
-
+     
-        function onGridDataLoad(event) {
-            this.mergeColumns(['UnitName']);
-        }
     </script>
 </body>
 </html>

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;
+                        workAreaIds += person.WorkAreaId;                   
-                        if (!string.IsNullOrEmpty(person.WorkAreaId))
-                        {
-                            workAreaNames += BLL.UnitWorkService.getUnitWorkByUnitWorkId(person.WorkAreaId).UnitWorkName + ",";
-                        }
                     }
                 }
                 if (!string.IsNullOrEmpty(idCards))
@@ -134,11 +130,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
                 if (!string.IsNullOrEmpty(workAreaIds))
                 {
                     this.drpWorkArea.SelectedValueArray = workAreaIds.Split(',');
-                }
+                    this.txtWorkArea.Text = UnitWorkService.GetUnitWorkName(workAreaIds);
-                if (!string.IsNullOrEmpty(workAreaNames))
+                }              
-                {
-                    this.txtWorkArea.Text = workAreaNames.Substring(0, workAreaNames.LastIndexOf(','));
-                }
             }
         }
         #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();

SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs

@@ -109,6 +109,7 @@ namespace FineUIPro.Web.ZHGL.RealName
         }
         #endregion
 
+        #region 推送参建企业
         /// <summary>
         /// 推送参建企业
         /// </summary>
@@ -118,7 +119,9 @@ namespace FineUIPro.Web.ZHGL.RealName
         {
             ShowNotify(BLL.SynchroSetService.PushCollCompany(), MessageBoxIcon.Information);
         }
+        #endregion
 
+        #region 推送项目参建单位
         /// <summary>
         /// 推送项目参建单位
         /// </summary>
@@ -139,7 +142,9 @@ namespace FineUIPro.Web.ZHGL.RealName
                 ShowNotify("当前项目还没有与实名制对接！", MessageBoxIcon.Information);
             }
         }
+        #endregion
 
+        #region 推送施工队
         /// <summary>
         /// 推送施工队
         /// </summary>
@@ -160,6 +165,7 @@ namespace FineUIPro.Web.ZHGL.RealName
                 ShowNotify("当前项目还没有与实名制对接！", MessageBoxIcon.Information);
             }
         }
+        #endregion
 
         /// <summary>
         /// 推送人员信息
@@ -301,8 +307,9 @@ namespace FineUIPro.Web.ZHGL.RealName
             }
         }
 
+        #region 考勤记录 去重
         /// <summary>
-        /// 
+        ///  考勤记录 去重
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -369,7 +376,14 @@ namespace FineUIPro.Web.ZHGL.RealName
                 return;
             }
         }
+        #endregion
 
+        #region 人员批量单条推送
+        /// <summary>
+        ///  新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         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);
             }
         }
-
+        /// <summary>
+        /// 更新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         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
     }
 }