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-16 14:57:23 +08:00
parent 89db85f53e
commit 41021d4714
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14714,10 +14714,10 @@ namespace APT.BaseData.Services.DomainServices
var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value);
if (approveDetailLast.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID)
{
result.STATUS = PFStandardStatus.Archived;
if (user != null && resultDetails != null && resultDetails.Any())
result.STATUS = PFStandardStatus.Archived;
var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
if (user != null && resultDetailTemps != null && resultDetailTemps.Any())
{
var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
//var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList();
//var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && productionIds.Contains(t.PRODUCTION_UNIT_ID), new BaseFilter(entity.ORG_ID));
//var libraryIds = librarys.Select(t => t.ID).ToList();
@ -15038,18 +15038,18 @@ namespace APT.BaseData.Services.DomainServices
//触发风险检查关联表
T_SK_DOUBLE_PREVENT_MECHANISM dou = null;
T_FM_NOTIFICATION_TASK notice = null;
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> details = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> details = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART> detailDeps = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
//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>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
//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())
{
entity.Nav_Details = entity.Nav_Details.Where(t => t.MARK != SKMarkEnum.Auto).ToList();
//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));
//var sumPostIds = sumDetailPosts.Select(t => t.ID).ToList();