diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index efecd47..abaef01 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -13993,152 +13993,155 @@ namespace APT.BaseData.Services.DomainServices foreach (var bm in summarys) { var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID); - T_SK_RISK_EVALUATION result = new T_SK_RISK_EVALUATION(); - result.ORG_ID = entity.ORG_ID; - result.IDENTIFY_EVALUATION_PLAN_ID = entity.IDENTIFY_EVALUATION_PLAN_ID; - result.APPLY_USER_ID = bm.APPLY_USER_ID; - result.APPLY_DEPARTMENT_ID = bm.APPLY_DEPARTMENT_ID; - result.YEAR = entity.YEAR; - result.START_DATE = entity.START_DATE; - result.END_DATE = entity.END_DATE; - result.REQUIRE_ID = requre?.ID; - result.ISCOMPANY = bm.ISCOMPANY; - results.Add(result); - var planTemp = this.GetEntity(t => t.ID == entity.IDENTIFY_EVALUATION_PLAN_ID, "Nav_Evaluations"); - if (planTemp != null && planTemp.Nav_Evaluations != null && planTemp.Nav_Evaluations.Any()) + if (user != null) { - foreach (var itemReq in planTemp.Nav_Evaluations) + T_SK_RISK_EVALUATION result = new T_SK_RISK_EVALUATION(); + result.ORG_ID = entity.ORG_ID; + result.IDENTIFY_EVALUATION_PLAN_ID = entity.IDENTIFY_EVALUATION_PLAN_ID; + result.APPLY_USER_ID = bm.APPLY_USER_ID; + result.APPLY_DEPARTMENT_ID = bm.APPLY_DEPARTMENT_ID; + result.YEAR = entity.YEAR; + result.START_DATE = entity.START_DATE; + result.END_DATE = entity.END_DATE; + result.REQUIRE_ID = requre?.ID; + result.ISCOMPANY = bm.ISCOMPANY; + results.Add(result); + var planTemp = this.GetEntity(t => t.ID == entity.IDENTIFY_EVALUATION_PLAN_ID, "Nav_Evaluations"); + if (planTemp != null && planTemp.Nav_Evaluations != null && planTemp.Nav_Evaluations.Any()) { - T_SK_RISK_EVALUATION_REQUIRE re = new T_SK_RISK_EVALUATION_REQUIRE(); - re.ORG_ID = itemReq.ORG_ID; - re.RISK_EVALUATION_ID = result.ID; - re.REQUIRE_ID = itemReq.EVALUATION_ID; - resultRequires.Add(re); + foreach (var itemReq in planTemp.Nav_Evaluations) + { + T_SK_RISK_EVALUATION_REQUIRE re = new T_SK_RISK_EVALUATION_REQUIRE(); + re.ORG_ID = itemReq.ORG_ID; + re.RISK_EVALUATION_ID = result.ID; + re.REQUIRE_ID = itemReq.EVALUATION_ID; + resultRequires.Add(re); + } } - } - var detailTemps = summaryDetails.Where(t => t.RISK_IDENTIFY_RESULT_ID == bm.ID).ToList(); - if (detailTemps.Any()) - { - foreach (var de in detailTemps) - { - if (de != null) - { - var departTemp = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID); - T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL(); - detail.ORG_ID = entity.ORG_ID; - detail.RISK_EVALUATION_ID = result.ID; - detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID; - detail.AREA_ID = de.AREA_ID; - detail.RISK_NAME = de.RISK_NAME; - detail.RISK_DESCRIPTION = de.RISK_DESCRIPTION; - detail.TYPE_ID = de.TYPE_ID; - detail.EVALUATE_L = departTemp == null ? 0 : departTemp.EVALUATE_L; - detail.EVALUATE_E = departTemp == null ? 0 : departTemp.EVALUATE_E; - detail.EVALUATE_C = departTemp == null ? 0 : departTemp.EVALUATE_C; - detail.SCOREC_ID = departTemp?.SCOREC_ID; - detail.SCOREE_ID = departTemp?.SCOREE_ID; - detail.SCOREL_ID = departTemp?.SCOREL_ID; - detail.EVALUATE_SCORE = departTemp == null ? 0 : departTemp.EVALUATE_SCORE; - detail.EVALUATE_LEVEL = departTemp == null ? SKEvaluateLevelEnum.低风险 : departTemp.EVALUATE_LEVEL; - detail.MARK = de.MARK; - detail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID; - detail.ENABLE_STATUS = de.ENABLE_STATUS; - detail.MEASURE = de.MEASURE; - detail.EMERGENCY = de.EMERGENCY; - //if (departTemp != null) - //{ - var sumDetailTemps = summaryMes.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).Select(m=>m.MEASURE).Distinct().ToList(); - if (sumDetailTemps.Any()) + var detailTemps = summaryDetails.Where(t => t.RISK_IDENTIFY_RESULT_ID == bm.ID).ToList(); + if (detailTemps.Any()) + { + foreach (var de in detailTemps) + { + if (de != null) { - var i = 1; - foreach (var item in sumDetailTemps) + var departTemp = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && t.AREA_ID == de.AREA_ID && t.RISK_NAME == de.RISK_NAME && t.RISK_DESCRIPTION == de.RISK_DESCRIPTION && t.TYPE_ID == de.TYPE_ID); + T_SK_RISK_EVALUATION_DETAIL detail = new T_SK_RISK_EVALUATION_DETAIL(); + detail.ORG_ID = entity.ORG_ID; + detail.RISK_EVALUATION_ID = result.ID; + detail.PRODUCTION_UNIT_ID = de.PRODUCTION_UNIT_ID; + detail.AREA_ID = de.AREA_ID; + detail.RISK_NAME = de.RISK_NAME; + detail.RISK_DESCRIPTION = de.RISK_DESCRIPTION; + detail.TYPE_ID = de.TYPE_ID; + detail.EVALUATE_L = departTemp == null ? 0 : departTemp.EVALUATE_L; + detail.EVALUATE_E = departTemp == null ? 0 : departTemp.EVALUATE_E; + detail.EVALUATE_C = departTemp == null ? 0 : departTemp.EVALUATE_C; + detail.SCOREC_ID = departTemp?.SCOREC_ID; + detail.SCOREE_ID = departTemp?.SCOREE_ID; + detail.SCOREL_ID = departTemp?.SCOREL_ID; + detail.EVALUATE_SCORE = departTemp == null ? 0 : departTemp.EVALUATE_SCORE; + detail.EVALUATE_LEVEL = departTemp == null ? SKEvaluateLevelEnum.低风险 : departTemp.EVALUATE_LEVEL; + detail.MARK = de.MARK; + detail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID; + detail.ENABLE_STATUS = de.ENABLE_STATUS; + detail.MEASURE = de.MEASURE; + detail.EMERGENCY = de.EMERGENCY; + //if (departTemp != null) + //{ + var sumDetailTemps = summaryMes.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).Select(m => m.MEASURE).Distinct().ToList(); + if (sumDetailTemps.Any()) { - T_SK_RISK_EVALUATION_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_DETAIL_MEASURE(); - dep.MEASURES_NAME = item; - dep.NUM = i; - dep.ORG_ID = detail.ORG_ID; - dep.RISK_EVALUATION_DETAIL_ID = detail.ID; - detailMeasures.Add(dep); - //var measureTemp = i + "、" + item; - //detail.MEASURE = detail.MEASURE + measureTemp; - i++; - } - } - //var libraryDepartTemps = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); - //if (libraryDepartTemps.Any()) - //{ - // var i = 1; - // foreach (var item in libraryDepartTemps) - // { - // T_SK_RISK_EVALUATION_DETAIL_DEPART dep = new T_SK_RISK_EVALUATION_DETAIL_DEPART(); - // dep.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; - // dep.DEPARTMENT_ID = item.DEPARTMENT_ID; - // dep.USER_ID = item.USER_ID; - // dep.ORG_ID = item.ORG_ID; - // dep.RISK_EVALUATION_DETAIL_ID = detail.ID; - // detailDeparts.Add(dep); - // var departFirstTemp = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID); - // var userFirst = users.FirstOrDefault(t => t.ID == departFirstTemp?.USER_ID); - // var typeTemp = i + "、" + item.DEPARTMENT_TYPE.GetDescription() + "；"; - // detail.DEPARTMENT_TYPE = detail.DEPARTMENT_TYPE + typeTemp; - // var departTempx = i + "、" + departFirstTemp?.NAME + "；"; ; - // detail.IDENTIFY_DEPARTMENT = detail.IDENTIFY_DEPARTMENT + departTempx; - // var userTemp = i + "、" + userFirst?.NAME + "；"; ; - // detail.IDENTIFY_USER = detail.IDENTIFY_USER + typeTemp; - // i++; - // } - //} - var sumPostTemps = summaryPosts.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).ToList(); - if (sumPostTemps.Any()) - { - foreach (var item in sumPostTemps) - { - T_SK_RISK_EVALUATION_DETAIL_DEPART dep = new T_SK_RISK_EVALUATION_DETAIL_DEPART(); - dep.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; - dep.DEPARTMENT_ID = item.DEPARTMENT_ID; - dep.USER_ID = departs.FirstOrDefault(t=>t.ID == item.DEPARTMENT_ID)?.USER_ID; - dep.ORG_ID = item.ORG_ID; - dep.RISK_EVALUATION_DETAIL_ID = detail.ID; - detailDeparts.Add(dep); - T_SK_RISK_EVALUATION_DETAIL_POST pos = new T_SK_RISK_EVALUATION_DETAIL_POST(); - pos.DEPARTMENT_ID = item.DEPARTMENT_ID; - pos.ORG_ID = item.ORG_ID; - pos.RISK_EVALUATION_DETAIL_ID = detail.ID; - detailPosts.Add(pos); - if (item.Nav_ResultPostDets != null && item.Nav_ResultPostDets.Any()) + var i = 1; + foreach (var item in sumDetailTemps) { - foreach (var item2 in item.Nav_ResultPostDets) + T_SK_RISK_EVALUATION_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_DETAIL_MEASURE(); + dep.MEASURES_NAME = item; + dep.NUM = i; + dep.ORG_ID = detail.ORG_ID; + dep.RISK_EVALUATION_DETAIL_ID = detail.ID; + detailMeasures.Add(dep); + //var measureTemp = i + "、" + item; + //detail.MEASURE = detail.MEASURE + measureTemp; + i++; + } + } + //var libraryDepartTemps = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); + //if (libraryDepartTemps.Any()) + //{ + // var i = 1; + // foreach (var item in libraryDepartTemps) + // { + // T_SK_RISK_EVALUATION_DETAIL_DEPART dep = new T_SK_RISK_EVALUATION_DETAIL_DEPART(); + // dep.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; + // dep.DEPARTMENT_ID = item.DEPARTMENT_ID; + // dep.USER_ID = item.USER_ID; + // dep.ORG_ID = item.ORG_ID; + // dep.RISK_EVALUATION_DETAIL_ID = detail.ID; + // detailDeparts.Add(dep); + // var departFirstTemp = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID); + // var userFirst = users.FirstOrDefault(t => t.ID == departFirstTemp?.USER_ID); + // var typeTemp = i + "、" + item.DEPARTMENT_TYPE.GetDescription() + "；"; + // detail.DEPARTMENT_TYPE = detail.DEPARTMENT_TYPE + typeTemp; + // var departTempx = i + "、" + departFirstTemp?.NAME + "；"; ; + // detail.IDENTIFY_DEPARTMENT = detail.IDENTIFY_DEPARTMENT + departTempx; + // var userTemp = i + "、" + userFirst?.NAME + "；"; ; + // detail.IDENTIFY_USER = detail.IDENTIFY_USER + typeTemp; + // i++; + // } + //} + var sumPostTemps = summaryPosts.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).ToList(); + if (sumPostTemps.Any()) + { + foreach (var item in sumPostTemps) + { + T_SK_RISK_EVALUATION_DETAIL_DEPART dep = new T_SK_RISK_EVALUATION_DETAIL_DEPART(); + dep.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; + dep.DEPARTMENT_ID = item.DEPARTMENT_ID; + dep.USER_ID = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID)?.USER_ID; + dep.ORG_ID = item.ORG_ID; + dep.RISK_EVALUATION_DETAIL_ID = detail.ID; + detailDeparts.Add(dep); + T_SK_RISK_EVALUATION_DETAIL_POST pos = new T_SK_RISK_EVALUATION_DETAIL_POST(); + pos.DEPARTMENT_ID = item.DEPARTMENT_ID; + pos.ORG_ID = item.ORG_ID; + pos.RISK_EVALUATION_DETAIL_ID = detail.ID; + detailPosts.Add(pos); + if (item.Nav_ResultPostDets != null && item.Nav_ResultPostDets.Any()) { - T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL(); - depDetail.POST_ID = item2.POST_ID; - depDetail.ORG_ID = item.ORG_ID; - depDetail.RISK_EVALUATION_DETAIL_POST_ID = pos.ID; - detailPostDetails.Add(depDetail); + foreach (var item2 in item.Nav_ResultPostDets) + { + T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL(); + depDetail.POST_ID = item2.POST_ID; + depDetail.ORG_ID = item.ORG_ID; + depDetail.RISK_EVALUATION_DETAIL_POST_ID = pos.ID; + detailPostDetails.Add(depDetail); + } } } } + //} + resultDetails.Add(detail); } - //} - resultDetails.Add(detail); - } - } - var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0'), result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039"); - notices.Add(noticeTask); - //T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN(); - //modelBegin.ID = Guid.NewGuid(); - //modelBegin.ORG_ID = entity.ORG_ID; - //modelBegin.SOURCETYPE = SOURCETYPE.SK037ToMeet; - //modelBegin.TABLENAME = "T_SK_RISK_IDENTIFY_RESULT_SUMMARY"; - //modelBegin.DATA_ID = entity.ID; - //modelBegin.ISBEGIN = false; - //modelBegin.USER_ID = user.ID; - //modelBegin.CREATE_TIME = DateTime.Now; - //modelBegin.CREATER_ID = user.ID; - //modelBegins.Add(modelBegin); - //触发今日提醒 - { - var noticeDay = NotificationTaskService.InsertUserNoticeTaskModel("请召开《危险源辨识与风险评估》会议，确定风险等级和管控措施（含应急处置、辨识岗位、管控层级、检查内容、检查层级等）", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.今日提醒, "PF135"); - notices.Add(noticeDay); + } + var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0'), result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039"); + notices.Add(noticeTask); + //T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN(); + //modelBegin.ID = Guid.NewGuid(); + //modelBegin.ORG_ID = entity.ORG_ID; + //modelBegin.SOURCETYPE = SOURCETYPE.SK037ToMeet; + //modelBegin.TABLENAME = "T_SK_RISK_IDENTIFY_RESULT_SUMMARY"; + //modelBegin.DATA_ID = entity.ID; + //modelBegin.ISBEGIN = false; + //modelBegin.USER_ID = user.ID; + //modelBegin.CREATE_TIME = DateTime.Now; + //modelBegin.CREATER_ID = user.ID; + //modelBegins.Add(modelBegin); + //触发今日提醒 + { + var noticeDay = NotificationTaskService.InsertUserNoticeTaskModel("请召开《危险源辨识与风险评估》会议，确定风险等级和管控措施（含应急处置、辨识岗位、管控层级、检查内容、检查层级等）", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.今日提醒, "PF135"); + notices.Add(noticeDay); + } } } } diff --git a/APT.MS.Domain/Enums/FO/FOShiftRecordEnum.cs b/APT.MS.Domain/Enums/FO/FOShiftRecordEnum.cs index 8a4f40c..d69620b 100644 --- a/APT.MS.Domain/Enums/FO/FOShiftRecordEnum.cs +++ b/APT.MS.Domain/Enums/FO/FOShiftRecordEnum.cs @@ -241,14 +241,14 @@ namespace APT.MS.Domain.Enums [Description("审核中")] Approving = 5, /// - /// 审核完成 + /// 技术交底 /// - [Description("审核完成")] + [Description("技术交底")] ApprovingFinish = 6, /// - /// 动火人员确认 10 + /// 动火人员现场验收 10 /// - [Description("动火人员确认")] + [Description("动火现场验收")] Sign = 10, /// /// 审阅中 15 @@ -256,14 +256,14 @@ namespace APT.MS.Domain.Enums [Description("审阅中")] Reading = 15, /// - /// 监护人 18 + /// 监护人监护 18 /// - [Description("监护人")] + [Description("监护人监护")] Monitor = 18, /// - /// 完工审阅 21 + /// 完工验收 21 /// - [Description("完工审阅")] + [Description("完工验收")] ReadingFinish = 21, ///