diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index 8cfe098..dccfd64 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -147,6 +147,10 @@ namespace APT.SK.WebApi.Controllers.Api de.SCOREC_ID = item.SCOREC_ID; de.EVALUATE_SCORE = item.EVALUATE_SCORE; de.EVALUATE_LEVEL = item.EVALUATE_LEVEL; + de.MEASURE = item.MEASURE; + de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; + de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT; + de.IDENTIFY_USER = item.IDENTIFY_USER; if ((item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null) && item.ENABLE_STATUS == SKEnableStatusEnum.Yes) { throw new Exception("第" + item.NUM + "行,LEC都不能为空"); @@ -353,7 +357,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", "Nav_DetailMeasures", "Nav_DetailPosts.Nav_PostDetails.Nav_Post", "Nav_DetailDeparts.Nav_Department", "Nav_DetailDeparts.Nav_User"); + 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"); 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 6b5a58d..6b23d72 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs @@ -88,7 +88,11 @@ namespace APT.SK.WebApi.Controllers.Api de.SCOREE_ID = item.SCOREE_ID; de.SCOREC_ID = item.SCOREC_ID; de.EVALUATE_SCORE = item.EVALUATE_SCORE; - de.EVALUATE_LEVEL = item.EVALUATE_LEVEL; + de.EVALUATE_LEVEL = item.EVALUATE_LEVEL; + de.MEASURE = item.MEASURE; + de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; + de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT; + de.IDENTIFY_USER = item.IDENTIFY_USER; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { foreach (var mm in item.Nav_DetailMeasures) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index eb8e437..3032d31 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -107,6 +107,7 @@ namespace APT.SK.WebApi.Controllers.Api de.MARK = item.MARK; de.EMERGENCY = item.EMERGENCY; de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + de.MEASURE = item.MEASURE; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { foreach (var mm in item.Nav_DetailMeasures) @@ -248,7 +249,7 @@ namespace APT.SK.WebApi.Controllers.Api if (result != null) { var details = this.GetEntities(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures"); - 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.PRODUCTION_UNIT_ID).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); foreach (var d in result.Nav_Details) { d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(m => m.NUM).ToList(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs index 91fe30d..04be7b5 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs @@ -141,7 +141,11 @@ namespace APT.SK.WebApi.Controllers.Api de.ENABLE_STATUS = item.ENABLE_STATUS; de.MARK = item.MARK; de.EMERGENCY = item.EMERGENCY; - de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + de.MEASURE = item.MEASURE; + de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; + de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT; + de.IDENTIFY_POST = item.IDENTIFY_POST; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { foreach (var mm in item.Nav_DetailMeasures) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs index b60298c..5ea06b0 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs @@ -84,7 +84,11 @@ namespace APT.SK.WebApi.Controllers.Api de.ENABLE_STATUS = item.ENABLE_STATUS; de.MARK = item.MARK; de.EMERGENCY = item.EMERGENCY; - de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + de.MEASURE = item.MEASURE; + de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; + de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT; + de.IDENTIFY_POST = item.IDENTIFY_POST; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { foreach (var mm in item.Nav_DetailMeasures)