From c803175496ebb4893480a834455f55bd342137f9 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: Wed, 12 Nov 2025 19:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/FireJobController.cs | 6 +++--- .../Controllers/LeaderWellRecordController.cs | 14 +++++++------- .../TechDisclosureFromSafeController.cs | 4 ++-- .../TechDisclosureFromTechController.cs | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index e00ed10..3384d6f 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -265,7 +265,7 @@ namespace APT.FO.WebApi.Controllers { param = "公司"; } - MFlowPermitService.InsertApprove(serialCode[0], "FO038", param, entity.ID, "FO039_SHOWPRINT", entity.TaskID, true, () => + MFlowPermitService.InsertApprove(serialCode[0], "FO043", param, entity.ID, "FO043_SHOWPRINT", entity.TaskID, true, () => { if (detailFileIds != null && detailFileIds.Any()) this.BantchDeleteEntityNoCommit(detailFileIds); @@ -301,7 +301,7 @@ namespace APT.FO.WebApi.Controllers this.BantchSaveEntityNoCommit(fireFileList); if (fileList != null && fileList.Any()) this.BantchSaveEntityNoCommit(fileList); - }, null, null, null, null, null, "FO039_SHOWPRINT", null, "动火作业工作票", FMTASKTYPE.JobSite); + }, null, null, null, null, null, "FO043_SHOWPRINT", null, "动火作业工作票", FMTASKTYPE.JobSite); return true; } this.UnifiedCommit(() => @@ -385,7 +385,7 @@ namespace APT.FO.WebApi.Controllers persons.ForEach(t => { t.DEAL_STATUS = 0; t.Nav_User = null; }); //直接驳回给申请人 T_FM_NOTIFICATION_TASK 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.消息, "FO038"); + DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043"); //当前节点其他审核人待办消除 var taskOtherIds = this.GetEntities(t => t.SOURCE_DATA_ID == model.ID && t.NOTICE_STATUS == 0, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); UnifiedCommit(() => diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs index 57d4e55..40357c1 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs @@ -223,7 +223,7 @@ namespace APT.FO.WebApi.Controllers { //当班人员不等于自己的，触发签字确认单 var sendUserNames = allUsers.Where(t => sendUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); - sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-交班人签字确认", entity.ID, entity.ORG_ID, sendUserIds, sendUserNames, DateTime.Now, entity.JOB_END_DATE.Value, 1, "FO037_SHOWPRINT"); + sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-交班人签字确认", entity.ID, entity.ORG_ID, sendUserIds, sendUserNames, DateTime.Now, entity.JOB_END_DATE.Value, 1, "FO041_SHOWPRINT"); entity.STATUS = FOStatusEnum.PreSign; } else @@ -233,7 +233,7 @@ namespace APT.FO.WebApi.Controllers if (detailUserIds != null && detailUserIds.Any()) { var sendUserNames = allUsers.Where(t => detailUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); - sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-现场责任人签字确认", entity.ID, entity.ORG_ID, detailUserIds, sendUserNames, DateTime.Now, entity.JOB_END_DATE.Value, 1, "FO037_SHOWPRINT"); + sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-现场责任人签字确认", entity.ID, entity.ORG_ID, detailUserIds, sendUserNames, DateTime.Now, entity.JOB_END_DATE.Value, 1, "FO041_SHOWPRINT"); entity.STATUS = FOStatusEnum.Sign; } else @@ -243,7 +243,7 @@ namespace APT.FO.WebApi.Controllers { //触发给接班人签字确认 var sendUserNames = allUsers.Where(t => afterUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); - sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-接班人签字确认", entity.ID, entity.ORG_ID, afterUserIds, sendUserNames, DateTime.Now, entity.JOB_END_DATE.Value, 1, "FO037_SHOWPRINT"); + sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-接班人签字确认", entity.ID, entity.ORG_ID, afterUserIds, sendUserNames, DateTime.Now, entity.JOB_END_DATE.Value, 1, "FO041_SHOWPRINT"); entity.STATUS = FOStatusEnum.SignAccept; } } @@ -331,7 +331,7 @@ namespace APT.FO.WebApi.Controllers if (detailUserIds != null && detailUserIds.Any()) { var sendUserNames = allUsers.Where(t => detailUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); - sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-现场责任人签字确认", entity.ID, record.ORG_ID, detailUserIds, sendUserNames, DateTime.Now, record.JOB_END_DATE.Value, 1, "FO037_SHOWPRINT"); + sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-现场责任人签字确认", entity.ID, record.ORG_ID, detailUserIds, sendUserNames, DateTime.Now, record.JOB_END_DATE.Value, 1, "FO041_SHOWPRINT"); record.STATUS = FOStatusEnum.Sign; } else @@ -341,7 +341,7 @@ namespace APT.FO.WebApi.Controllers { //触发给接班人签字确认 var sendUserNames = allUsers.Where(t => afterUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); - sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-接班人签字确认", entity.ID, record.ORG_ID, afterUserIds, sendUserNames, DateTime.Now, record.JOB_END_DATE.Value, 1, "FO037_SHOWPRINT"); + sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-接班人签字确认", entity.ID, record.ORG_ID, afterUserIds, sendUserNames, DateTime.Now, record.JOB_END_DATE.Value, 1, "FO041_SHOWPRINT"); record.STATUS = FOStatusEnum.SignAccept; } else @@ -368,7 +368,7 @@ namespace APT.FO.WebApi.Controllers { //触发给接班人签字确认 var sendUserNames = allUsers.Where(t => afterUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); - sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-接班人签字确认", entity.ID, record.ORG_ID, afterUserIds, sendUserNames, DateTime.Now, record.JOB_END_DATE.Value, 1, "FO037_SHOWPRINT"); + sendNotices = NotificationTaskService.InsertUserNoticeTaskModels("领导带班下井记录-接班人签字确认", entity.ID, record.ORG_ID, afterUserIds, sendUserNames, DateTime.Now, record.JOB_END_DATE.Value, 1, "FO041_SHOWPRINT"); record.STATUS = FOStatusEnum.SignAccept; } else @@ -400,7 +400,7 @@ namespace APT.FO.WebApi.Controllers if (entity.TaskID != Guid.Empty) { task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); - task.SOURCE_FORMCODE = "FO037_SHOWPRINT"; + task.SOURCE_FORMCODE = "FO041_SHOWPRINT"; } this.UnifiedCommit(() => { diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromSafeController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromSafeController.cs index 179f573..bb35685 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromSafeController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromSafeController.cs @@ -107,7 +107,7 @@ namespace APT.FO.WebApi.Controllers //发消息 DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null); notices = NotificationTaskService.InsertUserNoticeTaskModels("安全交底表确认" + DateTime.Now.Month.ToString().PadLeft(2, '0') + DateTime.Now.Day.ToString().PadLeft(2, '0'), entity.ID, entity.ORG_ID, userIds, UserNames, DateTime.Now, - dtEnd, (int)FMNoticeTypeEnum.消息, "FO033_SHOWPRINT"); + dtEnd, (int)FMNoticeTypeEnum.消息, "FO037_SHOWPRINT"); } else { @@ -161,7 +161,7 @@ namespace APT.FO.WebApi.Controllers if (entity.TaskID != Guid.Empty) { task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); - task.SOURCE_FORMCODE = "FO033_SHOWPRINT"; + task.SOURCE_FORMCODE = "FO037_SHOWPRINT"; } this.UnifiedCommit(() => { diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromTechController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromTechController.cs index e723139..77f4b87 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromTechController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromTechController.cs @@ -109,7 +109,7 @@ namespace APT.FO.WebApi.Controllers //发消息 DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null); notices = NotificationTaskService.InsertUserNoticeTaskModels("技术交底表确认"+DateTime.Now.Month.ToString().PadLeft(2,'0') + DateTime.Now.Day.ToString().PadLeft(2, '0'), entity.ID, entity.ORG_ID, userIds, UserNames, DateTime.Now, - dtEnd, (int)FMNoticeTypeEnum.消息, "FO031_SHOWPRINT"); + dtEnd, (int)FMNoticeTypeEnum.消息, "FO035_SHOWPRINT"); } else { @@ -163,7 +163,7 @@ namespace APT.FO.WebApi.Controllers if (entity.TaskID != Guid.Empty) { task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); - task.SOURCE_FORMCODE = "FO031_SHOWPRINT"; + task.SOURCE_FORMCODE = "FO035_SHOWPRINT"; } this.UnifiedCommit(() => {