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:
何美荣 2026-06-18 16:19:13 +08:00
parent 384d3ce04d
commit 3c3e89933c
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,6 +147,10 @@ namespace APT.SK.WebApi.Controllers.Api
de.SCOREC_ID = item.SCOREC_ID; de.SCOREC_ID = item.SCOREC_ID;
de.EVALUATE_SCORE = item.EVALUATE_SCORE; 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.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null) && item.ENABLE_STATUS == SKEnableStatusEnum.Yes) if ((item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null) && item.ENABLE_STATUS == SKEnableStatusEnum.Yes)
{ {
throw new Exception("第" + item.NUM + "行，LEC都不能为空"); throw new Exception("第" + item.NUM + "行，LEC都不能为空");
@ -353,7 +357,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", "Nav_DetailMeasures", "Nav_DetailPosts.Nav_PostDetails.Nav_Post", "Nav_DetailDeparts.Nav_Department", "Nav_DetailDeparts.Nav_User"); 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");
if (details.Any()) if (details.Any())
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();

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

@ -89,6 +89,10 @@ namespace APT.SK.WebApi.Controllers.Api
de.SCOREC_ID = item.SCOREC_ID; de.SCOREC_ID = item.SCOREC_ID;
de.EVALUATE_SCORE = item.EVALUATE_SCORE; 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()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures) foreach (var mm in item.Nav_DetailMeasures)

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -107,6 +107,7 @@ namespace APT.SK.WebApi.Controllers.Api
de.MARK = item.MARK; de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY; de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
de.MEASURE = item.MEASURE;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures) foreach (var mm in item.Nav_DetailMeasures)
@ -248,7 +249,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(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) foreach (var d in result.Nav_Details)
{ {
d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(m => m.NUM).ToList(); d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(m => m.NUM).ToList();

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

@ -142,6 +142,10 @@ namespace APT.SK.WebApi.Controllers.Api
de.MARK = item.MARK; de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY; 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()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures) foreach (var mm in item.Nav_DetailMeasures)

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

@ -85,6 +85,10 @@ namespace APT.SK.WebApi.Controllers.Api
de.MARK = item.MARK; de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY; 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()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures) foreach (var mm in item.Nav_DetailMeasures)