人员档案补充筛选条件

DataBase/版本日志/SUBQHSE_V2025-06-09.sql

@@ -0,0 +1,104 @@
+
+GO
+
+ALTER VIEW [dbo].[View_SitePerson_Person]
+AS
+SELECT Person.PersonId,
+	Person.CardNo,
+	Person.PersonName,
+	Person.Sex, 
+	(Case Person.Sex WHEN '1' THEN '男' WHEN '2' THEN '女' ELSE '' END) AS SexName, 
+	Person.IdentityCard, 
+	Person.Address, 
+	Person.ProjectId, 
+	Person.UnitId, 
+	Person.Birthday,
+	Person.TeamGroupId, 
+	Person.WorkAreaId, 
+	Person.WorkPostId, 	
+	Person.InTime, 
+	Person.OutTime, 
+	Person.OutResult, 
+	Person.Telephone, 
+	Person.PositionId, 
+	Person.PostTitleId, 
+	Person.PhotoUrl, 
+	Person.IsUsed,
+	(CASE Person.IsUsed WHEN 'TRUE' THEN '是' ELSE '否' END) AS IsUsedName, 
+	Person.IsCardUsed, 
+	(CASE Person.IsCardUsed WHEN 'TRUE' THEN '是' ELSE '否' END) AS IsCardUsedName, 
+	Person.PersonIndex,
+	Project.ProjectCode,
+	Project.ProjectName,
+	Unit.UnitCode,
+	Unit.UnitName,
+	TeamGroup.TeamGroupName,
+	--WorkArea.UnitWorkCode AS WorkAreaCode,
+	WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),
+	--WorkArea.UnitWorkName AS WorkAreaName
+	WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),
+	Post.WorkPostName,
+	Position.PositionName,
+	Title.PostTitleName,
+	Depart.DepartName,
+	Post.PostType,
+	Post.IsHsse,
+	Post.IsCQMS,
+	(SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T WHERE T.PersonId=Person.PersonId) AS TrainCount,
+	Person.AuditorId,
+	sysUser.UserName AS AuditorName,
+	Person.AuditorDate,
+	Person.IDCardUrl,
+	Person.IsForeign,
+	case when Person.IsForeign=1 then '是' else '否' end as IsForeignStr,
+	Person.IdcardType,
+	BasicData1.dictName as IdcardTypeName,
+	Person.IdcardStartDate,
+	Person.IdcardEndDate,
+	Person.IdcardForever,
+	case when Person.IdcardForever='Y' then '是' else '否' end as IdcardForeverStr,
+	Person.PoliticsStatus,
+	BasicData2.dictName as PoliticsStatusName,
+	Person.IdcardAddress,
+	Person.Nation,
+	BasicData3.dictName as NationName,
+	Person.EduLevel,
+	BasicData4.dictName as EduLevelName,
+	Person.MaritalStatus,
+	BasicData5.dictName as MaritalStatusName,
+	Person.CountryCode,
+	Country.cname as CountryName,
+	Person.ProvinceCode,
+	City.cname as ProvinceName,
+	Person.MainCNProfessionalId,
+	CNProfessional.ProfessionalName as MainCNProfessionalName,
+	Person.ViceCNProfessionalId,
+	'' as ViceCNProfessionalName,
+	Person.IsOutside,
+	case when Person.IsOutside=1 then '是' else '否' end as IsOutsideStr,
+	Person.HeadImage,
+	RealNameAddTime,
+	Person.IsBlacklist
+FROM SitePerson_Person AS Person
+LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId
+LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
+LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId
+--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId
+LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId
+LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId
+Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId
+Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId
+Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId
+Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType
+Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus
+Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation
+Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel
+Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus
+Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode
+Left JOIN RealName_City AS City ON City.provinceCode = Person.ProvinceCode AND Country.CountryId=City.countryId
+Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId
+
+
+GO
+
+

SGGL/BLL/HSSE/SitePerson/PersonService.cs

@@ -122,7 +122,7 @@ namespace BLL
         /// <param name="PageSize">每页数量</param>
         /// <returns></returns>
         public static IEnumerable getListData(string projectId, string unitId, string personName, string identityCard, string treamGroupId, string workPostIds,
-                    bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, bool chManager, Grid Grid1,bool isBlack=false)
+                    bool ckTrain, string postType, bool ckJT, bool ckIdCardInfoNotOK, bool chManager, bool isHsse, bool isCQMS, Grid Grid1,bool isBlack=false)
         {
             IQueryable<Model.View_SitePerson_Person> getPersonList = getPersonLists.Where(x => x.ProjectId == projectId);
             if (!string.IsNullOrEmpty(unitId))
@@ -184,6 +184,14 @@ namespace BLL
             {
                 getPersonList = getPersonList.Where(x => x.PostType == Const.PostType_1);
             }
+            if (isHsse == true)
+            {
+                getPersonList = getPersonList.Where(x => x.IsHsse == true);
+            }
+            if (isCQMS == true)
+            {
+                getPersonList = getPersonList.Where(x => x.IsCQMS == true);
+            }
             if (ckIdCardInfoNotOK)
             {
                 getPersonList = getPersonList.Where(x => x.IdentityCard == null || x.HeadImage == null || (x.IdentityCard.Length != 15 && x.IdentityCard.Length != 18));

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

@@ -32,6 +32,12 @@
                                             Width="200px" LabelWidth="70px"
                                             LabelAlign="right">
                                         </f:TextBox>
+                                        <f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
+                                            AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
+                                        </f:CheckBox>
+                                        <f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
+                                            AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
+                                        </f:CheckBox>
                                         <f:ToolbarFill runat="server">
                                         </f:ToolbarFill>
                                         <f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
@@ -51,10 +57,10 @@
                                         <f:CheckBox runat="server" ID="chManager" Label="管理人员" LabelAlign="right" LabelWidth="80px"
                                             AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
                                         </f:CheckBox>
-                                        <f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
+                                        <f:CheckBox runat="server" ID="chIsHsse" Label="安管人员" LabelAlign="right" LabelWidth="80px"
                                             AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
                                         </f:CheckBox>
-                                        <f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
+                                        <f:CheckBox runat="server" ID="chIsCQMS" Label="质量管理" LabelAlign="right" LabelWidth="80px"
                                             AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
                                         </f:CheckBox>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>   

SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs

@@ -77,7 +77,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
 
                 var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
                 "", Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
-                 false, this.chManager.Checked, Grid1, true);
+                 false, this.chManager.Checked, this.chIsHsse.Checked, this.chIsCQMS.Checked, Grid1, true);
                 Grid1.RecordCount = PersonService.count;
                 Grid1.DataSource = getData;
                 Grid1.DataBind();

SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.designer.cs

@@ -86,6 +86,24 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdentityCard;
 
+        /// <summary>
+        /// ckJT 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckJT;
+
+        /// <summary>
+        /// ckTrain 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckTrain;
+
         /// <summary>
         /// btSearch 控件。
         /// </summary>
@@ -123,22 +141,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
         protected global::FineUIPro.CheckBox chManager;
 
         /// <summary>
-        /// ckJT 控件。
+        /// chIsHsse 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.CheckBox ckJT;
+        protected global::FineUIPro.CheckBox chIsHsse;
 
         /// <summary>
-        /// ckTrain 控件。
+        /// chIsCQMS 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.CheckBox ckTrain;
+        protected global::FineUIPro.CheckBox chIsCQMS;
 
         /// <summary>
         /// ToolbarFill1 控件。

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

@@ -65,6 +65,15 @@
                                             Width="200px" LabelWidth="70px"
                                             LabelAlign="right">
                                         </f:TextBox>
+                                        <f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
+                                            AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
+                                        </f:CheckBox>
+                                        <f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
+                                            AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
+                                        </f:CheckBox>
+                                        <f:CheckBox runat="server" ID="ckIdCardInfoNotOK" Label="信息不全" LabelAlign="right" LabelWidth="80px"
+                                            AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
+                                        </f:CheckBox>
                                         <f:ToolbarFill runat="server">
                                         </f:ToolbarFill>
                                         <f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
@@ -85,13 +94,10 @@
                                         <f:CheckBox runat="server" ID="chManager" Label="管理人员" LabelAlign="right" LabelWidth="80px"
                                             AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
                                         </f:CheckBox>
-                                        <f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
+                                        <f:CheckBox runat="server" ID="chIsHsse" Label="安管人员" LabelAlign="right" LabelWidth="80px"
                                             AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
                                         </f:CheckBox>
-                                        <f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
+                                        <f:CheckBox runat="server" ID="chIsCQMS" Label="质量管理" LabelAlign="right" LabelWidth="80px"
-                                            AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
-                                        </f:CheckBox>
-                                        <f:CheckBox runat="server" ID="ckIdCardInfoNotOK" Label="信息不全" LabelAlign="right" LabelWidth="80px"
                                             AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
                                         </f:CheckBox>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>                                        

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs

@@ -182,7 +182,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
 
                 var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
                  this.drpTreamGroup.SelectedValue, Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
-                 this.ckIdCardInfoNotOK.Checked, this.chManager.Checked, Grid1);
+                 this.ckIdCardInfoNotOK.Checked, this.chManager.Checked, this.chIsHsse.Checked, this.chIsCQMS.Checked, Grid1);
                 Grid1.RecordCount = PersonService.count;
                 Grid1.DataSource = getData;
                 Grid1.DataBind();

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs

@@ -140,6 +140,33 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </remarks>
         protected global::FineUIPro.TextBox txtIdentityCard;
 
+        /// <summary>
+        /// ckJT 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckJT;
+
+        /// <summary>
+        /// ckTrain 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckTrain;
+
+        /// <summary>
+        /// ckIdCardInfoNotOK 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
+
         /// <summary>
         /// btSearch 控件。
         /// </summary>
@@ -186,31 +213,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
         protected global::FineUIPro.CheckBox chManager;
 
         /// <summary>
-        /// ckJT 控件。
+        /// chIsHsse 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.CheckBox ckJT;
+        protected global::FineUIPro.CheckBox chIsHsse;
 
         /// <summary>
-        /// ckTrain 控件。
+        /// chIsCQMS 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.CheckBox ckTrain;
+        protected global::FineUIPro.CheckBox chIsCQMS;
-
-        /// <summary>
-        /// ckIdCardInfoNotOK 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
 
         /// <summary>
         /// ToolbarFill1 控件。

SGGL/Model/Model.cs

@@ -449643,6 +449643,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsHsse;
 		
+		private System.Nullable<bool> _IsCQMS;
+		
 		private System.Nullable<int> _TrainCount;
 		
 		private string _AuditorId;
@@ -450325,6 +450327,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCQMS", DbType="Bit")]
+		public System.Nullable<bool> IsCQMS
+		{
+			get
+			{
+				return this._IsCQMS;
+			}
+			set
+			{
+				if ((this._IsCQMS != value))
+				{
+					this._IsCQMS = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainCount", DbType="Int")]
 		public System.Nullable<int> TrainCount
 		{