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-22 21:57:42 +08:00
parent 952c82bf13
commit b380fdc894
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13105,7 +13105,7 @@ namespace APT.BaseData.Services.DomainServices
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)); var libraryDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID));
//var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)); var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID));
foreach (var bm in summarys) foreach (var bm in summarys)
{ {
var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID); var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID);
@ -13147,24 +13147,24 @@ namespace APT.BaseData.Services.DomainServices
detail.MEASURE = de.MEASURE; detail.MEASURE = de.MEASURE;
if (departTemp != null) if (departTemp != null)
{ {
//var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList();
//if (libraryDetailTemps.Any()) if (libraryDetailTemps.Any())
//{ {
// var i = 1; var i = 1;
// foreach (var item in libraryDetailTemps) foreach (var item in libraryDetailTemps)
// { {
// T_SK_RISK_EVALUATION_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_DETAIL_MEASURE(); T_SK_RISK_EVALUATION_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_DETAIL_MEASURE();
// dep.MEASURES_NAME = item.MEASURES_NAME; dep.MEASURES_NAME = item.MEASURES_NAME;
// dep.EMERGENCY = item.EMERGENCY; dep.EMERGENCY = item.EMERGENCY;
// dep.NUM = item.NUM; dep.NUM = item.NUM;
// dep.ORG_ID = item.ORG_ID; dep.ORG_ID = item.ORG_ID;
// dep.RISK_EVALUATION_DETAIL_ID = detail.ID; dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
// detailMeasures.Add(dep); detailMeasures.Add(dep);
// var measureTemp = i + "、" + item.MEASURES_NAME + "；"; var measureTemp = i + "、" + item.MEASURES_NAME + "；";
// detail.MEASURE = detail.MEASURE + measureTemp; detail.MEASURE = detail.MEASURE + measureTemp;
// i++; i++;
// } }
//} }
var libraryDepartTemps = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList(); var libraryDepartTemps = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList();
if (libraryDepartTemps.Any()) if (libraryDepartTemps.Any())
{ {
@ -13454,25 +13454,25 @@ namespace APT.BaseData.Services.DomainServices
detail.MARK = de.MARK; detail.MARK = de.MARK;
detail.MEASURE = de.MEASURE; detail.MEASURE = de.MEASURE;
resultDetails.Add(detail); resultDetails.Add(detail);
//if (temp.Nav_DetailMeasures != null && temp.Nav_DetailMeasures.Any()) if (de.Nav_DetailMeasures != null && de.Nav_DetailMeasures.Any())
//{ {
// var i = 1; var i = 1;
// foreach (var item in temp.Nav_DetailMeasures.OrderBy(t => t.NUM)) 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(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE();
// dep.MEASURES_NAME = item.MEASURES_NAME; dep.MEASURES_NAME = item.MEASURES_NAME;
// dep.EMERGENCY = item.EMERGENCY; dep.EMERGENCY = item.EMERGENCY;
// dep.NUM = item.NUM; dep.NUM = item.NUM;
// dep.ORG_ID = item.ORG_ID; dep.ORG_ID = item.ORG_ID;
// dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID; dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID;
// detailMeasures.Add(dep); detailMeasures.Add(dep);
// var measureTemp = i + "、" + item.MEASURES_NAME + "；"; var measureTemp = i + "、" + item.MEASURES_NAME + "；";
// detail.MEASURE = detail.MEASURE + measureTemp; detail.MEASURE = detail.MEASURE + measureTemp;
// //var emergencyTemp = i + "、" + item.EMERGENCY + "；"; //var emergencyTemp = i + "、" + item.EMERGENCY + "；";
// //detail.EMERGENCY = detail.EMERGENCY + emergencyTemp; //detail.EMERGENCY = detail.EMERGENCY + emergencyTemp;
// i++; i++;
// } }
//} }
if (de.Nav_DetailDeparts != null && de.Nav_DetailDeparts.Any()) if (de.Nav_DetailDeparts != null && de.Nav_DetailDeparts.Any())
{ {
var i = 1; var i = 1;