wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2025-11-07 11:03:43 +08:00
commit 956dcb24a4
5 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13442,8 +13442,8 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = item.ORG_ID; dep.ORG_ID = item.ORG_ID;
dep.RISK_EVALUATION_DETAIL_ID = detail.ID; dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
detailMeasures.Add(dep); detailMeasures.Add(dep);
var measureTemp = i + "、" + item.MEASURES_NAME + "；"; //var measureTemp = i + "、" + item.MEASURES_NAME + "；";
detail.MEASURE = detail.MEASURE + measureTemp; //detail.MEASURE = detail.MEASURE + measureTemp;
i++; i++;
} }
} }
@ -13826,8 +13826,8 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = item.ORG_ID; dep.ORG_ID = item.ORG_ID;
dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID; dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID;
detailMeasures.Add(dep); detailMeasures.Add(dep);
var measureTemp = i + "、" + item.MEASURES_NAME + "；"; //var measureTemp = i + "、" + item.MEASURES_NAME + "；";
detail.MEASURE = detail.MEASURE + measureTemp; //detail.MEASURE = detail.MEASURE + measureTemp;
//var emergencyTemp = i + "、" + item.EMERGENCY + "；"; //var emergencyTemp = i + "、" + item.EMERGENCY + "；";
//detail.EMERGENCY = detail.EMERGENCY + emergencyTemp; //detail.EMERGENCY = detail.EMERGENCY + emergencyTemp;
i++; i++;

16
APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationLinkController.cs
View File

@ -120,12 +120,24 @@ namespace APT.HM.WebApi.Controllers.Api
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))
this.ThrowError("030017"); this.ThrowError("030017");
var result = this.GetEntity<T_HM_OPERATION_LINK>(id, new string[] { "Nav_OperationStep", "Nav_WorkPermitType","Nav_LinkPost","Nav_LinkPost.Nav_Post", var result = this.GetEntity<T_HM_OPERATION_LINK>(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()) 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(); var postName = result.Nav_LinkPost.Where(t=>t.Nav_Post!=null).Select(m => m.Nav_Post.NAME).Distinct().ToList();
result.POST = string.Join(",", postName); 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; return result;
}); });
} }

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

@ -25,7 +25,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
var olds = this.GetEntity<T_SK_CHECK_TYPE>(t => !t.IS_DELETED && t.MineType == entity.MineType && t.NAME == entity.NAME && t.ID != entity.ID); var olds = this.GetEntity<T_SK_CHECK_TYPE>(t => !t.IS_DELETED && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.NAME == entity.NAME && t.ID != entity.ID);
if (olds != null) if (olds != null)
{ {
throw new Exception("该生产单元检查类型已存在，请先修改"); throw new Exception("该生产单元检查类型已存在，请先修改");

18
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -505,14 +505,14 @@ namespace APT.SK.WebApi.Controllers.Api
} }
deleteDetailIds.Add(t.ID); deleteDetailIds.Add(t.ID);
}); });
} }
foreach (var item in details) foreach (var item in details)
{ {
if (item.CHECK_RESULT == null) if (item.CHECK_RESULT == null)
{ {
item.CHECK_RESULT = SKCheckResultEnum.None; item.CHECK_RESULT = SKCheckResultEnum.None;
} }
if (item.CHECK_RESULT == SKCheckResultEnum.None) if (item.CHECK_RESULT != SKCheckResultEnum.Yes)
{ {
item.HIDDEN_LEVEL = null; item.HIDDEN_LEVEL = null;
} }
@ -526,7 +526,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
throw new Exception("有隐患必须上传隐患照片"); 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) if (noExsists != null)
{ {
throw new Exception("无隐患、不涉及无需填写隐患描述和隐患等级隐患地点，请确认检查情况"); throw new Exception("无隐患、不涉及无需填写隐患描述和隐患等级隐患地点，请确认检查情况");

20
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -63,7 +63,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE> fileList = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>(); List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE> fileList = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>();
if (details != null && details.Any()) 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) 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(); 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 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 = 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; return result;
}); });
} }
@ -757,7 +761,7 @@ namespace APT.SK.WebApi.Controllers.Api
item.Nav_CheckRecordDetailUsers = userTemps; item.Nav_CheckRecordDetailUsers = userTemps;
} }
result.Nav_CheckRecordDetails = details; result.Nav_CheckRecordDetails = details.OrderByDescending(t=>t.CHECK_RESULT).ToList();
} }
} }
return result; 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(); var userTemps = users.Where(t => t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID == detail.ID).ToList();
detail.Nav_CheckRecordDetailUsers = userTemps.OrderByDescending(t => t.ISMAINCHECK).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; return result;
}); });