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-05-12 19:30:50 +08:00
parent 46c203c447
commit 796c8536b9
1 changed files with 8 additions and 4 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

@ -13852,7 +13852,10 @@ namespace APT.BaseData.Services.DomainServices
//List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> details = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID), new string[] { "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts" }).ToList(); //List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> details = this.GetOrderEntities(expression2, new BaseFilter(entity.ORG_ID), new string[] { "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts" }).ToList();
var details = GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(i => resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID) && i.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)); var details = GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(i => resultIds.Contains(i.RISK_IDENTIFY_RESULT_ID) && i.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
var resultDetailIds = details.Select(t => t.ID).ToList(); var resultDetailIds = details.Select(t => t.ID).ToList();
var resultDetailMes = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(i => resultDetailIds.Contains(i.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList(); var resultDetailMes = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(i => resultDetailIds.Contains(i.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
var resultDetailDepts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(i => resultDetailIds.Contains(i.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
var resultDetailDeptIds = resultDetailDepts.Select(t => t.ID).ToList();
var resultDetailDeptPosts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(i => resultDetailDeptIds.Contains(i.RISK_IDENTIFY_DETAIL_RESULT_POST_ID), new BaseFilter(filter.OrgId)).ToList();
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()); var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault());
if (detailList.Any()) if (detailList.Any())
{ {
@ -13911,8 +13914,8 @@ namespace APT.BaseData.Services.DomainServices
// } // }
//} //}
//辨识部门 //辨识部门
var departIdss = results.Where(t => resultIds.Contains(t.ID)).Select(m => m.APPLY_DEPARTMENT_ID).Distinct().ToList(); var departIdss = resultDetailDepts.Where(t => ids.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID)).Select(m => m.DEPARTMENT_ID).Distinct().ToList();
var userIdss = results.Where(t => resultIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList(); //var userIdss = results.Where(t => resultIds.Contains(t.ID)).Select(m => m.APPLY_USER_ID).Distinct().ToList();
if (departIdss.Any()) if (departIdss.Any())
{ {
var departTemps = departs.Where(t => departIdss.Contains(t.ID)).OrderBy(m => m.DEPARTMENT_TYPE).ToList(); var departTemps = departs.Where(t => departIdss.Contains(t.ID)).OrderBy(m => m.DEPARTMENT_TYPE).ToList();
@ -13928,7 +13931,8 @@ namespace APT.BaseData.Services.DomainServices
depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE; depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE;
depart.NUM = i; depart.NUM = i;
summaryPosts.Add(depart); summaryPosts.Add(depart);
var postIds = users.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID && userIdss.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person?.POST_ID).ToList(); var departTepIds = resultDetailDepts.Where(t => ids.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID) && t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID).Select(m => m.ID).ToList();
var postIds = resultDetailDeptPosts.Where(t => departTepIds.Contains(t.RISK_IDENTIFY_DETAIL_RESULT_POST_ID) && t.POST_ID != null).Select(m => m.POST_ID).Distinct().ToList();
if (postIds.Any()) if (postIds.Any())
{ {
foreach (var poId in postIds) foreach (var poId in postIds)