diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index bd13fa1..ac488d3 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -13442,8 +13442,8 @@ namespace APT.BaseData.Services.DomainServices dep.ORG_ID = item.ORG_ID; dep.RISK_EVALUATION_DETAIL_ID = detail.ID; detailMeasures.Add(dep); - var measureTemp = i + "、" + item.MEASURES_NAME + "；"; - detail.MEASURE = detail.MEASURE + measureTemp; + //var measureTemp = i + "、" + item.MEASURES_NAME + "；"; + //detail.MEASURE = detail.MEASURE + measureTemp; i++; } } @@ -13826,8 +13826,8 @@ namespace APT.BaseData.Services.DomainServices dep.ORG_ID = item.ORG_ID; dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID; detailMeasures.Add(dep); - var measureTemp = i + "、" + item.MEASURES_NAME + "；"; - detail.MEASURE = detail.MEASURE + measureTemp; + //var measureTemp = i + "、" + item.MEASURES_NAME + "；"; + //detail.MEASURE = detail.MEASURE + measureTemp; //var emergencyTemp = i + "、" + item.EMERGENCY + "；"; //detail.EMERGENCY = detail.EMERGENCY + emergencyTemp; i++; diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationLinkController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationLinkController.cs index c46a291..f2ab5de 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationLinkController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationLinkController.cs @@ -120,12 +120,24 @@ namespace APT.HM.WebApi.Controllers.Api if (string.IsNullOrEmpty(id)) this.ThrowError("030017"); var result = this.GetEntity(id, new string[] { "Nav_OperationStep", "Nav_WorkPermitType","Nav_LinkPost","Nav_LinkPost.Nav_Post", - "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures", "Nav_Files" }); + "Nav_SafeConfirms", "Nav_SafeMeasures", "Nav_DealMeasures", "Nav_Files","Nav_Unit" }); if (result.Nav_LinkPost != null && result.Nav_LinkPost.Any()) { var postName = result.Nav_LinkPost.Where(t=>t.Nav_Post!=null).Select(m => m.Nav_Post.NAME).Distinct().ToList(); result.POST = string.Join(",", postName); - } + } + if (result.Nav_SafeConfirms != null && result.Nav_SafeConfirms.Any()) + { + result.Nav_SafeConfirms.OrderBy(t => t.NUM); + } + if (result.Nav_SafeMeasures != null && result.Nav_SafeMeasures.Any()) + { + result.Nav_SafeMeasures.OrderBy(t => t.NUM); + } + if (result.Nav_DealMeasures != null && result.Nav_DealMeasures.Any()) + { + result.Nav_DealMeasures.OrderBy(t => t.NUM); + } return result; }); } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckTypeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckTypeController.cs index 790f80d..57c4ca9 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckTypeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckTypeController.cs @@ -25,7 +25,7 @@ namespace APT.SK.WebApi.Controllers.Api { return SafeExecute(() => { - var olds = this.GetEntity(t => !t.IS_DELETED && t.MineType == entity.MineType && t.NAME == entity.NAME && t.ID != entity.ID); + var olds = this.GetEntity(t => !t.IS_DELETED && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.NAME == entity.NAME && t.ID != entity.ID); if (olds != null) { throw new Exception("该生产单元检查类型已存在，请先修改"); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs index 5c10f0b..2e7f7c3 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs @@ -505,14 +505,14 @@ namespace APT.SK.WebApi.Controllers.Api } deleteDetailIds.Add(t.ID); }); - } - foreach (var item in details) - { - if (item.CHECK_RESULT == null) - { - item.CHECK_RESULT = SKCheckResultEnum.None; - } - if (item.CHECK_RESULT == SKCheckResultEnum.None) + } + foreach (var item in details) + { + if (item.CHECK_RESULT == null) + { + item.CHECK_RESULT = SKCheckResultEnum.None; + } + if (item.CHECK_RESULT != SKCheckResultEnum.Yes) { item.HIDDEN_LEVEL = null; } @@ -526,7 +526,7 @@ namespace APT.SK.WebApi.Controllers.Api { throw new Exception("有隐患必须上传隐患照片"); } - var noExsists = details.FirstOrDefault(t => t.CHECK_RESULT != SKCheckResultEnum.None && (t.CHECK_QUESTION_ID != null|| t.HIDDEN_LEVEL != null || t.HIDDEN_PLACE != null)); + var noExsists = details.FirstOrDefault(t => t.CHECK_RESULT != SKCheckResultEnum.Yes && (t.CHECK_QUESTION_ID != null|| t.HIDDEN_LEVEL != null || t.HIDDEN_PLACE != null)); if (noExsists != null) { throw new Exception("无隐患、不涉及无需填写隐患描述和隐患等级隐患地点，请确认检查情况"); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs index 991acf4..2989c00 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs @@ -63,7 +63,7 @@ namespace APT.SK.WebApi.Controllers.Api List fileList = new List(); if (details != null && details.Any()) { - var groupDetails = details.Where(m => m.CHECK_RESULT == SKCheckResultEnum.Yes).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).ToList(); + var groupDetails = details.Where(m => m.CHECK_RESULT == SKCheckResultEnum.Yes && m.IS_DELETED == false).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).ToList(); foreach (var group in groupDetails) { var haveRecord = details.Where(t => t.RISK_AREA_ID == group.Key.RISK_AREA_ID && t.CHECK_CONTENTS_ID == group.Key.CHECK_CONTENTS_ID && t.CHECK_QUESTION_ID == group.Key.CHECK_QUESTION_ID).ToList(); @@ -669,8 +669,12 @@ namespace APT.SK.WebApi.Controllers.Api if (result != null && result.Nav_CheckRecordDetails != null && result.Nav_CheckRecordDetails.Any())// && taskId != null { result.Nav_CheckRecordDetails = result.Nav_CheckRecordDetails.ToList();//Where(c => c.Nav_CheckRecordDetailUsers != null && c.Nav_CheckRecordDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).ToList(); - } - result?.Nav_CheckRecordDetails?.OrderBy(m => m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList(); + } + //有隐患的排前面 + var tempsYes = result.Nav_CheckRecordDetails.Where(t => t.CHECK_RESULT == SKCheckResultEnum.Yes).OrderBy(m => m.RISK_AREA_ID).ToList(); + var tempsNo = result.Nav_CheckRecordDetails.Where(t => t.CHECK_RESULT != SKCheckResultEnum.Yes).OrderBy(m => m.RISK_AREA_ID).ToList(); + tempsYes.AddRange(tempsNo); + result.Nav_CheckRecordDetails = tempsYes.OrderByDescending(n => (int)n.MARK).ToList(); return result; }); } @@ -757,7 +761,7 @@ namespace APT.SK.WebApi.Controllers.Api item.Nav_CheckRecordDetailUsers = userTemps; } - result.Nav_CheckRecordDetails = details; + result.Nav_CheckRecordDetails = details.OrderByDescending(t=>t.CHECK_RESULT).ToList(); } } return result; @@ -794,8 +798,12 @@ namespace APT.SK.WebApi.Controllers.Api var userTemps = users.Where(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID == detail.ID).ToList(); detail.Nav_CheckRecordDetailUsers = userTemps.OrderByDescending(t => t.ISMAINCHECK).ToList(); } - } - result.Nav_CheckRecordDetails = details.OrderBy(m => m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList(); + } + //有隐患的排前面 + var tempsYes = details.Where(t => t.CHECK_RESULT == SKCheckResultEnum.Yes).OrderBy(m => m.RISK_AREA_ID).ToList(); + var tempsNo = details.Where(t => t.CHECK_RESULT != SKCheckResultEnum.Yes).OrderBy(m => m.RISK_AREA_ID).ToList(); + tempsYes.AddRange(tempsNo); + result.Nav_CheckRecordDetails = tempsYes.OrderByDescending(n => (int)n.MARK).ToList(); } return result; });