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-12-05 12:07:26 +08:00
parent 6fc6684338
commit cfd04ec02e
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12743,6 +12743,7 @@ namespace APT.BaseData.Services.DomainServices
mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID; mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID;
mes.MEASURE = id2.MEASURES_NAME; mes.MEASURE = id2.MEASURES_NAME;
mes.EMERGENCY = id2.EMERGENCY; mes.EMERGENCY = id2.EMERGENCY;
mes.NUM = id2.NUM;
detailMeasures.Add(mes); detailMeasures.Add(mes);
} }
//var measuresTemp = detailList.Select(t => t.MEASURES_NAME).Distinct().ToList(); //var measuresTemp = detailList.Select(t => t.MEASURES_NAME).Distinct().ToList();

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -299,7 +299,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL>(t => t.RISK_EVALUATION_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit"); var details = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL>(t => t.RISK_EVALUATION_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_SCOREL", "Nav_SCOREE", "Nav_SCOREC", "Nav_ProductionUnit", "Nav_DetailMeasures", "Nav_DetailPosts.Nav_PostDetails.Nav_Post", "Nav_DetailDeparts.Nav_Department", "Nav_DetailDeparts.Nav_User");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

10
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs
View File

@ -209,11 +209,11 @@ namespace APT.SK.WebApi.Controllers.Api
var measureTemps = measures.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList(); var measureTemps = measures.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList();
detail.Nav_DetailMeasures = measureTemps.OrderBy(t => t.NUM).ToList(); detail.Nav_DetailMeasures = measureTemps.OrderBy(t => t.NUM).ToList();
var departTemps = departs.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList(); var departTemps = departs.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList();
var tempx = departTemps.Where(t => t.DEPARTMENT_TYPE == MS.Domain.Enums.SK.SKDepartmentTypeEnum.公司级).OrderBy(m => m.Nav_Department.NUM); //var tempx = departTemps.Where(t => t.DEPARTMENT_TYPE == MS.Domain.Enums.SK.SKDepartmentTypeEnum.公司级).OrderBy(m => m.Nav_Department.NUM);
temps.AddRange(tempx); //temps.AddRange(tempx);
var tempy = departTemps.Where(t => t.DEPARTMENT_TYPE != MS.Domain.Enums.SK.SKDepartmentTypeEnum.公司级).OrderBy(t => t.DEPARTMENT_TYPE).ThenBy(m => m.Nav_Department.NUM); //var tempy = departTemps.Where(t => t.DEPARTMENT_TYPE != MS.Domain.Enums.SK.SKDepartmentTypeEnum.公司级).OrderBy(t => t.DEPARTMENT_TYPE).ThenBy(m => m.Nav_Department.NUM);
temps.AddRange(tempy); //temps.AddRange(tempy);
detail.Nav_DetailDeparts = temps.ToList(); detail.Nav_DetailDeparts = departTemps.OrderBy(t => t.DEPARTMENT_TYPE).ThenBy(m => m.Nav_Department.NUM).ToList();
var postTemps = posts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList(); var postTemps = posts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList();
detail.Nav_DetailPosts = postTemps.OrderBy(t => t.DEPARTMENT_ID).ToList(); detail.Nav_DetailPosts = postTemps.OrderBy(t => t.DEPARTMENT_ID).ToList();
} }

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs
View File

@ -247,7 +247,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(t => t.RISK_IDENTIFY_RESULT_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures", "Nav_DetailPosts.Nav_ResultPostDets.Nav_Post");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs
View File

@ -200,7 +200,7 @@ namespace APT.SK.WebApi.Controllers.Api
"Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"});
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == result.ID, new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit","Nav_DetailMeasures", "Nav_DetailPosts.Nav_SumPostDets.Nav_Post");
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {