From b49ce874a53c05a3e8c8a289eaa9efe824a0cf9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Fri, 3 Apr 2026 17:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=BA=90=E4=B8=A4=E5=BC=A0=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 2 +- .../Controllers/Api/FOController.cs | 16 +++--- .../HiddenDangerRectifyRecordController.cs | 44 ++++++++-------- .../MajorAccidentHazardManageController.cs | 50 +++++++++---------- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 9cdb03e..53a167f 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -12311,7 +12311,7 @@ namespace APT.BaseData.Services.DomainServices major.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; } notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表"+ DateTime.Now.ToShortDateString().Replace("/", ""), major.ID, major.ORG_ID, user.ID, user.NAME, DateTime.Now, - DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK091"); + DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080"); } UnifiedCommit(() => { diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs index f49042d..8577cae 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs @@ -2204,27 +2204,27 @@ namespace APT.PP.WebApi.Controllers.Api.PP { dt = DateTime.Parse(filter.Parameter1); } - var dtThree = dt.AddMonths(-3);//前三个月 + var dtThree = dt.AddMonths(3);//前三个月 //找安全总监 var user = this.GetEntity(t => t.ENABLE_STATUS == 0 && t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME.Contains("安全总监")); //找营业期限或者采矿许可证有效期或者安全生产许可证有效期到期前3个月的数据 - var infos = this.GetEntities(t =>(t.WORK_DATE!=null&& t.WORK_DATE < dtThree) || (t.ALLOW_DATE != null && t.ALLOW_DATE < dtThree) || (t.SAFE_ALLOW_DATE != null && t.SAFE_ALLOW_DATE < dtThree), new BaseFilter(filter.OrgId), "Nav_Users"); + var infos = this.GetEntities(t =>(t.WORK_END_DATE!=null&& t.WORK_END_DATE < dtThree) || (t.ALLOW_END_DATE != null && t.ALLOW_END_DATE < dtThree) || (t.SAFE_ALLOW_END_DATE != null && t.SAFE_ALLOW_END_DATE < dtThree), new BaseFilter(filter.OrgId)); if (user != null && infos != null && infos.Any() && dt.Hour == 8)//每小时跑批，只在8点触发 { foreach (var item in infos) { var msg = item.COMPANY_NAME+item.IDENTIFY_CODE+"，"; - if (item.WORK_DATE != null && item.WORK_DATE < dtThree) + if (item.WORK_END_DATE != null && item.WORK_END_DATE < dtThree) { - msg = msg + "营业期限还有三个月到期，请及时处理；"; + msg = msg + "营业期限还有不到三个月到期，请及时处理；"; } - if (item.ALLOW_DATE != null && item.ALLOW_DATE < dtThree) + if (item.ALLOW_END_DATE != null && item.ALLOW_END_DATE < dtThree) { - msg = msg + "采矿许可证还有三个月到期，请及时处理；"; + msg = msg + "采矿许可证还有不到三个月到期，请及时处理；"; } - if (item.SAFE_ALLOW_DATE != null && item.SAFE_ALLOW_DATE < dtThree) + if (item.SAFE_ALLOW_END_DATE != null && item.SAFE_ALLOW_END_DATE < dtThree) { - msg = msg + "安全生产许可证还有三个月到期，请及时处理。"; + msg = msg + "安全生产许可证还有不到三个月到期，请及时处理。"; } var notice = NotificationTaskService.InsertUserNoticeTaskModel(msg, item.ID, item.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddDays(2), (int)FMNoticeTypeEnum.今日提醒, "PF135"); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index 0e89c77..1103dc0 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -59,27 +59,27 @@ namespace APT.SK.WebApi.Controllers throw new Exception("不合格验收意见必须填写"); } T_FM_NOTIFICATION_TASK finishNotice = null; - if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) - { - var taskId = entity.TaskID; - if (taskId == Guid.Empty) - { - var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId - && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK022"); - if (taskTemp != null) - { - taskTemp.NOTICE_STATUS = 1; - taskTemp.SOURCE_FORMCODE = "SK022_SHOWPRINT"; - finishNotice = taskTemp; - } - } - if (taskId != Guid.Empty) - { - finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK022_SHOWPRINT"); - } - UpdateEntity(finishNotice); - throw new Exception("你已提交,请勿重复提交!"); - } + //if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) + //{ + // var taskId = entity.TaskID; + // if (taskId == Guid.Empty) + // { + // var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId + //&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK022"); + // if (taskTemp != null) + // { + // taskTemp.NOTICE_STATUS = 1; + // taskTemp.SOURCE_FORMCODE = "SK022_SHOWPRINT"; + // finishNotice = taskTemp; + // } + // } + // if (taskId != Guid.Empty) + // { + // finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK022_SHOWPRINT"); + // } + // UpdateEntity(finishNotice); + // throw new Exception("你已提交,请勿重复提交!"); + //} if (string.IsNullOrEmpty(entity.CODE)) entity.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); var record = this.GetEntity(entity.ID); @@ -309,7 +309,7 @@ namespace APT.SK.WebApi.Controllers if (entity.TaskID != Guid.Empty) { task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); - task.SOURCE_FORMCODE = "SK006_SHOWPRINT"; + task.SOURCE_FORMCODE = "SK022_SHOWPRINT"; } UnifiedCommit(() => { diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs index 4b4664a..45d042e 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs @@ -53,27 +53,27 @@ namespace APT.SK.WebApi.Controllers.Api throw new Exception("复查结论必须填写!"); } T_FM_NOTIFICATION_TASK finishNotice = null; - if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) - { - var taskId = entity.TaskID; - if (taskId == Guid.Empty) - { - var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId - && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK091"); - if (taskTemp != null) - { - taskTemp.NOTICE_STATUS = 1; - taskTemp.SOURCE_FORMCODE = "SK091_SHOWPRINT"; - finishNotice = taskTemp; - } - } - if (taskId != Guid.Empty) - { - finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK091_SHOWPRINT"); - } - UpdateEntity(finishNotice); - throw new Exception("你已提交,请勿重复提交!"); - } + //if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) + //{ + // var taskId = entity.TaskID; + // if (taskId == Guid.Empty) + // { + // var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId + //&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK091"); + // if (taskTemp != null) + // { + // taskTemp.NOTICE_STATUS = 1; + // taskTemp.SOURCE_FORMCODE = "SK091_SHOWPRINT"; + // finishNotice = taskTemp; + // } + // } + // if (taskId != Guid.Empty) + // { + // finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK091_SHOWPRINT"); + // } + // UpdateEntity(finishNotice); + // throw new Exception("你已提交,请勿重复提交!"); + //} if (string.IsNullOrEmpty(entity.CODE)) entity.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); @@ -124,7 +124,7 @@ namespace APT.SK.WebApi.Controllers.Api sysFilter.OrgId = entity.ORG_ID; var codes = CodeRuleService.NewGenSerial(sysFilter); var serialCode = codes.Split(new char[] { ',' }); - MFlowPermitService.InsertApprove(serialCode[0], "SK091", "", entity.ID, "SK091_SHOWPRINT", entity.TaskID, true, () => + MFlowPermitService.InsertApprove(serialCode[0], "SK080", "", entity.ID, "SK080_SHOWPRINT", entity.TaskID, true, () => { if (entity != null) UpdateEntityNoCommit(entity); @@ -132,7 +132,7 @@ namespace APT.SK.WebApi.Controllers.Api BantchSaveEntityNoCommit(userList); if (fileList != null && fileList.Any()) BantchSaveEntityNoCommit(fileList); - }, null, null, null, null, null, "SK091_SHOWPRINT", null); + }, null, null, null, null, null, "SK080_SHOWPRINT", null); return true; } else @@ -171,7 +171,7 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.TaskID != Guid.Empty) { task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); - task.SOURCE_FORMCODE = "SK091_SHOWPRINT"; + task.SOURCE_FORMCODE = "SK080_SHOWPRINT"; } } this.UnifiedCommit(() => @@ -252,7 +252,7 @@ namespace APT.SK.WebApi.Controllers.Api { //发消息 notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表审批被驳回", entity.ID, entity.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now, - DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK091"); + DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080"); } UnifiedCommit(() => {