diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 1181ae0..1063a64 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -12743,6 +12743,7 @@ namespace APT.BaseData.Services.DomainServices mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID; mes.MEASURE = id2.MEASURES_NAME; mes.EMERGENCY = id2.EMERGENCY; + mes.NUM = id2.NUM; detailMeasures.Add(mes); } //var measuresTemp = detailList.Select(t => t.MEASURES_NAME).Distinct().ToList(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index 759db2d..32404f0 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -299,7 +299,7 @@ namespace APT.SK.WebApi.Controllers.Api "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); if (result != null) { - var details = this.GetEntities(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 => 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()) { var detailIds = details.Select(t => t.ID).ToList(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs index 7b98808..ddedc52 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs @@ -209,11 +209,11 @@ namespace APT.SK.WebApi.Controllers.Api var measureTemps = measures.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).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 tempx = departTemps.Where(t => t.DEPARTMENT_TYPE == MS.Domain.Enums.SK.SKDepartmentTypeEnum.公司级).OrderBy(m => m.Nav_Department.NUM); - 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); - temps.AddRange(tempy); - detail.Nav_DetailDeparts = temps.ToList(); + //var tempx = departTemps.Where(t => t.DEPARTMENT_TYPE == MS.Domain.Enums.SK.SKDepartmentTypeEnum.公司级).OrderBy(m => m.Nav_Department.NUM); + //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); + //temps.AddRange(tempy); + 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(); detail.Nav_DetailPosts = postTemps.OrderBy(t => t.DEPARTMENT_ID).ToList(); } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs index 9061836..256e338 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs @@ -247,7 +247,7 @@ namespace APT.SK.WebApi.Controllers.Api "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); if (result != null) { - var details = this.GetEntities(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 => 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(); if (result.STATUS == PFStandardStatus.Rejected) { diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs index 72a9c9b..9bac214 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs @@ -200,7 +200,7 @@ namespace APT.SK.WebApi.Controllers.Api "Nav_Files.Nav_ImgFile","Nav_Requires.Nav_Require"}); if (result != null) { - var details = this.GetEntities(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 => 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(); if (result.STATUS == PFStandardStatus.Rejected) {