diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 14d066e1..8a1ade31 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_V2023-09-15.sql b/DataBase/版本日志/SGGLDB_V2023-09-15.sql new file mode 100644 index 00000000..11bc14c7 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-15.sql @@ -0,0 +1,3 @@ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('70282169-C09D-4D46-BAA3-9457535EAEA2','ǰֳԱͳ','HSSE/SitePerson/SitePersonNowStatistic.aspx',62,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) +GO \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2023-09-21.sql b/DataBase/版本日志/SGGLDB_V2023-09-21.sql new file mode 100644 index 00000000..6a51c7fd --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-21.sql @@ -0,0 +1,96 @@ +ALTER TABLE HSSE_Hazard_HazardRegister ADD WorkPackageId NVARCHAR(2000) NULL +GO +ALTER TABLE HSSE_Hazard_HazardRegister ADD WorkPackageName NVARCHAR(2000) NULL +GO + +ALTER TABLE Check_CheckControl ADD WorkPackageId NVARCHAR(2000) NULL +GO +ALTER TABLE Check_CheckControl ADD WorkPackageName NVARCHAR(2000) NULL +GO + + +ALTER VIEW [dbo].[View_Hazard_HazardRegister] +AS +/**********ȫѲͼ*************/ +SELECT Registration.HazardRegisterId, + Registration.HazardCode, + Registration.RegisterDate, + Registration.RegisterDef, + Registration.Rectification, + Registration.Place, + Registration.ResponsibleUnit, + Registration.Observer, + Registration.RectifiedDate, + Registration.ProjectId, + Registration.states, + Registration.IsEffective, + Registration.ResponsibleMan, + Registration.CheckManId, + Registration.CheckTime, + Registration.RectificationPeriod, + (CASE WHEN Registration.ImageUrl IS NULL THEN at.AttachUrl ELSE Registration.ImageUrl END) AS ImageUrl, + (CASE WHEN Registration.RectificationImageUrl IS NULL THEN at_r.AttachUrl ELSE Registration.RectificationImageUrl END) AS RectificationImageUrl, + Registration.RectificationTime, + Registration.ConfirmMan, + Registration.ConfirmDate, + Registration.HandleIdea, + Registration.CutPayment, + Registration.ProblemTypes, + Registration.CheckSpecialId, + Registration.CheckItemDetailId, + Registration.SupCheckItemSetId, + Registration.CheckItemSetId, + Registration.SafeSupervisionId, + Registration.SafeSupervisionIsOK, + Project.ProjectName, + Registration.CheckCycle, + ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName, + Unit.UnitName AS ResponsibilityUnitName, + User1.PersonName AS ResponsibilityManName, + ISNULL(User1.Telephone,'') AS ResponsibilityManTel, + User2.PersonName AS CheckManName, + ISNULL(User2.Telephone,'') AS CheckManTel, + User2.UnitId AS SendUnitId, + User3.PersonName AS ConfirmManName, + ISNULL(User3.Telephone,'') AS ConfirmManTel, + User4.PersonName AS ResponsibilityManName2, + ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel, + (CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '' + WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ϸ' + WHEN Registration.states='2' THEN '' + WHEN Registration.states='3' THEN 'ѱջ' + ELSE '' END ) AS StatesStr, + RegisterTypes.RegisterTypesId, + RegisterTypes.RegisterTypesName, + Registration.DIC_ID, + Registration.CCManIds, + CCManNames = STUFF(( SELECT ',' + PersonName FROM Person_Persons + where PATINDEX('%,' + RTRIM(Person_Persons.PersonId) + ',%',',' + Registration.CCManIds + ',')>0 + ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',') + FOR XML PATH('')), 1, 1,''), + Registration.Requirements, + Registration.HazardValue, + Registration.RegisterTypes2Id , + RegisterTypes2.RegisterTypesName as RegisterTypes2Name, + Registration.RegisterTypes3Id , + RegisterTypes3.RegisterTypesName as RegisterTypes3Name, + Registration.RegisterTypes4Id , + RegisterTypes4.RegisterTypesName as RegisterTypes4Name, + Registration.WorkPackageId, + Registration.WorkPackageName +FROM dbo.HSSE_Hazard_HazardRegister AS Registration +LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId +LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes2 ON RegisterTypes2.RegisterTypesId = Registration.RegisterTypes2Id +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes3 ON RegisterTypes3.RegisterTypesId = Registration.RegisterTypes3Id +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes4 ON RegisterTypes4.RegisterTypesId = Registration.RegisterTypes4Id +LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit +LEFT JOIN dbo.Person_Persons AS User1 ON User1.PersonId = Registration.ResponsibleMan +LEFT JOIN dbo.Person_Persons AS User2 ON User2.PersonId = Registration.CheckManId +LEFT JOIN dbo.Person_Persons AS User3 ON User3.PersonId = Registration.ConfirmMan +LEFT JOIN dbo.Person_Persons AS User4 ON User4.PersonId = Registration.ResponsibleMan2 +LEFT JOIN dbo.AttachFile AS at ON at.ToKeyId = Registration.HazardRegisterId +LEFT JOIN dbo.AttachFile AS at_r ON at_r.ToKeyId = Registration.HazardRegisterId+'-R' + +GO diff --git a/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql b/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql index 6a91ac74..88d645b9 100644 --- a/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql +++ b/DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql @@ -340,7 +340,10 @@ GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('7D36E853-CC79-48B9-9E7F-E34797B4E87E','ֳԱͳ','HSSE/SitePerson/PersonStatistic.aspx',60,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) GO - + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('70282169-C09D-4D46-BAA3-9457535EAEA2','ǰֳԱͳ','HSSE/SitePerson/SitePersonNowStatistic.aspx',62,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) + GO INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES('F291CAE4-2E53-48FC-BF44-382D42EA4DEC','ֳλ˹ʱͳ','HSSE/SitePerson/WorkPostStatistic.aspx',65,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1) GO diff --git a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs index a5d1933b..f6b55d29 100644 --- a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs +++ b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs @@ -82,6 +82,8 @@ namespace BLL RegisterTypes2Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes2Id) ? null : hazardRegister.RegisterTypes2Id, RegisterTypes3Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes3Id) ? null : hazardRegister.RegisterTypes3Id, RegisterTypes4Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes4Id) ? null : hazardRegister.RegisterTypes4Id, + WorkPackageId=WorkPackageService.getWorkPageIdsByControlItemAndCycle(hazardRegister.WorkPackageId, null), + WorkPackageName= WorkPackageService.getWorkPageNamesByControlItemAndCycle(hazardRegister.WorkPackageId, null), }; var isUpdate = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == newHazardRegister.HazardRegisterId); if (isUpdate == null) diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 174ad6ee..8a919e0c 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -341,6 +341,7 @@ + diff --git a/SGGL/BLL/CQMS/Check/CheckControlService.cs b/SGGL/BLL/CQMS/Check/CheckControlService.cs index 371282a8..41536434 100644 --- a/SGGL/BLL/CQMS/Check/CheckControlService.cs +++ b/SGGL/BLL/CQMS/Check/CheckControlService.cs @@ -62,6 +62,9 @@ namespace BLL newCheckControl.State = CheckControl.State; newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan; + newCheckControl.WorkPackageId = CheckControl.WorkPackageId; + newCheckControl.WorkPackageName = CheckControl.WorkPackageName; + db.Check_CheckControl.InsertOnSubmit(newCheckControl); db.SubmitChanges(); } @@ -93,6 +96,9 @@ namespace BLL newCheckControl.State = CheckControl.State; newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan; + newCheckControl.WorkPackageId = CheckControl.WorkPackageId; + newCheckControl.WorkPackageName = CheckControl.WorkPackageName; + db.Check_CheckControl.InsertOnSubmit(newCheckControl); db.SubmitChanges(); } @@ -215,6 +221,8 @@ namespace BLL newCheckControl.State = CheckControl.State; newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan; + newCheckControl.WorkPackageId = CheckControl.WorkPackageId; + newCheckControl.WorkPackageName = CheckControl.WorkPackageName; db.SubmitChanges(); } public static List GetListDataForApi(string state, string name, string projectId, int index, int page) @@ -277,7 +285,8 @@ namespace BLL x.RectifyOpinion, x.LimitDate, x.CNProfessionalCode, - + x.WorkPackageId, + x.WorkPackageName, CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(), UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkCode + "-" + y.UnitWorkName + (y.ProjectType == "1" ? "(建筑)" : "(安装)")).First(), CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First() @@ -316,6 +325,8 @@ namespace BLL x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName; x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode); x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r"); + x.WorkPackageId = list[i].WorkPackageId; + x.WorkPackageName = list[i].WorkPackageName; listRes.Add(x); } return listRes; @@ -489,11 +500,11 @@ namespace BLL x.RectifyOpinion, x.LimitDate, x.CNProfessionalCode, - + x.WorkPackageId, + x.WorkPackageName, CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(), UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkCode + "-" + y.UnitWorkName + (y.ProjectType == "1" ? "(建筑)" : "(安装)")).First(), - CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First() - + CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First(), }; var list = qq1.Skip(index * page).Take(page).ToList(); @@ -522,6 +533,8 @@ namespace BLL x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName; x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode); x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r"); + x.WorkPackageId = list[i].WorkPackageId; + x.WorkPackageName = list[i].WorkPackageName; listRes.Add(x); } return listRes; diff --git a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs index 42cc09eb..989db22e 100644 --- a/SGGL/BLL/CQMS/WBS/WorkPackageService.cs +++ b/SGGL/BLL/CQMS/WBS/WorkPackageService.cs @@ -751,6 +751,84 @@ namespace BLL } #endregion + #region 根据工作包ID获取wbs节点及父节点名称字符串 + /// + /// 根据工作包ID获取wbs节点及父节点字符串 + /// + /// + /// + public static string getWorkPageNamesByControlItemAndCycle(string workPackageId, string controlItemAndCycleId) + { + string returnValues = string.Empty; + string ControlItemName=string.Empty; + if (!string.IsNullOrEmpty(controlItemAndCycleId)) + { + var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId); + if (getControlItemAndCycle != null) + { + workPackageId = getControlItemAndCycle.WorkPackageId; + ControlItemName = getControlItemAndCycle.ControlItemContent; + } + } + var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPackageId); + if (getWorkPackage != null) + { + if (!string.IsNullOrEmpty(ControlItemName)) + { + returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent + "|" + ControlItemName); + } + else + { + returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent); + } + } + + return returnValues; + } + + /// + /// id + /// + /// + /// + /// + public static string getSelectNames(string workPageId, string returnValues) + { + var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPageId); + if (getWorkPackage != null) + { + if (!string.IsNullOrEmpty(getWorkPackage.SuperWorkPackageId)) + { + var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId); + if (getSupWorkPackage != null) + { + returnValues = getWorkPackage.PackageContent + "|" + returnValues; + returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues); + } + + } + else + { + var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == getWorkPackage.UnitWorkId); + if (getUnitWork != null) + { + if (getUnitWork.ProjectType == "1") + { + returnValues = "建筑工程|" + getUnitWork.UnitWorkName + "|" + returnValues; + } + else + { + returnValues = "安装工程|" + getUnitWork.UnitWorkName + "|" + returnValues; + } + + } + } + } + + return returnValues; + } + #endregion + #region 更新分部分项概算费用 /// /// 更新分部分项概算费用 diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 946a8b6d..a6ea15ee 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1409,7 +1409,7 @@ namespace BLL var request = new RestRequest(Method.POST); request.AddHeader("token", Token); request.AddHeader("ClientId", SysConstSetService.ClientId); - request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal))); + request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal)+1)); if (!string.IsNullOrEmpty(JsonBody)) { request.AddJsonBody(JsonBody); diff --git a/SGGL/BLL/DigData/CQMSDataDWService .cs b/SGGL/BLL/DigData/CQMSDataDWService .cs index 1c2127c5..074789db 100644 --- a/SGGL/BLL/DigData/CQMSDataDWService .cs +++ b/SGGL/BLL/DigData/CQMSDataDWService .cs @@ -26,7 +26,8 @@ namespace BLL /// 定义变量 /// private static IQueryable getDataLists = from x in db.Base_Project - select x; + where x.ProjectState == Const.ProjectState_1 + select x; /// /// 质量数据仓库 @@ -38,7 +39,7 @@ namespace BLL /// public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) { - var getDataList = from x in Funs.DB.Base_Project select x; + IQueryable getDataList = getDataLists; if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) { getDataList = getDataList.Where(x => x.ProjectId == projectId); @@ -56,13 +57,87 @@ namespace BLL x.ProjectId, x.ProjectName, x.ProjectCode, - Rate1 = "0%", //质量验收问题整改率 - Rate2 = "0%", //控制点完成率 - Rate3 = "0%", //质量检查问题整改率 - Rate4 = "0%", //管道焊接一次合格率 + Rate1 = getSpotCheckRate(x.ProjectId), //质量验收问题整改率 + Rate2 = getSpotCheckDataRate(x.ProjectId), //控制点完成率 + Rate3 = getCheckControlStates(x.ProjectId), //质量检查问题整改率 + Rate4 = getFirstPassRate(x.ProjectId), //管道焊接一次合格率 }; } #endregion + /// + /// 质量验收问题整改率 + /// + /// + /// + public static string getSpotCheckRate(string projectId) + { + + //// 实体验收 资料验收 + var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail + join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode + where (y.ProjectId == projectId || projectId == null) && y.State == "8" + select x; + int all = getSpotCheckDetail.Count(); + // this.lbSpotCheck1.Text = all.ToString(); + int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count(); //一次合格 + // this.lbSpotCheck2.Text= okCount.ToString(); + + return all > 0 ? Math.Round(onesOKCount * 100.0 / (all * 1.0)).ToString() + "%" : "0%"; + } + + /// + /// 控制点完成率 + /// + /// + /// + public static string getSpotCheckDataRate(string projectId) + { + var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail + join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode + where (y.ProjectId == projectId || projectId == null) && y.State == "8" + select x; + /// 资料验收合格项目 + var getOKSpotCheckDetail = getSpotCheckDetail.Where(x => x.IsOK == true); + int okYSCount = getOKSpotCheckDetail.Count(); //验收合格 + int okDateCount = getSpotCheckDetail.Where(x => x.IsDataOK == "1").Count(); //资料合格 + return okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%"; + } + + /// + /// 质量检查问题整改率 + /// + /// + /// + public static string getCheckControlStates(string projectId) + { + var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl + where (x.ProjectId == projectId || projectId == null) + select x; + int allCheckControlCount = getCheck_CheckControl.Count(); + int okCheckControlCount = getCheck_CheckControl.Where(x => x.State == "7").Count(); ///已整改 + return allCheckControlCount > 0 ? Math.Round(okCheckControlCount * 100.0 / (allCheckControlCount * 1.0)).ToString() + "%" : "0%"; + + } + + /// + /// 管道焊接一次合格率 + /// + /// + /// + public static string getFirstPassRate(string projectId) + { + var getJots = from x in Funs.DB.HJGL_Batch_NDEItem + join y in Funs.DB.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals y.TrustBatchItemId + join z in Funs.DB.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId + join a in Funs.DB.HJGL_Batch_NDE on x.NDEID equals a.NDEID + where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null + && (a.ProjectId == projectId || projectId == null) + select x; + int allHJCount = getJots.Count(); + var getOk = getJots.Where(x => x.CheckResult == "1"); + int okHJCount = getOk.Count(); + return allHJCount > 0 ? Math.Round(okHJCount * 100.0 / (allHJCount * 1.0)).ToString() + "%" : "0%"; + } } } \ No newline at end of file diff --git a/SGGL/BLL/DigData/HSEDataDWService.cs b/SGGL/BLL/DigData/HSEDataDWService.cs index 3805288c..0e5d0ebf 100644 --- a/SGGL/BLL/DigData/HSEDataDWService.cs +++ b/SGGL/BLL/DigData/HSEDataDWService.cs @@ -26,7 +26,8 @@ namespace BLL /// 定义变量 /// private static IQueryable getDataLists = from x in db.Base_Project - select x; + where x.ProjectState == Const.ProjectState_1 + select x; /// /// 安全数据仓库 @@ -38,7 +39,7 @@ namespace BLL /// public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) { - var getDataList = from x in Funs.DB.Base_Project select x; + IQueryable getDataList = getDataLists; if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) { getDataList = getDataList.Where(x => x.ProjectId == projectId); @@ -56,13 +57,48 @@ namespace BLL x.ProjectId, x.ProjectName, x.ProjectCode, - Count1=0, //人员数量 - Count2 =0, //安全人工时 - Count3 =0, //安全培训次数 - ProblemRate = "0%", //安全巡检整改率 + Count1=db.SitePerson_Person.Where(p=>p.ProjectId == x.ProjectId && p.States == Const.ProjectPersonStates_1).Count(), //人员数量 + Count2 = getProjecctSafeHours(x.ProjectId), //安全人工时 + Count3 =db.EduTrain_TrainRecord.Where(p => p.ProjectId == x.ProjectId && p.States == BLL.Const.State_2).Count(), //安全培训次数 + ProblemRate = getProblemRate(x.ProjectId), //安全巡检整改率 }; } #endregion + /// + /// 安全人工时 + /// + /// + /// + public static int getProjecctSafeHours(string projectId) + { + int count = 0; + var getPersonInOutNumber = (from x in Funs.DB.SitePerson_PersonInOutNumber + where (x.ProjectId == projectId || projectId == null) + select x).OrderByDescending(x => x.InOutDate).FirstOrDefault(); + if (getPersonInOutNumber != null) + { + count = getPersonInOutNumber.WorkHours ?? 0; + } + + return count; + } + + /// + /// 安全问题整改率 + /// + /// + /// + public static string getProblemRate(string projectId) + { + var getAllHazardRegister = from x in Funs.DB.HSSE_Hazard_HazardRegister + where (x.ProjectId == projectId || projectId == null) + && x.States != null && x.States != "4" && x.States != "0" + select x; + int allHazardCount = getAllHazardRegister.Count(); + int cHazardCount = getAllHazardRegister.Where(x => x.States == "3").Count(); + return allHazardCount > 0 ? Math.Round(cHazardCount * 100.0 / (allHazardCount * 1.0)).ToString() + "%" : "0%"; + } + } } \ No newline at end of file diff --git a/SGGL/BLL/DigData/JDGLDataDWService.cs b/SGGL/BLL/DigData/JDGLDataDWService.cs index be372d94..c993cc47 100644 --- a/SGGL/BLL/DigData/JDGLDataDWService.cs +++ b/SGGL/BLL/DigData/JDGLDataDWService.cs @@ -26,7 +26,7 @@ namespace BLL /// 定义变量 /// private static IQueryable getDataLists = from x in db.Base_Project - select x; + select x; /// /// 进度数据仓库 @@ -36,7 +36,7 @@ namespace BLL /// /// /// - public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) + public static IEnumerable getDataDWList(string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) { var getDataList = from x in Funs.DB.Base_Project select x; if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) @@ -56,10 +56,44 @@ namespace BLL x.ProjectId, x.ProjectName, x.ProjectCode, - JDRate = "0%", //项目进度完成百分比 + JDRate = getJDRate(x.ProjectId, startTime, endTime), //项目进度完成百分比 }; } #endregion + /// + /// 进度百分比 + /// + /// + public static string getJDRate(string projectId, DateTime? startTime, DateTime? endTime) + { + double totalSJCost = 0; ////累计实际费用 + decimal totalPlanCost = 0; ////计划费用 + var getViewWorkPackageParentDetail = from x in Funs.DB.View_WBS_WorkPackageParentDetail + where (x.ProjectId == projectId || projectId == null) && (x.ParentId == "1" || x.ParentId == "2") + select x; + if (startTime.HasValue) + { + getViewWorkPackageParentDetail = getViewWorkPackageParentDetail.Where(x => x.Months >= startTime); + } + if (endTime.HasValue) + { + getViewWorkPackageParentDetail = getViewWorkPackageParentDetail.Where(x => x.Months <= endTime); + } + if (getViewWorkPackageParentDetail.Count() > 0) + { + totalSJCost = getViewWorkPackageParentDetail.Sum(x => x.TotalThisValue ?? 0); + } + + var getUnitWork = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x; + if (getUnitWork.Count() > 0) + { + totalPlanCost = getUnitWork.Sum(x => x.PlanCost ?? 0); + } + + ///项目进度完成百分比 + decimal s = Convert.ToDecimal(totalSJCost); + return totalPlanCost > 0 ? Math.Round(s / totalPlanCost).ToString() + "%" : "0%"; + } } } \ No newline at end of file diff --git a/SGGL/BLL/DigData/ProjectWBSAnalysisService.cs b/SGGL/BLL/DigData/ProjectWBSAnalysisService.cs new file mode 100644 index 00000000..907dcbf9 --- /dev/null +++ b/SGGL/BLL/DigData/ProjectWBSAnalysisService.cs @@ -0,0 +1,123 @@ +using FineUIPro; +using NPOI.SS.Formula.Functions; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Web.Util; + +namespace BLL +{ + /// + /// WBS分析 + /// + public static class ProjectWBSAnalysisService + { + public static Model.SGGLDB db = Funs.DB; + + #region WBS分析 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getDataLists = from x in db.WBS_WorkPackage + where x.IsApprove == true + select x; + + /// + /// 合同管理数据仓库 + /// + /// + /// + /// + /// + /// + public static IEnumerable getDataDWList(string projectId, string workPackageId, Grid Grid1) + { + var getDataList = getDataLists.Where(x => x.ProjectId == projectId); + if (string.IsNullOrEmpty(workPackageId)) + { + List listWork = new List(); + Model.WBS_WorkPackage work1 = new Model.WBS_WorkPackage + { + WorkPackageCode = "1", + PackageContent = "建筑工程", + }; + listWork.Add(work1); + Model.WBS_WorkPackage work2 = new Model.WBS_WorkPackage + { + WorkPackageCode = "2", + PackageContent = "安装工程", + }; + listWork.Add(work2); + getDataList = listWork.AsQueryable(); + } + else + { + if (workPackageId != "1" && workPackageId != "2") + { + var getUnitWork = db.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == projectId && x.UnitWorkId == workPackageId); + if (getUnitWork != null) + { + getDataList = getDataList.Where(x => x.UnitWorkId == workPackageId && x.SuperWorkPack == null); + } + else + { + getDataList = getDataList.Where(x => x.SuperWorkPack == workPackageId); + if (getDataList.Count() == 0) + { + getDataList = getDataLists.Where(x => x.WorkPackageId == workPackageId); + } + } + } + else + { + var getUnitWork = from x in db.WBS_UnitWork + where x.ProjectId == projectId && x.SuperUnitWork == null && x.ProjectType == workPackageId + select x; + List listWork = new List(); + foreach (var item in getUnitWork) + { + Model.WBS_WorkPackage workItem = new Model.WBS_WorkPackage + { + WorkPackageCode = item.UnitWorkId, + PackageContent = item.UnitWorkCode + "-" + item.UnitWorkName, + }; + listWork.Add(workItem); + } + + getDataList = listWork.AsQueryable(); + } + } + + count = getDataList.Count(); + if (count == 0) + { + return null; + } + getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getDataList + select new + { + x.WorkPackageCode, + x.PackageContent, + Count1 = 0, + Count2 = 0, + Count3 = 0, + Count4 = 0, + Count5 = 0, + Count6 = 0, + }; + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/BLL/DigData/WBSAnalysisService.cs b/SGGL/BLL/DigData/WBSAnalysisService.cs index 69e53550..6ada1642 100644 --- a/SGGL/BLL/DigData/WBSAnalysisService.cs +++ b/SGGL/BLL/DigData/WBSAnalysisService.cs @@ -38,49 +38,39 @@ namespace BLL /// /// /// - public static IEnumerable getDataDWList(string level,string workPackageId, Grid Grid1) + public static IEnumerable getDataDWList(string workPackageId, Grid Grid1) { var getDataList = getDataLists; - if (level == "0") + if (string.IsNullOrEmpty(workPackageId) ) { List listWork = new List(); - if (string.IsNullOrEmpty(workPackageId) || workPackageId == "1") + Model.WBS_WorkPackageInit work1 = new Model.WBS_WorkPackageInit { - Model.WBS_WorkPackageInit work1 = new Model.WBS_WorkPackageInit - { - WorkPackageCode = "1", - PackageContent = "建筑工程", - }; - listWork.Add(work1); - } - if (string.IsNullOrEmpty(workPackageId) || workPackageId == "2") + WorkPackageCode = "1", + PackageContent = "建筑工程", + }; + listWork.Add(work1); + Model.WBS_WorkPackageInit work2 = new Model.WBS_WorkPackageInit { - Model.WBS_WorkPackageInit work2 = new Model.WBS_WorkPackageInit - { - WorkPackageCode = "2", - PackageContent = "安装工程", - }; - listWork.Add(work2); - } + WorkPackageCode = "2", + PackageContent = "安装工程", + }; + listWork.Add(work2); getDataList = listWork.AsQueryable(); } else { - if (level == "1") + if (workPackageId != "1" && workPackageId != "2") { - getDataList = getDataList.Where(x => x.SuperWorkPack == null); + getDataList = getDataList.Where(x => x.SuperWorkPack == workPackageId); + if (getDataList.Count() == 0) + { + getDataList = getDataLists.Where(x => x.WorkPackageCode == workPackageId); + } } - - if (!string.IsNullOrEmpty(workPackageId)) + else { - if (workPackageId != "1" && workPackageId != "2") - { - getDataList = getDataList.Where(x => x.SuperWorkPack == workPackageId); - } - else - { - getDataList = getDataList.Where(x => x.ProjectType == workPackageId); - } + getDataList = getDataList.Where(x => x.ProjectType == workPackageId && x.SuperWorkPack == null); } } diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs index dfd1a25d..7874419e 100644 --- a/SGGL/BLL/DropListService.cs +++ b/SGGL/BLL/DropListService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using BLL; +using System.Collections.Generic; namespace BLL { @@ -40,6 +41,10 @@ namespace BLL { dropName.DataSource = HSSE_getCertificateType(); } + else if (groupId == Group_ProjectPersonStates) + { + dropName.DataSource = HSSE_getProjectPersonStates(); + } dropName.DataBind(); if (isShowPlease) { @@ -74,7 +79,10 @@ namespace BLL { rblName.DataSource = HSSE_getContractType(); } - + else if (groupId == Group_ProjectPersonStates) + { + rblName.DataSource = HSSE_getProjectPersonStates(); + } rblName.DataBind(); if (!string.IsNullOrEmpty(selectValue)) { @@ -105,6 +113,10 @@ namespace BLL /// public const string Group_PersonType = "PersonType"; /// + /// 项目人员状态 组id + /// + public const string Group_ProjectPersonStates = "ProjectPersonStates"; + /// /// 合同类型 组id /// public const string Group_ContractType = "ContractType"; @@ -330,6 +342,39 @@ namespace BLL } #endregion + #region 人员类型 + /// + /// 人员类型 名称 + /// + /// + /// + public static string HSSE_getProjectPersonStates(string value) + { + string name = string.Empty; + var getType = HSSE_getProjectPersonStates().FirstOrDefault(x => x.Value == value); + if (getType != null) + { + name = getType.Text; + } + return name; + } + + + /// + /// 人员类型 + /// + /// + public static ListItem[] HSSE_getProjectPersonStates() + { + ListItem[] list = new ListItem[4]; + list[0] = new ListItem("在审", Const.ProjectPersonStates_0); + list[1] = new ListItem("在岗", Const.ProjectPersonStates_1); + list[2] = new ListItem("离岗", Const.ProjectPersonStates_2); + list[3] = new ListItem("打回", Const.ProjectPersonStates_R); + return list; + } + #endregion + #region 合同类型 /// /// 人员类型 名称 diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs index 30e003b4..ca6147f7 100644 --- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs +++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs @@ -71,7 +71,11 @@ namespace BLL RegisterTypes2Id = hazardRegister.RegisterTypes2Id, RegisterTypes3Id = hazardRegister.RegisterTypes3Id, RegisterTypes4Id = hazardRegister.RegisterTypes4Id, - CCManIds = hazardRegister.CCManIds + CCManIds = hazardRegister.CCManIds, + + WorkPackageId = hazardRegister.WorkPackageId, + WorkPackageName = hazardRegister.WorkPackageName, + }; db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister); db.SubmitChanges(); @@ -116,6 +120,9 @@ namespace BLL newHazardRegister.RegisterTypes3Id = hazardRegister.RegisterTypes3Id; newHazardRegister.RegisterTypes4Id = hazardRegister.RegisterTypes4Id; newHazardRegister.CCManIds = hazardRegister.CCManIds; + + newHazardRegister.WorkPackageId = newHazardRegister.WorkPackageId; + newHazardRegister.WorkPackageName = newHazardRegister.WorkPackageName; //把附件表的路径复制过来 Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId); if (file != null) diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index 09cd0116..a2feec55 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -137,7 +137,7 @@ namespace BLL /// 页码 /// 每页数量 /// - public static IEnumerable getInPsersonListData(string projectId, string unitId, string personName, string identityCard, Grid Grid1) + public static IEnumerable getInPersonListData(string projectId, string unitId, string personName, string identityCard, Grid Grid1) { IQueryable getInPersonList = getInPersonLists.Where(x => x.ProjectId == projectId); if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null) @@ -183,6 +183,103 @@ namespace BLL } #endregion + #region 现场当前人员列表 + /// + /// 记录数 + /// + public static int nowCount + { + get; + set; + } + + /// + /// 定义变量 + /// + private static IQueryable getNowPersonLists = from x in db.SitePerson_PersonInOutNow + select x; + + /// + /// 获取分页列表 + /// + /// 页码 + /// 每页数量 + /// + public static IEnumerable getNowPersonListData(string projectId, string unitId, string workPostId, string personName, string identityCard, DateTime dateValue, Grid Grid1) + { + IQueryable getDayAll = getNowPersonLists.Where(x=>x.ProjectId == projectId + && x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month + && x.ChangeTime.Value.Day == dateValue.Day); + if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null) + { + getDayAll = getDayAll.Where(x => x.UnitId == unitId); + } + if (!string.IsNullOrEmpty(personName)) + { + getDayAll = getDayAll.Where(x => x.PersonName.Contains(personName)); + } + if (!string.IsNullOrEmpty(identityCard)) + { + getDayAll = getDayAll.Where(x => x.IdentityCard.Contains(identityCard)); + } + if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null) + { + getDayAll = getDayAll.Where(x => x.WorkPostId == workPostId); + } + + if (getDayAll.Count() > 0) + { + var getInMaxs = from x in getDayAll + group x by x.PersonId into g + select new + { + ProjectId = g.First().ProjectId, + PersonId = g.First().PersonId, + personName = g.First().PersonName, + identityCard = g.First().IdentityCard, + UnitId = g.First().UnitId, + UnitName = g.First().UnitName, + WorkPostName = g.First().WorkPostName, + ChangeTime = g.Max(x => x.ChangeTime), + IsIn = g.First().IsIn, + PostType = g.First().PostType, + WorkPostId = g.First().WorkPostId, + }; + + if (getInMaxs.Count() > 0) + { + getInMaxs = getInMaxs.Where(x => x.IsIn == true); + } + nowCount = getInMaxs.Count(); + if (nowCount == 0) + { + return null; + } + + getInMaxs = SortConditionHelper.SortingAndPaging(getInMaxs, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in getInMaxs + select new + { + x.PersonId, + x.personName, + x.identityCard, + CardNo =db.SitePerson_Person.First(p=>p.PersonId == x.PersonId && p.ProjectId ==x.ProjectId).CardNo, + x.UnitName, + x.UnitId, + x.WorkPostId, + x.WorkPostName, + TeamGroupName=TeamGroupService.GetTeamGroupNameByPersonId(x.ProjectId,x.PersonId), + x.ChangeTime, + }; + } + else + { + inCount =0; + return null; + } + } + #endregion + #region 获取项目人员 -- 按条件查询 #region 根据现场人员主键获取现场人员信息 /// diff --git a/SGGL/BLL/ProjectData/TeamGroupService.cs b/SGGL/BLL/ProjectData/TeamGroupService.cs index 6eaa579c..f4ef60c2 100644 --- a/SGGL/BLL/ProjectData/TeamGroupService.cs +++ b/SGGL/BLL/ProjectData/TeamGroupService.cs @@ -167,5 +167,20 @@ namespace BLL } return name; } + + public static string GetTeamGroupNameByPersonId(string projectId, string personId) + { + string name = string.Empty; + var getSitePerson = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.PersonId == personId); + if (getSitePerson != null) + { + var TeamGroup = Funs.DB.ProjectData_TeamGroup.FirstOrDefault(x => x.TeamGroupId == getSitePerson.TeamGroupId); + if (TeamGroup != null) + { + name = TeamGroup.TeamGroupName; + } + } + return name; + } } } diff --git a/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj b/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj index 8ac391f6..c4c16785 100644 --- a/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj +++ b/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj @@ -3322,6 +3322,7 @@ uploader.aspx + ASPXCodeBehind uploader.aspx diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs index 1c220b18..267fde3b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs @@ -51,12 +51,9 @@ namespace FineUIPro.Web.CQMS.Check Funs.FineUIPleaseSelect(this.dpHandelStatus); btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;"; ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - // 绑定表格 BindGrid(); - - } @@ -99,7 +96,8 @@ namespace FineUIPro.Web.CQMS.Check } protected DataTable ChecklistData() { - string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName," + string strSql = @"SELECT chec.CheckControlCode,(case when chec.WorkPackageName is null then chec.CheckSite else chec.WorkPackageName end) as CheckSite + ,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName," + @" QualityQuestionType.QualityQuestionType as QuestionType," + @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode," + @" unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName,u.PersonName " diff --git a/SGGL/FineUIPro.Web/CQMS/Check/CheckListView.aspx b/SGGL/FineUIPro.Web/CQMS/Check/CheckListView.aspx index 13f72caf..cf62a86d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/CheckListView.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/CheckListView.aspx @@ -39,9 +39,8 @@ BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true" runat="server"> + BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="110px"> - - + + + + + - //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Check { - - - public partial class CheckListView { - +namespace FineUIPro.Web.CQMS.Check +{ + + + public partial class CheckListView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// ContentPanel2 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel ContentPanel2; - + /// /// Form2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form2; - + /// /// txtProjectName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + /// /// txtDocCode 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDocCode; - + /// /// drpUnit 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox drpUnit; - + /// /// drpUnitWork 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox drpUnitWork; - + /// /// drpCNProfessional 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox drpCNProfessional; - + /// /// drpQuestionType 控件。 /// @@ -110,7 +112,16 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox drpQuestionType; - + + /// + /// txtWorkPackageId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtWorkPackageId; + /// /// txtCheckSite 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCheckSite; - + /// /// txtCheckDate 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCheckDate; - + /// /// drpProposeUnit 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox drpProposeUnit; - + /// /// txtLimitDate 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtLimitDate; - + /// /// txtQuestionDef 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtQuestionDef; - + /// /// txtRectifyOpinion 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRectifyOpinion; - + /// /// Panel1 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// imgBtnFile 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button imgBtnFile; - + /// /// ContentPanel3 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel ContentPanel3; - + /// /// For 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form For; - + /// /// txtHandleWay 控件。 /// @@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtHandleWay; - + /// /// txtRectifyDate 控件。 /// @@ -218,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtRectifyDate; - + /// /// Panel2 控件。 /// @@ -227,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// lblAttach 控件。 /// @@ -236,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lblAttach; - + /// /// btnAttach 控件。 /// @@ -245,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// plApprove 控件。 /// @@ -254,7 +265,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow plApprove; - + /// /// gvApprove 控件。 /// @@ -263,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvApprove; - + /// /// lbtype 控件。 /// @@ -272,7 +283,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lbtype; - + /// /// Window1 控件。 /// @@ -281,7 +292,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// WindowAtt 控件。 /// @@ -290,7 +301,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; - + /// /// Menu1 控件。 /// @@ -299,7 +310,7 @@ namespace FineUIPro.Web.CQMS.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx index 4a09ea70..a664d574 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx @@ -4,7 +4,7 @@ -质量巡检 + 质量巡检 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs new file mode 100644 index 00000000..887a9b85 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.cs @@ -0,0 +1,153 @@ +using BLL; +using Microsoft.Office.Core; +using Newtonsoft.Json.Linq; +using System; +using System.Linq; + +namespace FineUIPro.Web.HSSE.SitePerson +{ + public partial class SitePersonNowStatistic : PageBase + { + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId) + { + this.ProjectId = Request.Params["projectId"]; + } + UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); + this.drpUnit.SelectedValue = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_SEDIN : this.CurrUser.UnitId; + if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) + { + this.drpUnit.Enabled = false; + } + WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true); + this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + Funs.DropDownPageSize(this.ddlPageSize); + // 绑定表格 + this.BindGrid(); + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + var getData = SitePerson_PersonService.getNowPersonListData(this.ProjectId, this.drpUnit.SelectedValue, this.drpWorkPost.SelectedValue + , this.txtPersonName.Text.Trim(), this.txtIdcard.Text.Trim(), Funs.GetNewDateTimeOrNow(this.txtStartDate.Text), Grid1); + Grid1.RecordCount = SitePerson_PersonService.nowCount; + Grid1.DataSource = getData; + Grid1.DataBind(); + } + + #region 查询 + /// + /// 查询 + /// + /// + /// + protected void btnSearch_Click(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + + #region 分页 + /// + /// 分页 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// 分页显示条数下拉框 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + #region Grid编辑事件 + /// + /// Grid行双击事件 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + + } + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + + } + #endregion + + #region 导出按钮 + /// 导出按钮 + ///
+ /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("现场岗位人工时统计" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs new file mode 100644 index 00000000..0dcfb8f4 --- /dev/null +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SitePersonNowStatistic.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HSSE.SitePerson +{ + + + public partial class SitePersonNowStatistic + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// drpWorkPost 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWorkPost; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// txtIdcard 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIdcard; + + /// + /// txtStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartDate; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx index 277658c8..fe5163c1 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx @@ -93,7 +93,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs index 1f4db4b6..5644617d 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs @@ -225,10 +225,26 @@ namespace FineUIPro.Web.Person this.btnCertificateNew.Hidden = false; this.btnTrainNew.Hidden = false; this.btnInOutNew.Hidden = false; + + if (this.CurrUser.RoleIds == null || this.CurrUser.RoleIds.Contains(Const.sysglyId)) + { + this.rbPersonType.Readonly = false; + } + else + { + var getRoleNames = RoleService.getRoleNamesRoleIds(this.CurrUser.RoleIds); + if (getRoleNames != null && getRoleNames.Contains("管理员")) + { + this.rbPersonType.Readonly = false; + } + } } + + } else { + this.rbPersonType.Readonly = false; if (this.Type == "Shunt") { this.ckIsPost.Checked = false; diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx index 360d28b8..fe622030 100644 --- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx +++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx @@ -166,7 +166,7 @@ - + diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs index 3c779396..a7426c81 100644 --- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs @@ -120,6 +120,27 @@ namespace FineUIPro.Web.Person getInitGridTestRecord(); getInitGridInOut(); getInitGridContract(); + + var person = BLL.Person_PersonsService.GetPerson_PersonsById(this.PersonId); + if (person != null) + { + if (this.CurrUser.RoleIds == null || this.CurrUser.RoleIds.Contains(Const.sysglyId)) + { + this.rbPersonType.Readonly = false; + } + else + { + var getRoleNames = RoleService.getRoleNamesRoleIds(this.CurrUser.RoleIds); + if (getRoleNames != null && getRoleNames.Contains("管理员")) + { + this.rbPersonType.Readonly = false; + } + } + } + else + { + this.rbPersonType.Readonly = false; + } } } diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml index b532a9bb..b3d0385c 100644 --- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml +++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml @@ -3,7 +3,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index 5ce095a2..2edfbe00 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -31,6 +31,7 @@ + diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 03eb9188..342d91b8 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -48,12 +48,22 @@ - - - + + + + + + + + - + + + + + + @@ -79,12 +89,7 @@ - - - - - - + diff --git a/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs b/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs index 2a4dca87..b1aa5eb8 100644 --- a/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs +++ b/SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs @@ -373,5 +373,23 @@ namespace Model get; set; } + + /// + /// 分部分项id + /// + public string WorkPackageId + { + get; + set; + } + + /// + /// 分部分项名称 + /// + public string WorkPackageName + { + get; + set; + } } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 8e662dcf..5d993b06 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -39388,6 +39388,10 @@ namespace Model private string _SaveHandleMan; + private string _WorkPackageName; + + private string _WorkPackageId; + private EntityRef _Base_Project; private EntityRef _Person_Persons; @@ -39444,6 +39448,10 @@ namespace Model partial void OnProposeUnitIdChanged(); partial void OnSaveHandleManChanging(string value); partial void OnSaveHandleManChanged(); + partial void OnWorkPackageNameChanging(string value); + partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public Check_CheckControl() @@ -39922,6 +39930,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] + public string WorkPackageName + { + get + { + return this._WorkPackageName; + } + set + { + if ((this._WorkPackageName != value)) + { + this.OnWorkPackageNameChanging(value); + this.SendPropertyChanging(); + this._WorkPackageName = value; + this.SendPropertyChanged("WorkPackageName"); + this.OnWorkPackageNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -100589,6 +100637,10 @@ namespace Model private string _HazardValue; + private string _WorkPackageName; + + private string _WorkPackageId; + private EntityRef _Base_Unit; private EntityRef _HSSE_Hazard_HazardRegisterTypes; @@ -100689,6 +100741,10 @@ namespace Model partial void OnRegisterTypes4IdChanged(); partial void OnHazardValueChanging(string value); partial void OnHazardValueChanged(); + partial void OnWorkPackageNameChanging(string value); + partial void OnWorkPackageNameChanged(); + partial void OnWorkPackageIdChanging(string value); + partial void OnWorkPackageIdChanged(); #endregion public HSSE_Hazard_HazardRegister() @@ -101626,6 +101682,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] + public string WorkPackageName + { + get + { + return this._WorkPackageName; + } + set + { + if ((this._WorkPackageName != value)) + { + this.OnWorkPackageNameChanging(value); + this.SendPropertyChanging(); + this._WorkPackageName = value; + this.SendPropertyChanged("WorkPackageName"); + this.OnWorkPackageNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this.OnWorkPackageIdChanging(value); + this.SendPropertyChanging(); + this._WorkPackageId = value; + this.SendPropertyChanged("WorkPackageId"); + this.OnWorkPackageIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -266811,6 +266907,10 @@ namespace Model private string _RegisterTypes4Name; + private string _WorkPackageId; + + private string _WorkPackageName; + public View_Hazard_HazardRegister() { } @@ -267726,6 +267826,38 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")] + public string WorkPackageId + { + get + { + return this._WorkPackageId; + } + set + { + if ((this._WorkPackageId != value)) + { + this._WorkPackageId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")] + public string WorkPackageName + { + get + { + return this._WorkPackageName; + } + set + { + if ((this._WorkPackageName != value)) + { + this._WorkPackageName = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_Batch_PointBatch")] diff --git a/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs b/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs index dbcd15b7..6dcd16ef 100644 --- a/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/CheckListController.cs @@ -81,12 +81,15 @@ namespace Mvc.Controllers { if (string.IsNullOrEmpty(CheckControl.CheckControlCode)) { + CheckControl.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(CheckControl.WorkPackageId, null); + CheckControl.WorkPackageName = WorkPackageService.getWorkPageNamesByControlItemAndCycle(CheckControl.WorkPackageId, null); if (string.IsNullOrEmpty(CheckControl.DocCode)) { string prefix = BLL.ProjectService.GetProjectByProjectId(CheckControl.ProjectId).ProjectCode + "-06-CM03-XJ-"; CheckControl.DocCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.Check_CheckControl", "DocCode", prefix); } - CheckControl.CheckControlCode = Guid.NewGuid().ToString(); + CheckControl.CheckControlCode = Guid.NewGuid().ToString(); + BLL.CheckControlService.AddCheckControlForApi(CheckControl); //BLL.AttachFileService.updateAttachFile(CheckControl.ReAttachUrl, CheckControl.CheckControlCode+"r", Const.CheckListMenuId); //BLL.AttachFileService.updateAttachFile(CheckControl.AttachUrl, CheckControl.CheckControlCode, Const.CheckListMenuId);