Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/BLL/BaseInfo/CertificateService.cs

@@ -34,6 +34,7 @@ namespace BLL
                 CertificateName = certificate.CertificateName,
                 CertificateType = certificate.CertificateType,
                 IsRegisterHSSE = certificate.IsRegisterHSSE,
+                Type= certificate.Type,
                 Remark = certificate.Remark
             };
             db.Base_Certificate.InsertOnSubmit(newCertificate);
@@ -54,6 +55,7 @@ namespace BLL
                 newCertificate.CertificateName = certificate.CertificateName;
                 newCertificate.CertificateType = certificate.CertificateType;
                 newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE;
+                newCertificate.Type = certificate.Type;
                 newCertificate.Remark = certificate.Remark;
                 db.SubmitChanges();
             }

SGGL/BLL/DropListService.cs

@@ -34,6 +34,10 @@
             {
                 dropName.DataSource = HSSE_getContractType();
             }
+            else if (groupId == Group_CertificateType)
+            {
+                dropName.DataSource = HSSE_getCertificateType();
+            }
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -102,6 +106,11 @@
         /// 合同类型 组id
         /// </summary>
         public const string Group_ContractType = "ContractType";
+
+        /// <summary>
+        /// 证书类型 组id
+        /// </summary>
+        public const string Group_CertificateType = "CertificateType";
         #endregion 
 
         #region 公共平台
@@ -348,6 +357,20 @@
             list[2] = new ListItem("以完成一定工作量", "3");
             return list;
         }
+
+        /// <summary>
+        /// 证书类型
+        /// </summary>
+        /// <returns></returns>
+        public static ListItem[] HSSE_getCertificateType()
+        {
+            ListItem[] list = new ListItem[4];
+            list[0] = new ListItem("特岗", "1");
+            list[1] = new ListItem("安管", "2");
+            list[2] = new ListItem("特种设备", "3");
+            list[3] = new ListItem("其他", "-1");
+            return list;
+        }
         #endregion
 
         #endregion

SGGL/BLL/Person/Person_PersonsService.cs

@@ -59,10 +59,9 @@ namespace BLL
             }
             if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
             {
-                getDataList = from x in getDataList
-                              join y in db.SitePerson_PersonItem on x.PersonId equals y.PersonId
-                              where y.ProjectId == projetcId && !y.OutTime.HasValue
-                              select x;
+                var idLists=(from x in db.SitePerson_PersonItem where x.ProjectId == projetcId && !x.OutTime.HasValue
+                            select x.PersonId).Distinct().ToList();
+                getDataList = getDataList.Where(x => idLists.Contains(x.PersonId));
             }
 
             if (!string.IsNullOrEmpty(personType) && personType != Const._Null)