From b380fdc894f689e8486456192cdb9fd67d4b3a0a 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: Wed, 22 Oct 2025 21:57:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index d46d8eb..c5edb0e 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -13105,7 +13105,7 @@ namespace APT.BaseData.Services.DomainServices var librarys = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)); var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryDeparts = this.GetEntities(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)); - //var libraryDetails = this.GetEntities(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)); + var libraryDetails = this.GetEntities(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)); foreach (var bm in summarys) { var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID); @@ -13147,24 +13147,24 @@ namespace APT.BaseData.Services.DomainServices detail.MEASURE = de.MEASURE; if (departTemp != null) { - //var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); - //if (libraryDetailTemps.Any()) - //{ - // var i = 1; - // foreach (var item in libraryDetailTemps) - // { - // T_SK_RISK_EVALUATION_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_DETAIL_MEASURE(); - // dep.MEASURES_NAME = item.MEASURES_NAME; - // dep.EMERGENCY = item.EMERGENCY; - // dep.NUM = item.NUM; - // dep.ORG_ID = item.ORG_ID; - // dep.RISK_EVALUATION_DETAIL_ID = detail.ID; - // detailMeasures.Add(dep); - // var measureTemp = i + "、" + item.MEASURES_NAME + "；"; - // detail.MEASURE = detail.MEASURE + measureTemp; - // i++; - // } - //} + var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); + if (libraryDetailTemps.Any()) + { + var i = 1; + foreach (var item in libraryDetailTemps) + { + T_SK_RISK_EVALUATION_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_DETAIL_MEASURE(); + dep.MEASURES_NAME = item.MEASURES_NAME; + dep.EMERGENCY = item.EMERGENCY; + dep.NUM = item.NUM; + dep.ORG_ID = item.ORG_ID; + dep.RISK_EVALUATION_DETAIL_ID = detail.ID; + detailMeasures.Add(dep); + var measureTemp = i + "、" + item.MEASURES_NAME + "；"; + detail.MEASURE = detail.MEASURE + measureTemp; + i++; + } + } var libraryDepartTemps = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); if (libraryDepartTemps.Any()) { @@ -13454,25 +13454,25 @@ namespace APT.BaseData.Services.DomainServices detail.MARK = de.MARK; detail.MEASURE = de.MEASURE; resultDetails.Add(detail); - //if (temp.Nav_DetailMeasures != null && temp.Nav_DetailMeasures.Any()) - //{ - // var i = 1; - // foreach (var item in temp.Nav_DetailMeasures.OrderBy(t => t.NUM)) - // { - // T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE(); - // dep.MEASURES_NAME = item.MEASURES_NAME; - // dep.EMERGENCY = item.EMERGENCY; - // dep.NUM = item.NUM; - // dep.ORG_ID = item.ORG_ID; - // dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID; - // detailMeasures.Add(dep); - // var measureTemp = i + "、" + item.MEASURES_NAME + "；"; - // detail.MEASURE = detail.MEASURE + measureTemp; - // //var emergencyTemp = i + "、" + item.EMERGENCY + "；"; - // //detail.EMERGENCY = detail.EMERGENCY + emergencyTemp; - // i++; - // } - //} + if (de.Nav_DetailMeasures != null && de.Nav_DetailMeasures.Any()) + { + var i = 1; + foreach (var item in de.Nav_DetailMeasures.OrderBy(t => t.NUM)) + { + T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE(); + dep.MEASURES_NAME = item.MEASURES_NAME; + dep.EMERGENCY = item.EMERGENCY; + dep.NUM = item.NUM; + dep.ORG_ID = item.ORG_ID; + dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID; + detailMeasures.Add(dep); + var measureTemp = i + "、" + item.MEASURES_NAME + "；"; + detail.MEASURE = detail.MEASURE + measureTemp; + //var emergencyTemp = i + "、" + item.EMERGENCY + "；"; + //detail.EMERGENCY = detail.EMERGENCY + emergencyTemp; + i++; + } + } if (de.Nav_DetailDeparts != null && de.Nav_DetailDeparts.Any()) { var i = 1;