This commit is contained in:
何美荣 2025-11-25 11:54:07 +08:00
parent 67a796a0f9
commit 18525ce98f

View File

@ -15056,9 +15056,10 @@ namespace APT.BaseData.Services.DomainServices
}
else
{
var entity = this.GetEntity<T_SK_RISK_EVALUATION_SUMMARY>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Details");
var entity = this.GetEntity<T_SK_RISK_EVALUATION_SUMMARY>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Archived;
entity.END_DATE = DateTime.Now;
var sumDetails= this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t=>t.RISK_EVALUATION_SUMMARY_ID == entity.ID,new BaseFilter(entity.ORG_ID));
//触发风险检查关联表
T_SK_DOUBLE_PREVENT_MECHANISM dou = null;
T_FM_NOTIFICATION_TASK notice = null;
@ -15071,8 +15072,8 @@ namespace APT.BaseData.Services.DomainServices
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> contentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
entity.Nav_Details = entity.Nav_Details.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any())
var entityDetails = sumDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any())
{
//var sumDetailIds = entity.Nav_Details.Select(t => t.ID).ToList();
//var sumDetailPosts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID));
@ -15097,7 +15098,7 @@ namespace APT.BaseData.Services.DomainServices
dou.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
dou.ORG_ID = entity.ORG_ID;
dou.RISK_EVALUATE_SUMMARY_ID = entity.ID;
foreach (var item in entity.Nav_Details)
foreach (var item in entityDetails)
{
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL detail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL();
detail.ORG_ID = item.ORG_ID;
@ -15265,7 +15266,6 @@ namespace APT.BaseData.Services.DomainServices
}
notice = NotificationTaskService.InsertUserNoticeTaskModel("风险检查关联表", dou.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum., "SK026");
}
entity.Nav_Details = null;
UnifiedCommit(() =>
{
if (modelApp != null)