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

SGGL/BLL/API/CQMS/Performance/PerformanceService.cs

@@ -74,6 +74,36 @@ namespace BLL
             }
         }
 
+        /// <summary>
+        /// 用户下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="projectId">项目id</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitUserDropDownListByUser(FineUIPro.DropDownList dropName, string projectId,string userId, bool isShowPlease)
+        {
+            dropName.DataValueField = "CreateMan";
+            dropName.DataTextField = "CreateManName";
+            dropName.DataSource = GetProjectUserListByProjectId(projectId, userId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
+        public static void InitAllUserDropDownList(FineUIPro.DropDownList dropName,  bool isShowPlease)
+        {
+            dropName.DataValueField = "CreateMan";
+            dropName.DataTextField = "CreateManName";
+            dropName.DataSource = GetProjectAllUserListByProjectId();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
         public class PerformanceUser {
             public string CreateMan { get; set; }
 
@@ -94,5 +124,39 @@ namespace BLL
             }
         }
 
+        public static List<PerformanceUser> GetProjectUserListByProjectId(string projectId,string userId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var list = (from x in db.CQMS_Performance
+                            join y in db.Sys_User on x.CreateMan equals y.UserId
+                            where x.ProjectId == projectId && x.States == "1" && x.ScorMan== userId
+                            select new PerformanceUser
+                            {
+                                CreateMan = x.CreateMan,
+                                CreateManName = BLL.UserService.GetUserByUserId(x.CreateMan).UserName
+                            }).ToList();
+                return list;
+            }
+        }
+
+
+        public static List<PerformanceUser> GetProjectAllUserListByProjectId()
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var list = (from x in db.CQMS_Performance
+                            join y in db.Sys_User on x.CreateMan equals y.UserId
+                            where x.States == "1"
+                            select new PerformanceUser
+                            {
+                                CreateMan = x.CreateMan,
+                                CreateManName = BLL.UserService.GetUserByUserId(x.CreateMan).UserName
+                            }).Distinct().ToList();
+                
+                return list;
+            }
+        }
+
     }
 }

SGGL/BLL/BLL.csproj

@@ -1016,7 +1016,7 @@
       <Version>2.1.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
+      <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="NPOI">
       <Version>2.5.5</Version>

SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs

@@ -421,5 +421,10 @@ namespace BLL
                 return false;
             }
         }
+
+        public static Model.WBS_BreakdownProject GetBreakdownProjectByName(string divisionProjectId, string breakdownName)
+        {
+            return Funs.DB.WBS_BreakdownProject.FirstOrDefault(x => x.DivisionProjectId == divisionProjectId && x.BreakdownName == breakdownName);
+        }
     }
 }

SGGL/BLL/CQMS/WBS/DivisionProjectService.cs

@@ -189,5 +189,26 @@ namespace BLL
                 return false;
             }
         }
+
+        /// <summary>
+        /// 根据分部id获取下级项
+        /// </summary>
+        /// <param name="divisionProjectId"></param>
+        /// <returns></returns>
+        public static List<Model.WBS_DivisionProject> GetDivisionProjectBySupId(string divisionProjectId)
+        {
+            return (from x in Funs.DB.WBS_DivisionProject where x.SuperDivisionId == divisionProjectId select x).ToList();
+        }
+
+        /// <summary>
+        /// 根据分部名称获取信息
+        /// </summary>
+        /// <param name="divisionName"></param>
+        /// <returns></returns>
+        public static Model.WBS_DivisionProject GetDivisionProjectByName(string CNProfessionalId, string unitWorkId,string superDivisionId, string divisionName)
+        {
+            var q = Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.CNProfessionalId == CNProfessionalId && x.UnitWorkId == unitWorkId && x.SuperDivisionId==superDivisionId && x.DivisionName == divisionName);
+            return q;
+        }
     }
 }

SGGL/BLL/HSSE/SitePerson/PersonService.cs

@@ -384,9 +384,9 @@ namespace BLL
         /// </summary>
         /// <param name="unitId">单位Id</param>
         /// <returns>人员的数量</returns>
-        public static int GetPersonCountByUnitId(string unitId, string projectId, bool isOutside)
+        public static int GetPersonCountByUnitId(string unitId, string projectId, DateTime inTime, bool isOutside)
         {
-            var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && x.IsUsed == true && x.IsOutside == isOutside select x).ToList();
+            var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && x.InTime <= inTime && x.IsUsed == true && x.IsOutside == isOutside select x).ToList();
             return q.Count();
         }
 
@@ -395,11 +395,12 @@ namespace BLL
         /// </summary>
         /// <param name="unitId">单位Id</param>
         /// <returns>HSE人员的数量</returns>
-        public static int GetHSEPersonCountByUnitId(string unitId, string projectId)
+        public static int GetHSEPersonCountByUnitId(string unitId, string projectId, DateTime inTime)
         {
             var q = (from x in Funs.DB.SitePerson_Person
                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                     where x.UnitId == unitId && x.ProjectId == projectId && y.IsHsse==true && x.IsUsed == true select x).ToList();
+                     where x.UnitId == unitId && x.ProjectId == projectId && x.InTime <= inTime && y.IsHsse == true && x.IsUsed == true
+                     select x).ToList();
             //var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && (x.WorkPostId == BLL.Const.WorkPost_HSSEEngineer || x.WorkPostId == BLL.Const.WorkPost_SafetyManager) && x.IsUsed == true select x).ToList();
             return q.Count();
         }