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-10-09 16:37:08 +08:00
parent eb1631e1e5
commit 6af030463d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12603,7 +12603,11 @@ namespace APT.BaseData.Services.DomainServices
var i = 1; var i = 1;
foreach (var ite in departTemps) foreach (var ite in departTemps)
{ {
var departType = "公司级"; var departType = "班组级";
if (ite == 5)
{
departType = "公司级";
}
if (ite == 10) if (ite == 10)
{ {
departType = "部门级"; departType = "部门级";
@ -13467,9 +13471,7 @@ namespace APT.BaseData.Services.DomainServices
result.STATUS = PFStandardStatus.Archived; result.STATUS = PFStandardStatus.Archived;
if (user != null && resultDetails != null && resultDetails.Any()) if (user != null && resultDetails != null && resultDetails.Any())
{ {
var mineType = departs.FirstOrDefault(t => t.ID == result.APPLY_DEPARTMENT_ID)?.MineType; var productionId = resultDetails.FirstOrDefault(t=>t.PRODUCTION_UNIT_ID!=null).PRODUCTION_UNIT_ID;
var dmineType = ((FMProductionUnit)mineType).GetDescription();
var productionId = this.GetEntity<T_FM_USER_PRODUCTION_UNIT_SET>(t => t.NAME == dmineType)?.ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
@ -13738,9 +13740,7 @@ namespace APT.BaseData.Services.DomainServices
if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any()) if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any())
{ {
var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID);
var mineType = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.MineType; var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID!=null)?.PRODUCTION_UNIT_ID;
var dmineType = ((FMProductionUnit)mineType).GetDescription();
var productionId = this.GetEntity<T_FM_USER_PRODUCTION_UNIT_SET>(t => t.NAME == dmineType)?.ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
@ -13772,6 +13772,9 @@ namespace APT.BaseData.Services.DomainServices
detail.EVALUATE_L = item.EVALUATE_L; detail.EVALUATE_L = item.EVALUATE_L;
detail.EVALUATE_E = item.EVALUATE_E; detail.EVALUATE_E = item.EVALUATE_E;
detail.EVALUATE_C = item.EVALUATE_C; detail.EVALUATE_C = item.EVALUATE_C;
detail.SCOREC_ID = item?.SCOREC_ID;
detail.SCOREE_ID = item?.SCOREE_ID;
detail.SCOREL_ID = item?.SCOREL_ID;
detail.EVALUATE_SCORE = item.EVALUATE_SCORE; detail.EVALUATE_SCORE = item.EVALUATE_SCORE;
detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL; detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
detail.EMERGENCY = item.EMERGENCY; detail.EMERGENCY = item.EMERGENCY;