diff --git a/DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql b/DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql index 3e66bd7..d1cc9bf 100644 --- a/DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql +++ b/DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql @@ -29,6 +29,11 @@ update Sys_Menu set MenuName='Υ where MenuId='06958288-96F4-4291-909A-FFC2FC76814D' GO +--ΥԱ¼˵޸ΪΥҵ +update Sys_Menu set MenuName='Υҵ',IsUsed=1,MenuType='Menu_HSSE_P' +where MenuId='16e865eb-f4b7-4192-98d4-78a3e6bcaa45' +GO + delete Sys_Menu WHERE MenuId = '004EE400-0000-0000-0000-E2EF9AFA6F8D' or SuperMenu='004EE400-0000-0000-0000-E2EF9AFA6F8D' diff --git a/DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql b/DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql index a6473d2..cb63cbf 100644 --- a/DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql +++ b/DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql @@ -150,24 +150,43 @@ BEGIN --¼ݳʼ INSERT INTO SANKU_HAZARD(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,RESPONSIBLE_PERSONNEL_ID_NUMBER,RESPONSIBLE_PERSONNEL_NAME,RECTIFIER_PERSONNEL_ID_NUMBER,RECTIFIER_PERSONNEL_NAME ,DISCOVERY_DATE,HAZARD_TYPE,HAZARD_LEVEL,HAZARD_CONTENT,RECTIFICATION_STATUS,RECTIFICATION_DEADLINE_ID,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) - SELECT tba.RectifyNoticesItemId,pms.pro_code,pms.pro_name + SELECT tba.HazardRegisterId,pms.pro_code,pms.pro_name ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName - ,suzg.IdentityCard,suzg.UserName,suzg.IdentityCard,suzg.UserName,tbb.CheckedDate,rectify.RectifyName - ,(CASE tbb.HiddenHazardType WHEN 1 THEN 'һ' WHEN 2 THEN 'ϴ' WHEN 3 THEN 'ش' ELSE 'һ' END) AS TYPE,tba.WrongContent - ,(CASE WHEN tbb.States = 2 THEN 'δ' WHEN tbb.States = 3 THEN '' WHEN States = 4 THEN '' WHEN States = 5 THEN '' ELSE 'δ' END) AS StatesName - ,tba.LimitTime,suc.IdentityCard,suc.UserName,tbb.CheckedDate,tbb.CheckedDate - FROM Check_RectifyNoticesItem AS tba WITH(NOLOCK) - LEFT JOIN Check_RectifyNotices AS tbb WITH(NOLOCK) ON tbb.RectifyNoticesId = tba.RectifyNoticesId - --LEFT JOIN Check_RectifyNoticesFlowOperate AS tbc WITH(NOLOCK) ON tbc.RectifyNoticesId = tba.RectifyNoticesId - LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tbb.UnitId --AND LEN(bu.CollCropCode)=18 - LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tbb.DutyPersonId - LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.CompleteManId - LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId + ,suzg.IdentityCard,suzg.UserName,suzg.IdentityCard,suzg.UserName,tba.CheckTime,regType.RegisterTypesName + ,(CASE tba.Risk_Level WHEN 'һ' THEN 'һ' WHEN 'ϴ' THEN 'ϴ' WHEN 'ش' THEN 'ش' ELSE 'һ' END) AS TYPE,tba.RegisterDef + ,(CASE tba.States WHEN 1 THEN 'δ' WHEN 2 THEN '' WHEN 3 THEN '' WHEN 4 THEN '' ELSE '' END) AS StatesName + ,tba.RectificationPeriod,suc.IdentityCard,suc.UserName,tba.CheckTime,tba.CheckTime + FROM HSSE_Hazard_HazardRegister AS tba WITH(NOLOCK) + LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.ResponsibleUnit --AND LEN(bu.CollCropCode)=18 + LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tba.ResponsibleMan + LEFT JOIN HSSE_Hazard_HazardRegisterTypes AS regType WITH(NOLOCK) ON tba.RegisterTypesId = regType.RegisterTypesId + LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CheckManId + LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId - LEFT JOIN Technique_Rectify AS rectify WITH(NOLOCK) ON tba.RectifyId = rectify.RectifyId - WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tbb.CheckedDate>='2026-01-01' AND tbb.States > 1 - AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(suzg.IdentityCard)=18 AND rectify.RectifyName IS NOT NULL - AND tba.RectifyNoticesItemId NOT IN (SELECT RECORD_ID FROM SANKU_HAZARD WITH(NOLOCK)); + WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.CheckTime>='2026-01-01' AND ISNULL(tba.States,0) >= 0 + AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(suzg.IdentityCard)=18 AND regType.RegisterTypesName IS NOT NULL + AND tba.HazardRegisterId NOT IN (SELECT RECORD_ID FROM SANKU_HAZARD WITH(NOLOCK)); + ----¼ݳʼ + --INSERT INTO SANKU_HAZARD(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,RESPONSIBLE_PERSONNEL_ID_NUMBER,RESPONSIBLE_PERSONNEL_NAME,RECTIFIER_PERSONNEL_ID_NUMBER,RECTIFIER_PERSONNEL_NAME + -- ,DISCOVERY_DATE,HAZARD_TYPE,HAZARD_LEVEL,HAZARD_CONTENT,RECTIFICATION_STATUS,RECTIFICATION_DEADLINE_ID,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME) + --SELECT tba.RectifyNoticesItemId,pms.pro_code,pms.pro_name + -- ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName + -- ,suzg.IdentityCard,suzg.UserName,suzg.IdentityCard,suzg.UserName,tbb.CheckedDate,rectify.RectifyName + -- ,(CASE tbb.HiddenHazardType WHEN 1 THEN 'һ' WHEN 2 THEN 'ϴ' WHEN 3 THEN 'ش' ELSE 'һ' END) AS TYPE,tba.WrongContent + -- ,(CASE WHEN tbb.States = 2 THEN 'δ' WHEN tbb.States = 3 THEN '' WHEN States = 4 THEN '' WHEN States = 5 THEN '' ELSE 'δ' END) AS StatesName + -- ,tba.LimitTime,suc.IdentityCard,suc.UserName,tbb.CheckedDate,tbb.CheckedDate + --FROM Check_RectifyNoticesItem AS tba WITH(NOLOCK) + -- LEFT JOIN Check_RectifyNotices AS tbb WITH(NOLOCK) ON tbb.RectifyNoticesId = tba.RectifyNoticesId + -- --LEFT JOIN Check_RectifyNoticesFlowOperate AS tbc WITH(NOLOCK) ON tbc.RectifyNoticesId = tba.RectifyNoticesId + -- LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tbb.UnitId --AND LEN(bu.CollCropCode)=18 + -- LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tbb.DutyPersonId + -- LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.CompleteManId + -- LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId + -- LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId + -- LEFT JOIN Technique_Rectify AS rectify WITH(NOLOCK) ON tba.RectifyId = rectify.RectifyId + --WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tbb.CheckedDate>='2026-01-01' AND tbb.States > 1 + -- AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(suzg.IdentityCard)=18 AND rectify.RectifyName IS NOT NULL + -- AND tba.RectifyNoticesItemId NOT IN (SELECT RECORD_ID FROM SANKU_HAZARD WITH(NOLOCK)); END IF @type = 'SANKU_TRAINING' OR @trimType = '' diff --git a/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs b/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs index 28b4274..043863a 100644 --- a/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs +++ b/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs @@ -662,149 +662,290 @@ namespace BLL #region 隐患记录 + ///// + ///// 更新隐患记录数据 + ///// + ///// 隐患整改单id + ///// + ///// + //public static string UpdateHazardRecord(string noticeId, ref string message) + //{ + // string result = string.Empty; + // using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) + // { + // List errMsgs = new List(); + // var list = db.Check_RectifyNoticesItem.Where(x => x.RectifyNoticesId == noticeId).ToList(); + // if (list.Any()) + // { + // foreach (var obj in list) + // { + // int err = 0; + // var models = from tba in db.Check_RectifyNoticesItem + // join tbb in db.Check_RectifyNotices on tba.RectifyNoticesId equals tbb.RectifyNoticesId + // join bu in db.Base_Unit on tbb.UnitId equals bu.UnitId + // join suzg in db.Sys_User on tbb.DutyPersonId equals suzg.UserId + // join suc in db.Sys_User on tbb.CompleteManId equals suc.UserId + // join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId + // join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id + // where tba.RectifyNoticesItemId == obj.RectifyNoticesItemId + // select new SankuHazard + // { + // RECORD_ID = tba.RectifyNoticesItemId, + // //PROJECT_CODE = pms.Pro_code.ToString(), + // PROJECT_CODE = pms.Pro_code, + // PROJECT_NAME = pms.Pro_name, + // SUBCONTRACTOR_ID = bu.MasterAdOrgCode, + // SUBCONTRACTOR_CODE = bu.CollCropCode, + // SUBCONTRACTOR_NAME = bu.UnitName, + // RESPONSIBLE_PERSONNEL_ID_NUMBER = suzg.IdentityCard, + // RESPONSIBLE_PERSONNEL_NAME = suzg.UserName, + // RECTIFIER_PERSONNEL_ID_NUMBER = suzg.IdentityCard, + // RECTIFIER_PERSONNEL_NAME = suzg.UserName, + // DISCOVERY_DATE = tbb.CheckedDate == null ? DateTime.Now : (DateTime)tbb.CheckedDate, + // HAZARD_TYPE = HazardType(tba.RectifyId), + // HAZARD_LEVEL = HazardLevel(tbb.HiddenHazardType), + // HAZARD_CONTENT = tba.WrongContent, + // RECTIFICATION_STATUS = HazardState(tbb.States), + // RECTIFICATION_DEADLINE_ID = tba.LimitTime == null ? DateTime.Now.AddDays(7) : (DateTime)tba.LimitTime, + // SUBMITTER_ID_NUMBER = suc.IdentityCard, + // SUBMITTER_NAME = suc.UserName, + // //UPDATE_TIME = (DateTime)tba.CompileDate, + // //CREATE_TIME = (DateTime)tba.CompileDate + // }; + // var model = models.ToList().FirstOrDefault(); + // if (model != null) + // { + // if (string.IsNullOrWhiteSpace(model.PROJECT_CODE)) + // { + // err++; + // errMsgs.Add("项目未关联集团主数据"); + // } + // if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE)) + // { + // err++; + // errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码为空"); + // } + // else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18) + // { + // err++; + // errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码异常"); + // } + // //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18) + // //{ + // // errMsgs.Add("填报人身份证异常"); + // //} + // if (err > 0) + // { + // continue; + // } + // else + // { + // var exist = db.SANKU_HAZARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault(); + // if (exist != null) + // { + // //更新三库 + // exist.RECORD_ID = model.RECORD_ID; + // exist.PROJECT_CODE = model.PROJECT_CODE; + // exist.PROJECT_NAME = model.PROJECT_NAME; + // exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; + // exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; + // exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; + // exist.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; + // exist.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; + // exist.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; + // exist.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; + // exist.DISCOVERY_DATE = model.DISCOVERY_DATE; + // exist.HAZARD_TYPE = model.HAZARD_TYPE; + // exist.HAZARD_LEVEL = model.HAZARD_LEVEL; + // exist.HAZARD_CONTENT = model.HAZARD_CONTENT; + // exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; + // exist.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; + // exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; + // exist.SUBMITTER_NAME = model.SUBMITTER_NAME; + // exist.UPDATE_TIME = DateTime.Now; + // //exist.UPDATE_TIME = model.UPDATE_TIME; + // //exist.CREATE_TIME = model.CREATE_TIME; + // exist.ReportDate = null; + // } + // else + // { + // //新增三库 + // var newModel = new SANKU_HAZARD(); + // newModel.RECORD_ID = model.RECORD_ID; + // newModel.PROJECT_CODE = model.PROJECT_CODE; + // newModel.PROJECT_NAME = model.PROJECT_NAME; + // newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; + // newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; + // newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; + // newModel.PROJECT_NAME = model.PROJECT_NAME; + // newModel.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; + // newModel.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; + // newModel.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; + // newModel.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; + // newModel.DISCOVERY_DATE = model.DISCOVERY_DATE; + // newModel.HAZARD_TYPE = model.HAZARD_TYPE; + // newModel.HAZARD_LEVEL = model.HAZARD_LEVEL; + // newModel.HAZARD_CONTENT = model.HAZARD_CONTENT; + // newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; + // newModel.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; + // newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; + // newModel.SUBMITTER_NAME = model.SUBMITTER_NAME; + // newModel.UPDATE_TIME = DateTime.Now; + // //newModel.UPDATE_TIME = model.UPDATE_TIME; + // newModel.CREATE_TIME = DateTime.Now; + // db.SANKU_HAZARD.InsertOnSubmit(newModel); + // } + // db.SubmitChanges(); + // } + // } + // } + + // errMsgs = errMsgs.Distinct().ToList(); + // if (errMsgs.Any()) + // { + // message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}"; + // } + // } + // //else + // //{ + // // message = $"不更新三库，整改单无隐患明细"; + // //} + // return result; + // } + //} + /// /// 更新隐患记录数据 /// - /// 隐患整改单id + /// 隐患id /// /// - public static string UpdateHazardRecord(string noticeId, ref string message) + public static string UpdateHazardRecord(string hazardId, ref string message) { string result = string.Empty; using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) { + var models = from tba in db.HSSE_Hazard_HazardRegister + join bu in db.Base_Unit on tba.ResponsibleUnit equals bu.UnitId + join regType in db.HSSE_Hazard_HazardRegisterTypes on tba.RegisterTypesId equals regType.RegisterTypesId + join suzg in db.Sys_User on tba.ResponsibleMan equals suzg.UserId + join suc in db.Sys_User on tba.CheckManId equals suc.UserId + join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId + join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id + where tba.HazardRegisterId == hazardId + select new SankuHazard + { + RECORD_ID = tba.HazardRegisterId, + //PROJECT_CODE = pms.Pro_code.ToString(), + PROJECT_CODE = pms.Pro_code, + PROJECT_NAME = pms.Pro_name, + SUBCONTRACTOR_ID = bu.MasterAdOrgCode, + SUBCONTRACTOR_CODE = bu.CollCropCode, + SUBCONTRACTOR_NAME = bu.UnitName, + RESPONSIBLE_PERSONNEL_ID_NUMBER = suzg.IdentityCard, + RESPONSIBLE_PERSONNEL_NAME = suzg.UserName, + RECTIFIER_PERSONNEL_ID_NUMBER = suzg.IdentityCard, + RECTIFIER_PERSONNEL_NAME = suzg.UserName, + DISCOVERY_DATE = tba.CheckTime == null ? DateTime.Now : (DateTime)tba.CheckTime, + HAZARD_TYPE = regType.RegisterTypesName, + HAZARD_LEVEL = HazardLevel(tba.Risk_Level), + HAZARD_CONTENT = tba.RegisterDef, + RECTIFICATION_STATUS = HazardState(tba.States), + RECTIFICATION_DEADLINE_ID = tba.RectificationPeriod == null ? DateTime.Now.AddDays(7) : (DateTime)tba.RectificationPeriod, + SUBMITTER_ID_NUMBER = suc.IdentityCard, + SUBMITTER_NAME = suc.UserName, + //UPDATE_TIME = (DateTime)tba.CompileDate, + //CREATE_TIME = (DateTime)tba.CompileDate + }; + var model = models.ToList().FirstOrDefault(); List errMsgs = new List(); - var list = db.Check_RectifyNoticesItem.Where(x => x.RectifyNoticesId == noticeId).ToList(); - if (list.Any()) + if (model != null) { - foreach (var obj in list) + if (string.IsNullOrWhiteSpace(model.PROJECT_CODE)) { - int err = 0; - var models = from tba in db.Check_RectifyNoticesItem - join tbb in db.Check_RectifyNotices on tba.RectifyNoticesId equals tbb.RectifyNoticesId - join bu in db.Base_Unit on tbb.UnitId equals bu.UnitId - join suzg in db.Sys_User on tbb.DutyPersonId equals suzg.UserId - join suc in db.Sys_User on tbb.CompleteManId equals suc.UserId - join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId - join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id - where tba.RectifyNoticesItemId == obj.RectifyNoticesItemId - select new SankuHazard - { - RECORD_ID = tba.RectifyNoticesItemId, - //PROJECT_CODE = pms.Pro_code.ToString(), - PROJECT_CODE = pms.Pro_code, - PROJECT_NAME = pms.Pro_name, - SUBCONTRACTOR_ID = bu.MasterAdOrgCode, - SUBCONTRACTOR_CODE = bu.CollCropCode, - SUBCONTRACTOR_NAME = bu.UnitName, - RESPONSIBLE_PERSONNEL_ID_NUMBER = suzg.IdentityCard, - RESPONSIBLE_PERSONNEL_NAME = suzg.UserName, - RECTIFIER_PERSONNEL_ID_NUMBER = suzg.IdentityCard, - RECTIFIER_PERSONNEL_NAME = suzg.UserName, - DISCOVERY_DATE = tbb.CheckedDate == null ? DateTime.Now : (DateTime)tbb.CheckedDate, - HAZARD_TYPE = HazardType(tba.RectifyId), - HAZARD_LEVEL = HazardLevel(tbb.HiddenHazardType), - HAZARD_CONTENT = tba.WrongContent, - RECTIFICATION_STATUS = HazardState(tbb.States), - RECTIFICATION_DEADLINE_ID = tba.LimitTime == null ? DateTime.Now.AddDays(7) : (DateTime)tba.LimitTime, - SUBMITTER_ID_NUMBER = suc.IdentityCard, - SUBMITTER_NAME = suc.UserName, - //UPDATE_TIME = (DateTime)tba.CompileDate, - //CREATE_TIME = (DateTime)tba.CompileDate - }; - var model = models.ToList().FirstOrDefault(); - if (model != null) - { - if (string.IsNullOrWhiteSpace(model.PROJECT_CODE)) - { - err++; - errMsgs.Add("项目未关联集团主数据"); - } - if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE)) - { - err++; - errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码为空"); - } - else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18) - { - err++; - errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码异常"); - } - //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18) - //{ - // errMsgs.Add("填报人身份证异常"); - //} - if (err > 0) - { - continue; - } - else - { - var exist = db.SANKU_HAZARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault(); - if (exist != null) - { - //更新三库 - exist.RECORD_ID = model.RECORD_ID; - exist.PROJECT_CODE = model.PROJECT_CODE; - exist.PROJECT_NAME = model.PROJECT_NAME; - exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; - exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; - exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; - exist.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; - exist.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; - exist.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; - exist.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; - exist.DISCOVERY_DATE = model.DISCOVERY_DATE; - exist.HAZARD_TYPE = model.HAZARD_TYPE; - exist.HAZARD_LEVEL = model.HAZARD_LEVEL; - exist.HAZARD_CONTENT = model.HAZARD_CONTENT; - exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; - exist.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; - exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; - exist.SUBMITTER_NAME = model.SUBMITTER_NAME; - exist.UPDATE_TIME = DateTime.Now; - //exist.UPDATE_TIME = model.UPDATE_TIME; - //exist.CREATE_TIME = model.CREATE_TIME; - exist.ReportDate = null; - } - else - { - //新增三库 - var newModel = new SANKU_HAZARD(); - newModel.RECORD_ID = model.RECORD_ID; - newModel.PROJECT_CODE = model.PROJECT_CODE; - newModel.PROJECT_NAME = model.PROJECT_NAME; - newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; - newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; - newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; - newModel.PROJECT_NAME = model.PROJECT_NAME; - newModel.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; - newModel.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; - newModel.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; - newModel.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; - newModel.DISCOVERY_DATE = model.DISCOVERY_DATE; - newModel.HAZARD_TYPE = model.HAZARD_TYPE; - newModel.HAZARD_LEVEL = model.HAZARD_LEVEL; - newModel.HAZARD_CONTENT = model.HAZARD_CONTENT; - newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; - newModel.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; - newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; - newModel.SUBMITTER_NAME = model.SUBMITTER_NAME; - newModel.UPDATE_TIME = DateTime.Now; - //newModel.UPDATE_TIME = model.UPDATE_TIME; - newModel.CREATE_TIME = DateTime.Now; - db.SANKU_HAZARD.InsertOnSubmit(newModel); - } - db.SubmitChanges(); - } - } + errMsgs.Add("项目未关联集团主数据"); } - - errMsgs = errMsgs.Distinct().ToList(); + if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE)) + { + errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码为空"); + } + else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18) + { + errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码异常"); + } + //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18) + //{ + // errMsgs.Add("填报人身份证异常"); + //} if (errMsgs.Any()) { - message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}"; + message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}"; } + else + { + var exist = db.SANKU_HAZARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault(); + if (exist != null) + { + //更新三库 + exist.RECORD_ID = model.RECORD_ID; + exist.PROJECT_CODE = model.PROJECT_CODE; + exist.PROJECT_NAME = model.PROJECT_NAME; + exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; + exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; + exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; + exist.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; + exist.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; + exist.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; + exist.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; + exist.DISCOVERY_DATE = model.DISCOVERY_DATE; + exist.HAZARD_TYPE = model.HAZARD_TYPE; + exist.HAZARD_LEVEL = model.HAZARD_LEVEL; + exist.HAZARD_CONTENT = model.HAZARD_CONTENT; + exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; + exist.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; + exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; + exist.SUBMITTER_NAME = model.SUBMITTER_NAME; + exist.UPDATE_TIME = DateTime.Now; + //exist.UPDATE_TIME = model.UPDATE_TIME; + //exist.CREATE_TIME = model.CREATE_TIME; + exist.ReportDate = null; + } + else + { + //新增三库 + var newModel = new SANKU_HAZARD(); + newModel.RECORD_ID = model.RECORD_ID; + newModel.PROJECT_CODE = model.PROJECT_CODE; + newModel.PROJECT_NAME = model.PROJECT_NAME; + newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID; + newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE; + newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME; + newModel.PROJECT_NAME = model.PROJECT_NAME; + newModel.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER; + newModel.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME; + newModel.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER; + newModel.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME; + newModel.DISCOVERY_DATE = model.DISCOVERY_DATE; + newModel.HAZARD_TYPE = model.HAZARD_TYPE; + newModel.HAZARD_LEVEL = model.HAZARD_LEVEL; + newModel.HAZARD_CONTENT = model.HAZARD_CONTENT; + newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS; + newModel.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID; + newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER; + newModel.SUBMITTER_NAME = model.SUBMITTER_NAME; + newModel.UPDATE_TIME = DateTime.Now; + //newModel.UPDATE_TIME = model.UPDATE_TIME; + newModel.CREATE_TIME = DateTime.Now; + db.SANKU_HAZARD.InsertOnSubmit(newModel); + } + db.SubmitChanges(); + } + } + + errMsgs = errMsgs.Distinct().ToList(); + if (errMsgs.Any()) + { + message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}"; } //else //{ diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs index bc641aa..5d62281 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs @@ -333,6 +333,13 @@ namespace FineUIPro.Web.HSSE.HiddenInspection BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnAdd); } + //更新三库隐患记录 + string message = string.Empty; + SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message); + if (!string.IsNullOrWhiteSpace(message)) + { + ShowNotify(message, MessageBoxIcon.Warning); + } //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection); if (isClosed) { diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs index a4a4643..8fd2f9d 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs @@ -204,6 +204,13 @@ namespace FineUIPro.Web.HSSE.HiddenInspection } + } + //更新三库隐患记录 + string message = string.Empty; + SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message); + if (!string.IsNullOrWhiteSpace(message)) + { + ShowNotify(message, MessageBoxIcon.Warning); } BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnModify); diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs index bb54388..2e4f7c5 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs @@ -159,6 +159,13 @@ namespace FineUIPro.Web.HiddenInspection register.Rectification = this.txtRectification.Text.Trim(); register.RectificationTime = DateTime.Now; BLL.HSSE_Hazard_HazardRegisterService.UpdateHazardRegister(register); + //更新三库隐患记录 + string message = string.Empty; + SanKuDataSummaryReportService.UpdateHazardRecord(register.HazardRegisterId, ref message); + if (!string.IsNullOrWhiteSpace(message)) + { + ShowNotify(message, MessageBoxIcon.Warning); + } BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnModify); if (isClosed) {