wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改编号

Browse Source
This commit is contained in:
何美荣 2025-11-12 19:00:06 +08:00
parent 8f7a43078c
commit c803175496
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -265,7 +265,7 @@ namespace APT.FO.WebApi.Controllers
{ {
param = "公司"; 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()) if (detailFileIds != null && detailFileIds.Any())
this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_DETAIL_FILE>(detailFileIds); this.BantchDeleteEntityNoCommit<T_FO_FIRE_JOB_DETAIL_FILE>(detailFileIds);
@ -301,7 +301,7 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(fireFileList); this.BantchSaveEntityNoCommit(fireFileList);
if (fileList != null && fileList.Any()) if (fileList != null && fileList.Any())
this.BantchSaveEntityNoCommit(fileList); 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; return true;
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
@ -385,7 +385,7 @@ namespace APT.FO.WebApi.Controllers
persons.ForEach(t => { t.DEAL_STATUS = 0; t.Nav_User = null; }); 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, 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_FM_NOTIFICATION_TASK>(t => t.SOURCE_DATA_ID == model.ID && t.NOTICE_STATUS == 0, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); var taskOtherIds = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => t.SOURCE_DATA_ID == model.ID && t.NOTICE_STATUS == 0, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
UnifiedCommit(() => UnifiedCommit(() =>

14
APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs
View File

@ -223,7 +223,7 @@ namespace APT.FO.WebApi.Controllers
{ {
//当班人员不等于自己的，触发签字确认单 //当班人员不等于自己的，触发签字确认单
var sendUserNames = allUsers.Where(t => sendUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); 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; entity.STATUS = FOStatusEnum.PreSign;
} }
else else
@ -233,7 +233,7 @@ namespace APT.FO.WebApi.Controllers
if (detailUserIds != null && detailUserIds.Any()) if (detailUserIds != null && detailUserIds.Any())
{ {
var sendUserNames = allUsers.Where(t => detailUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); 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; entity.STATUS = FOStatusEnum.Sign;
} }
else else
@ -243,7 +243,7 @@ namespace APT.FO.WebApi.Controllers
{ {
//触发给接班人签字确认 //触发给接班人签字确认
var sendUserNames = allUsers.Where(t => afterUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); 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; entity.STATUS = FOStatusEnum.SignAccept;
} }
} }
@ -331,7 +331,7 @@ namespace APT.FO.WebApi.Controllers
if (detailUserIds != null && detailUserIds.Any()) if (detailUserIds != null && detailUserIds.Any())
{ {
var sendUserNames = allUsers.Where(t => detailUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); 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; record.STATUS = FOStatusEnum.Sign;
} }
else else
@ -341,7 +341,7 @@ namespace APT.FO.WebApi.Controllers
{ {
//触发给接班人签字确认 //触发给接班人签字确认
var sendUserNames = allUsers.Where(t => afterUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); 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; record.STATUS = FOStatusEnum.SignAccept;
} }
else else
@ -368,7 +368,7 @@ namespace APT.FO.WebApi.Controllers
{ {
//触发给接班人签字确认 //触发给接班人签字确认
var sendUserNames = allUsers.Where(t => afterUserIds.Contains(t.ID)).Select(m => m.NAME).ToList(); 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; record.STATUS = FOStatusEnum.SignAccept;
} }
else else
@ -400,7 +400,7 @@ namespace APT.FO.WebApi.Controllers
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "FO037_SHOWPRINT"; task.SOURCE_FORMCODE = "FO041_SHOWPRINT";
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {

4
APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromSafeController.cs
View File

@ -107,7 +107,7 @@ namespace APT.FO.WebApi.Controllers
//发消息 //发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null); 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, 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 else
{ {
@ -161,7 +161,7 @@ namespace APT.FO.WebApi.Controllers
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "FO033_SHOWPRINT"; task.SOURCE_FORMCODE = "FO037_SHOWPRINT";
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {

4
APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromTechController.cs
View File

@ -109,7 +109,7 @@ namespace APT.FO.WebApi.Controllers
//发消息 //发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null); 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, 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 else
{ {
@ -163,7 +163,7 @@ namespace APT.FO.WebApi.Controllers
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "FO031_SHOWPRINT"; task.SOURCE_FORMCODE = "FO035_SHOWPRINT";
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {