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-09 15:21:48 +08:00
parent ecc3b23b9f
commit dff83e0c6d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12314,7 +12314,7 @@ namespace APT.BaseData.Services.DomainServices
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.HIDDEN_REASON = null; major.HIDDEN_REASON = null;
major.CHARGE_USER_ID = null; major.CHARGE_USER_ID = user.ID;
major.REVIEW_DESCRIPTION = null; major.REVIEW_DESCRIPTION = null;
major.REVIEW_RESULT = null; major.REVIEW_RESULT = null;
major.REPORT_DATE = null; major.REPORT_DATE = null;
@ -12335,6 +12335,7 @@ namespace APT.BaseData.Services.DomainServices
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.Nav_Question?.DESCREPTION; major.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
major.NOTICE_CODE = entity.NOTICE_CODE; major.NOTICE_CODE = entity.NOTICE_CODE;
major.CHARGE_USER_ID = user.ID;
} }
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

@ -111,6 +111,8 @@ namespace APT.SK.WebApi.Controllers.Api
T_FM_NOTIFICATION_TASK task = null; T_FM_NOTIFICATION_TASK task = null;
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = null; T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = null;
var recordFileIds = new List<Guid>(); var recordFileIds = new List<Guid>();
var approveIds = new List<Guid>();
var approveDetailIds = new List<Guid>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
//同意销号触发审批 //同意销号触发审批
@ -151,11 +153,13 @@ namespace APT.SK.WebApi.Controllers.Api
record.STATUS = PFStandardStatus.Rejected; record.STATUS = PFStandardStatus.Rejected;
record.ACCEPT_DATE = null; record.ACCEPT_DATE = null;
record.ACCEPT_OPINION = null; record.ACCEPT_OPINION = null;
record.ACCEPT_USER_ID = null; record.ACCEPT_RESULTE = null;
record.RECTIFICATION_DESCRIPTION = null; record.RECTIFICATION_DESCRIPTION = null;
record.RECTIFICATION_MONEY = null; record.RECTIFICATION_MONEY = null;
record.COMPLETE_DATE = null; record.COMPLETE_DATE = null;
recordFileIds = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(t => t.HIDDEN_DANGER_RECTIFY_RECORD_ID == record.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); recordFileIds = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(t => t.HIDDEN_DANGER_RECTIFY_RECORD_ID == record.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
approveIds = this.GetEntities<T_PF_APPROVE>(t => t.DATA_ID!=null && t.DATA_ID == record.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
approveDetailIds = this.GetEntities<T_PF_APPROVE_DETAIL>(t => t.APPROVE_ID!=null && approveIds.Contains(t.APPROVE_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
if (record.IMPLEMENT_USER_ID != null) if (record.IMPLEMENT_USER_ID != null)
{ {
var user = this.GetEntity<T_FM_USER>(t => t.ID == record.IMPLEMENT_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ID == record.IMPLEMENT_USER_ID);
@ -206,6 +210,10 @@ namespace APT.SK.WebApi.Controllers.Api
UpdateEntityNoCommit(record); UpdateEntityNoCommit(record);
if (recordFileIds != null && recordFileIds.Any()) if (recordFileIds != null && recordFileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(recordFileIds); this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(recordFileIds);
if (approveDetailIds != null && approveDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_PF_APPROVE_DETAIL>(approveDetailIds);
if (approveIds != null && approveIds.Any())
this.BantchDeleteEntityNoCommit<T_PF_APPROVE>(approveIds);
}); });
return true; return true;
}); });