diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 74b55de..5471d99 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -457,18 +457,21 @@ namespace APT.BaseData.Services.DomainServices case (int)BSQuestionLevelEnum.重大: delayDays = (int)BSDelayDaysEnum.重大; break; - case (int)BSQuestionLevelEnum.A: + case (int)BSQuestionLevelEnum.非重大: delayDays = (int)BSDelayDaysEnum.A; break; - case (int)BSQuestionLevelEnum.B: - delayDays = (int)BSDelayDaysEnum.B; - break; - case (int)BSQuestionLevelEnum.C: - delayDays = (int)BSDelayDaysEnum.C; - break; - case (int)BSQuestionLevelEnum.D: - delayDays = (int)BSDelayDaysEnum.D; - break; + //case (int)BSQuestionLevelEnum.A: + // delayDays = (int)BSDelayDaysEnum.A; + // break; + //case (int)BSQuestionLevelEnum.B: + // delayDays = (int)BSDelayDaysEnum.B; + // break; + //case (int)BSQuestionLevelEnum.C: + // delayDays = (int)BSDelayDaysEnum.C; + // break; + //case (int)BSQuestionLevelEnum.D: + // delayDays = (int)BSDelayDaysEnum.D; + // break; default: break; } @@ -5360,7 +5363,7 @@ namespace APT.BaseData.Services.DomainServices fileIds.Add(file.IMG_FILE_ID); } DepartmentService.AddDocument("风险管理", "年度风险评价计划审核表", "年度风险评价计划", "附件", "计划文件", DateTime.Now.AddYears(1), entity.ID, fileIds, entity.RELEASE_USER_ID); - + if (orgId == Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))//行洛坑 { sendUser = (Guid)GetEntity(t => t.NAME == "办公室").USER_ID; @@ -5529,7 +5532,7 @@ namespace APT.BaseData.Services.DomainServices hazardTask.ORG_ID = entity.ORG_ID; hazardTask.LIABLE_USER_ID = hazardDetail.CHARGE_USER_ID; hazardTask.PLAN_ID = entity.ID; - foreach(var t in hazardDetail.Nav_Areas) + foreach (var t in hazardDetail.Nav_Areas) { T_HM_HAZARD_TASK_AREA area = new T_HM_HAZARD_TASK_AREA(); area.ORG_ID = entity.ORG_ID; @@ -5547,7 +5550,7 @@ namespace APT.BaseData.Services.DomainServices BaseFilter hazardfilter = new BaseFilter(orgId); hazardfilter.SelectField = new string[] { "IDENTIFYING_ID" }; var hazarddb = GetEntities(t => t.AREA_ID == t.AREA_ID && t.STATUS == 0, hazardfilter); - foreach(var hazard in hazarddb) + foreach (var hazard in hazarddb) { T_HM_HAZARD_TASK_DETAIL_IDENTIFYING taskDetailIdentify = new T_HM_HAZARD_TASK_DETAIL_IDENTIFYING(); taskDetailIdentify.ORG_ID = entity.ORG_ID; @@ -5576,7 +5579,7 @@ namespace APT.BaseData.Services.DomainServices noticeEndTime.Add(DateTime.Parse(hazardTask.END_TIME.ToShortDateString() + " 23:59:59")); hazards.Add(hazardTask); } - sendNoticeList = NotificationTaskService.InsertUserNoticeTaskModels( noticeTitles, noticeDataIds, entity.ORG_ID, noticeUserIds, noticeUserNames, DateTime.Now, noticeEndTime, (int)FMNoticeTypeEnum.消息, noticeFormCodes); + sendNoticeList = NotificationTaskService.InsertUserNoticeTaskModels(noticeTitles, noticeDataIds, entity.ORG_ID, noticeUserIds, noticeUserNames, DateTime.Now, noticeEndTime, (int)FMNoticeTypeEnum.消息, noticeFormCodes); this.UnifiedCommit(() => { if (entity != null) @@ -7212,17 +7215,20 @@ namespace APT.BaseData.Services.DomainServices case (int)BSQuestionLevelEnum.重大: delayDays = (int)BSDelayDaysEnum.重大; break; - case (int)BSQuestionLevelEnum.A: + case (int)BSQuestionLevelEnum.非重大: delayDays = (int)BSDelayDaysEnum.A; break; - case (int)BSQuestionLevelEnum.B: - delayDays = (int)BSDelayDaysEnum.B; - break; - case (int)BSQuestionLevelEnum.C: - delayDays = (int)BSDelayDaysEnum.C; - break; - case (int)BSQuestionLevelEnum.D: - delayDays = (int)BSDelayDaysEnum.D; + //case (int)BSQuestionLevelEnum.A: + // delayDays = (int)BSDelayDaysEnum.A; + // break; + //case (int)BSQuestionLevelEnum.B: + // delayDays = (int)BSDelayDaysEnum.B; + // break; + //case (int)BSQuestionLevelEnum.C: + // delayDays = (int)BSDelayDaysEnum.C; + // break; + //case (int)BSQuestionLevelEnum.D: + // delayDays = (int)BSDelayDaysEnum.D; break; default: break; diff --git a/APT.MS.Domain/Enums/BS/BSEnums.cs b/APT.MS.Domain/Enums/BS/BSEnums.cs index e982050..9d01ed0 100644 --- a/APT.MS.Domain/Enums/BS/BSEnums.cs +++ b/APT.MS.Domain/Enums/BS/BSEnums.cs @@ -39,10 +39,11 @@ namespace APT.MS.Domain.Enums //D = 4, 重大 = 10, - A = 20, - B = 30, - C = 40, - D = 50, + 非重大 = 20, + //A = 20, + //B = 30, + //C = 40, + //D = 50, } diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index 06979ac..ee6502a 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -998,17 +998,20 @@ namespace APT.BS.WebApi.Controllers.Api case (int)BSQuestionLevelEnum.重大: delayDays = (int)BSDelayDaysEnum.重大; break; - case (int)BSQuestionLevelEnum.A: + case (int)BSQuestionLevelEnum.非重大: delayDays = (int)BSDelayDaysEnum.A; break; - case (int)BSQuestionLevelEnum.B: - delayDays = (int)BSDelayDaysEnum.B; - break; - case (int)BSQuestionLevelEnum.C: - delayDays = (int)BSDelayDaysEnum.C; - break; - case (int)BSQuestionLevelEnum.D: - delayDays = (int)BSDelayDaysEnum.D; + //case (int)BSQuestionLevelEnum.A: + // delayDays = (int)BSDelayDaysEnum.A; + // break; + //case (int)BSQuestionLevelEnum.B: + // delayDays = (int)BSDelayDaysEnum.B; + // break; + //case (int)BSQuestionLevelEnum.C: + // delayDays = (int)BSDelayDaysEnum.C; + // break; + //case (int)BSQuestionLevelEnum.D: + // delayDays = (int)BSDelayDaysEnum.D; break; default: break;