From 6af030463d4973c629b4c8db65fe3cfb43057e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 9 Oct 2025 16:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E6=A3=80=E6=9F=A5=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=A1=A8=E5=AD=90=E8=A1=A8=E6=9C=AA=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 5817a18..dfb21a8 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -12603,7 +12603,11 @@ namespace APT.BaseData.Services.DomainServices var i = 1; foreach (var ite in departTemps) { - var departType = "公司级"; + var departType = "班组级"; + if (ite == 5) + { + departType = "公司级"; + } if (ite == 10) { departType = "部门级"; @@ -13467,9 +13471,7 @@ namespace APT.BaseData.Services.DomainServices result.STATUS = PFStandardStatus.Archived; if (user != null && resultDetails != null && resultDetails.Any()) { - var mineType = departs.FirstOrDefault(t => t.ID == result.APPLY_DEPARTMENT_ID)?.MineType; - var dmineType = ((FMProductionUnit)mineType).GetDescription(); - var productionId = this.GetEntity(t => t.NAME == dmineType)?.ID; + var productionId = resultDetails.FirstOrDefault(t=>t.PRODUCTION_UNIT_ID!=null).PRODUCTION_UNIT_ID; var librarys = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryDeparts = GetEntities(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()) { var user = this.GetEntity(t => t.ID == entity.APPLY_USER_ID); - var mineType = this.GetEntity(t => t.ID == entity.APPLY_DEPARTMENT_ID)?.MineType; - var dmineType = ((FMProductionUnit)mineType).GetDescription(); - var productionId = this.GetEntity(t => t.NAME == dmineType)?.ID; + var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID!=null)?.PRODUCTION_UNIT_ID; var librarys = this.GetEntities(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryDeparts = GetEntities(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); @@ -13771,7 +13771,10 @@ namespace APT.BaseData.Services.DomainServices //detail.RISK_NAME_ID = item.RISK_NAME_ID; detail.EVALUATE_L = item.EVALUATE_L; 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_LEVEL = item.EVALUATE_LEVEL; detail.EMERGENCY = item.EMERGENCY;