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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-04-09 16:46:19 +08:00
commit dac80c8288
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12300,7 +12300,9 @@ namespace APT.BaseData.Services.DomainServices
T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE major = null; T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE major = null;
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;
var majorUserIds = new List<Guid>(); var majorUserIds = new List<Guid>();
var majorFileIds = new List<Guid>(); var majorFileIds = new List<Guid>();
var approveIds = new List<Guid>();
var approveDetailIds = new List<Guid>();
if (entity.HIDDEN_LEVEL == SKHiddenLevel.Major && user != null) if (entity.HIDDEN_LEVEL == SKHiddenLevel.Major && user != null)
{ {
//先查下销号表是否已经触发过 //先查下销号表是否已经触发过
@ -12322,6 +12324,8 @@ namespace APT.BaseData.Services.DomainServices
major.MONITOR_OPINION = null; major.MONITOR_OPINION = null;
majorUserIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); majorUserIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
majorFileIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList(); majorFileIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.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 == major.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();
} }
else else
{ {
@ -12359,7 +12363,11 @@ namespace APT.BaseData.Services.DomainServices
if (major != null) if (major != null)
this.UpdateEntityNoCommit(major); this.UpdateEntityNoCommit(major);
if (notice != null) if (notice != null)
this.UpdateEntityNoCommit(notice); this.UpdateEntityNoCommit(notice);
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;