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-09 14:41:06 +08:00
parent 2e20e1d250
commit 31941c5f64
5 changed files with 84 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14792,12 +14792,16 @@ namespace APT.BaseData.Services.DomainServices
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.FORM_CODE == "SK041" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.PARAM == param, "Nav_ApproveTempDetails.Nav_ApproveRole"); var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.FORM_CODE == "SK041" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.PARAM == param, "Nav_ApproveTempDetails.Nav_ApproveRole");
if (approveTemp != null && approveTemp.Nav_ApproveTempDetails != null && approveTemp.Nav_ApproveTempDetails.Any()) if (approveTemp != null && approveTemp.Nav_ApproveTempDetails != null && approveTemp.Nav_ApproveTempDetails.Any())
{ {
var approveDetailLast = approveTemp.Nav_ApproveTempDetails.OrderByDescending(t => t.NUM).FirstOrDefault(); var approveDetailFirst = approveTemp.Nav_ApproveTempDetails.OrderBy(t => t.NUM).FirstOrDefault();
var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value); var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value);
if (approveDetailLast.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID) if (approveDetailFirst.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID)
{
approveTemp.Nav_ApproveTempDetails.Remove(approveDetailFirst);
}
if(approveTemp.Nav_ApproveTempDetails.Count() == 0)
{ {
result.STATUS = PFStandardStatus.Archived; result.STATUS = PFStandardStatus.Archived;
var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList(); var resultDetailTemps = resultDetails.Where(t => (t.MARK != SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK == SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.No)).ToList();
if (user != null && resultDetailTemps != null && resultDetailTemps.Any()) if (user != null && resultDetailTemps != null && resultDetailTemps.Any())
{ {
var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList(); var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList();
@ -15139,7 +15143,7 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> douContentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> douContentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
//List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> douContentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>(); //List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> douContentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> douContentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> douContentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
var entityDetails = sumDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList(); var entityDetails = sumDetails.Where(t => (t.MARK != SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK == SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.No)).ToList();
if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any()) if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any())
{ {
var sumDetailIds = entityDetails.Select(t => t.ID).ToList(); var sumDetailIds = entityDetails.Select(t => t.ID).ToList();

63
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -1141,7 +1141,7 @@ namespace APT.PP.WebApi.Controllers.Api
plan.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; plan.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
plan.APPLY_USER_ID = userInfo.ID; plan.APPLY_USER_ID = userInfo.ID;
plan.YEAR = DateTime.Now.Year.ToString(); plan.YEAR = DateTime.Now.Year.ToString();
plan.START_DATE = DateTime.Now; //plan.START_DATE = DateTime.Now;
//plan.END_DATE = dtEnd; //plan.END_DATE = dtEnd;
plan.ISAUTO = true; plan.ISAUTO = true;
plans.Add(plan); plans.Add(plan);
@ -1857,8 +1857,29 @@ namespace APT.PP.WebApi.Controllers.Api
} }
i++; i++;
} }
//var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
//var typeList = ""; var nameList = ""; var postList = "";
//int j = 1;
//foreach (var type in departTypes)
//{
// var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type);
// typeList = typeList + temp;
// var departNames = departTemps.Where(t=>t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList();
// var nameTemp = j + "、" + string.Join(",", departNames);
// nameList = nameList + nameTemp;
// var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList();
// var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
// var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
// var postTemp = j + "、" + string.Join(",", postTemps);
// postList = postList + postTemp;
// j++;
//}
//ideDetail.DEPARTMENT_TYPE = typeList;
//ideDetail.IDENTIFY_DEPARTMENT = nameList;
//ideDetail.IDENTIFY_POST = postList;
} }
} }
resultDetails.Add(ideDetail); resultDetails.Add(ideDetail);
} }
} }
@ -2025,6 +2046,26 @@ namespace APT.PP.WebApi.Controllers.Api
} }
i++; i++;
} }
//var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
//var typeList = ""; var nameList = ""; var postList = "";
//int j = 1;
//foreach (var type in departTypes)
//{
// var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type);
// typeList = typeList + temp;
// var departNames = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList();
// var nameTemp = j + "、" + string.Join(",", departNames);
// nameList = nameList + nameTemp;
// var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList();
// var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
// var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
// var postTemp = j + "、" + string.Join(",", postTemps);
// postList = postList + postTemp;
// j++;
//}
//ideDetail.DEPARTMENT_TYPE = typeList;
//ideDetail.IDENTIFY_DEPARTMENT = nameList;
//ideDetail.IDENTIFY_POST = postList;
} }
} }
resultDetails.Add(ideDetail); resultDetails.Add(ideDetail);
@ -2231,6 +2272,26 @@ namespace APT.PP.WebApi.Controllers.Api
} }
i++; i++;
} }
//var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
//var typeList = ""; var nameList = ""; var postList = "";
//int j = 1;
//foreach (var type in departTypes)
//{
// var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type);
// typeList = typeList + temp;
// var departNames = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList();
// var nameTemp = j + "、" + string.Join(",", departNames);
// nameList = nameList + nameTemp;
// var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList();
// var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
// var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
// var postTemp = j + "、" + string.Join(",", postTemps);
// postList = postList + postTemp;
// j++;
//}
//ideDetail.DEPARTMENT_TYPE = typeList;
//ideDetail.IDENTIFY_DEPARTMENT = nameList;
//ideDetail.IDENTIFY_POST = postList;
} }
} }
resultDetails.Add(ideDetail); resultDetails.Add(ideDetail);

1
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -675,6 +675,7 @@ namespace APT.SK.WebApi.Controllers.Api
pageFilter.Include.Add("Nav_RiskName"); pageFilter.Include.Add("Nav_RiskName");
pageFilter.Include.Add("Nav_Details"); pageFilter.Include.Add("Nav_Details");
pageFilter.Include.Add("Nav_ProductionUnit"); pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.Include.Add("Nav_Posts");
pageFilter.SelectField.Add("Nav_ProductionUnit.NAME"); pageFilter.SelectField.Add("Nav_ProductionUnit.NAME");
pageFilter.SelectField.Add("Nav_Details.NUM"); pageFilter.SelectField.Add("Nav_Details.NUM");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");

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

@ -137,7 +137,8 @@ namespace APT.SK.WebApi.Controllers.Api
de.SCOREE_ID = item.SCOREE_ID; de.SCOREE_ID = item.SCOREE_ID;
de.SCOREC_ID = item.SCOREC_ID; de.SCOREC_ID = item.SCOREC_ID;
de.EVALUATE_SCORE = item.EVALUATE_SCORE; de.EVALUATE_SCORE = item.EVALUATE_SCORE;
if (item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null) de.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
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都不能为空");
} }
@ -348,7 +349,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();
var measures = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId)); var measures = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId));
var departs = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User"); var departs = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User");
var posts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post"); var posts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
foreach (var detail in details) foreach (var detail in details)
{ {

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

@ -83,6 +83,12 @@ namespace APT.SK.WebApi.Controllers.Api
de.ENABLE_STATUS = item.ENABLE_STATUS; de.ENABLE_STATUS = item.ENABLE_STATUS;
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.SCOREL_ID = item.SCOREL_ID;
de.SCOREE_ID = item.SCOREE_ID;
de.SCOREC_ID = item.SCOREC_ID;
de.EVALUATE_SCORE = item.EVALUATE_SCORE;
de.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
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)
@ -254,7 +260,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
var detailIds = details.Select(t => t.ID).ToList(); var detailIds = details.Select(t => t.ID).ToList();
var measures = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId)); var measures = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId));
var departs = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User"); var departs = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User");
var posts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post"); var posts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post");
foreach (var detail in details) foreach (var detail in details)
{ {