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:
何美荣 2026-04-07 10:24:07 +08:00
parent c64446969e
commit ae7f3ec9d5
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -12284,7 +12284,7 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); var entity = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Question");
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
//如果是重大隐患，触发销号表给安全总监 //如果是重大隐患，触发销号表给安全总监
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全总监")); var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全总监"));
@ -12302,13 +12302,14 @@ namespace APT.BaseData.Services.DomainServices
else else
{ {
//否则新增 //否则新增
major = new T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE();
major.ORG_ID = entity.ORG_ID; major.ORG_ID = entity.ORG_ID;
major.STATUS = PFStandardStatus.Draft; major.STATUS = PFStandardStatus.Draft;
major.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID; major.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
major.APPLY_USER_ID = user.ID; major.APPLY_USER_ID = user.ID;
major.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID; major.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
major.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); major.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
major.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; major.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
} }
notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表"+ DateTime.Now.ToShortDateString().Replace("/", ""), major.ID, major.ORG_ID, user.ID, user.NAME, DateTime.Now, notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表"+ DateTime.Now.ToShortDateString().Replace("/", ""), major.ID, major.ORG_ID, user.ID, user.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080"); DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080");

10
APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs
View File

@ -126,6 +126,10 @@ namespace APT.SK.WebApi.Controllers.Api
var serialCode = codes.Split(new char[] { ',' }); var serialCode = codes.Split(new char[] { ',' });
MFlowPermitService.InsertApprove(serialCode[0], "SK080", "", entity.ID, "SK080_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(serialCode[0], "SK080", "", entity.ID, "SK080_SHOWPRINT", entity.TaskID, true, () =>
{ {
if (userIds != null && userIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(userIds);
if (fileIds != null && fileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(fileIds);
if (entity != null) if (entity != null)
UpdateEntityNoCommit(entity); UpdateEntityNoCommit(entity);
if (userList != null && userList.Any()) if (userList != null && userList.Any())
@ -176,6 +180,10 @@ namespace APT.SK.WebApi.Controllers.Api
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {
if (userIds != null && userIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(userIds);
if (fileIds != null && fileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(fileIds);
if (task != null) if (task != null)
UpdateEntityNoCommit(task); UpdateEntityNoCommit(task);
if (entity != null) if (entity != null)
@ -204,7 +212,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE>(id, new string[] { "Nav_ApplyUser", "Nav_ApplyDepartment","Nav_RectifyRecord","Nav_Users.Nav_User","Nav_MonitorDepart", "Nav_Files.Nav_ImgFile"}); var result = this.GetEntity<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE>(id, new string[] { "Nav_ApplyUser", "Nav_ChargeUser", "Nav_ApplyDepartment","Nav_RectifyRecord","Nav_Users.Nav_User","Nav_MonitorDepart", "Nav_Files.Nav_ImgFile"});
if (result != null && result.STATUS == PFStandardStatus.Rejected) if (result != null && result.STATUS == PFStandardStatus.Rejected)
{ {
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID); result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -161,7 +161,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.CHECK_TYPE_ID == null) if (entity.CHECK_TYPE_ID == null)
throw new Exception("检查类型不能为空"); throw new Exception("检查类型不能为空");
if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue) if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
throw new Exception("检查时间必须填写"); throw new Exception("检查时间必须填写");
if (DateTime.Now.AddMinutes(30) > entity.CHECK_TIME) if (DateTime.Now.AddMinutes(30) > entity.CHECK_TIME)
throw new Exception("检查时间不得短于半小时,请修改检查时间"); throw new Exception("检查时间不得短于半小时,请修改检查时间");
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;