diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 81372eff..67de0dcf 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -1015,7 +1015,7 @@ 2.1.1 - 12.0.3 + 13.0.3 2.5.5 diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs index 881910b2..3f902edf 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs +++ b/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); + } } } diff --git a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs index bcbb8004..d41674a0 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs @@ -189,5 +189,26 @@ namespace BLL return false; } } + + /// + /// 根据分部id获取下级项 + /// + /// + /// + public static List GetDivisionProjectBySupId(string divisionProjectId) + { + return (from x in Funs.DB.WBS_DivisionProject where x.SuperDivisionId == divisionProjectId select x).ToList(); + } + + /// + /// 根据分部名称获取信息 + /// + /// + /// + 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; + } } } diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs index 4dbd683d..ef763e16 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs @@ -384,9 +384,9 @@ namespace BLL /// /// 单位Id /// 人员的数量 - 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 /// /// 单位Id /// HSE人员的数量 - 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(); } diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx index 74109dcf..04b7fa9f 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx @@ -151,8 +151,11 @@ - + + +