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-17 15:29:03 +08:00
parent 98d5d48972
commit 425a84df14
6 changed files with 121 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13465,7 +13465,7 @@ namespace APT.BaseData.Services.DomainServices
var details = GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(i => identityIds.Contains(i.RISK_IDENTIFY_ID), new BaseFilter(filter.OrgId)).ToList(); var details = GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(i => identityIds.Contains(i.RISK_IDENTIFY_ID), new BaseFilter(filter.OrgId)).ToList();
var identityDetailIds = details.Select(t => t.ID).ToList(); var identityDetailIds = details.Select(t => t.ID).ToList();
var identityDetailMes = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(i => identityDetailIds.Contains(i.RISK_IDENTIFY_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList(); var identityDetailMes = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(i => identityDetailIds.Contains(i.RISK_IDENTIFY_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
var detailList = details.OrderByDescending(t => t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()); var detailList = details.OrderByDescending(t => t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.MARK }).Select(g => g.FirstOrDefault());
if (detailList.Any()) if (detailList.Any())
{ {
foreach (var item in detailList) foreach (var item in detailList)
@ -13484,7 +13484,7 @@ namespace APT.BaseData.Services.DomainServices
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS; ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.MARK = item.MARK; ideDetail.MARK = item.MARK;
//汇总去重 //汇总去重
var temp = details.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList(); var temp = details.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.MARK == item.MARK).ToList();
//管控措施 //管控措施
var ids = temp.Select(t => t.ID).ToList(); var ids = temp.Select(t => t.ID).ToList();
var mesTemps = identityDetailMes.Where(t=>ids.Contains(t.RISK_IDENTIFY_DETAIL_ID)).Select(m => m.MEASURE).Distinct().ToList(); var mesTemps = identityDetailMes.Where(t=>ids.Contains(t.RISK_IDENTIFY_DETAIL_ID)).Select(m => m.MEASURE).Distinct().ToList();
@ -13880,7 +13880,7 @@ namespace APT.BaseData.Services.DomainServices
var resultDetailDepts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(i => resultDetailIds.Contains(i.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList(); var resultDetailDepts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(i => resultDetailIds.Contains(i.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(filter.OrgId)).ToList();
var resultDetailDeptIds = resultDetailDepts.Select(t => t.ID).ToList(); var resultDetailDeptIds = resultDetailDepts.Select(t => t.ID).ToList();
var resultDetailDeptPosts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(i => resultDetailDeptIds.Contains(i.RISK_IDENTIFY_DETAIL_RESULT_POST_ID), new BaseFilter(filter.OrgId)).ToList(); var resultDetailDeptPosts = GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(i => resultDetailDeptIds.Contains(i.RISK_IDENTIFY_DETAIL_RESULT_POST_ID), new BaseFilter(filter.OrgId)).ToList();
var detailList = details.OrderByDescending(t=>t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()); var detailList = details.OrderByDescending(t=>t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.MARK }).Select(g => g.FirstOrDefault());
if (detailList.Any()) if (detailList.Any())
{ {
foreach (var de in detailList) foreach (var de in detailList)
@ -13904,7 +13904,7 @@ namespace APT.BaseData.Services.DomainServices
ideDetail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID; ideDetail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID;
ideDetail.ENABLE_STATUS = de.ENABLE_STATUS; ideDetail.ENABLE_STATUS = de.ENABLE_STATUS;
//汇总去重 //汇总去重
var temp = details.Where(m => m.AREA_ID == de.AREA_ID && m.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && m.RISK_NAME == de.RISK_NAME && m.RISK_DESCRIPTION == de.RISK_DESCRIPTION && m.TYPE_ID == de.TYPE_ID && m.ENABLE_STATUS == de.ENABLE_STATUS).ToList(); var temp = details.Where(m => m.AREA_ID == de.AREA_ID && m.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && m.RISK_NAME == de.RISK_NAME && m.RISK_DESCRIPTION == de.RISK_DESCRIPTION && m.TYPE_ID == de.TYPE_ID && m.MARK == de.MARK).ToList();
var ids = temp.Select(t => t.ID).ToList(); var ids = temp.Select(t => t.ID).ToList();
//管控措施 //管控措施
var mesTemps = resultDetailMes.Where(t=>ids.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID)).Select(m => m.MEASURE).Distinct().ToList(); var mesTemps = resultDetailMes.Where(t=>ids.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID)).Select(m => m.MEASURE).Distinct().ToList();
@ -14638,7 +14638,7 @@ namespace APT.BaseData.Services.DomainServices
var detailMes = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)); var detailMes = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID));
//var detailDeparts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)); //var detailDeparts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID));
var detailPosts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID), "Nav_PostDetails"); var detailPosts = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID), "Nav_PostDetails");
var detailList = details.OrderByDescending(t=>t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID,m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()); var detailList = details.OrderByDescending(t=>t.ENABLE_STATUS).GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID,m.MARK }).Select(g => g.FirstOrDefault());
if (detailList.Any()) if (detailList.Any())
{ {
foreach (var de in detailList) foreach (var de in detailList)
@ -14665,7 +14665,7 @@ namespace APT.BaseData.Services.DomainServices
detail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID; detail.ENTERPRISE_LIBRARY_ID = de.ENTERPRISE_LIBRARY_ID;
detail.ENABLE_STATUS = de.ENABLE_STATUS; detail.ENABLE_STATUS = de.ENABLE_STATUS;
//汇总去重 //汇总去重
var temp = details.Where(m => m.AREA_ID == de.AREA_ID && m.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && m.RISK_NAME == de.RISK_NAME && m.RISK_DESCRIPTION == de.RISK_DESCRIPTION && m.TYPE_ID == de.TYPE_ID && m.ENABLE_STATUS == de.ENABLE_STATUS).ToList(); var temp = details.Where(m => m.AREA_ID == de.AREA_ID && m.PRODUCTION_UNIT_ID == de.PRODUCTION_UNIT_ID && m.RISK_NAME == de.RISK_NAME && m.RISK_DESCRIPTION == de.RISK_DESCRIPTION && m.TYPE_ID == de.TYPE_ID && m.MARK == de.MARK).ToList();
var ids = temp.Select(m => m.ID).ToList(); var ids = temp.Select(m => m.ID).ToList();
//管控措施 //管控措施
var mesTemps = detailMes.Where(t => ids.Contains(t.RISK_EVALUATION_DETAIL_ID)).Select(m => m.MEASURES_NAME).Distinct().ToList(); var mesTemps = detailMes.Where(t => ids.Contains(t.RISK_EVALUATION_DETAIL_ID)).Select(m => m.MEASURES_NAME).Distinct().ToList();
@ -15164,7 +15164,7 @@ namespace APT.BaseData.Services.DomainServices
{ {
var entity = this.GetEntity<T_SK_RISK_EVALUATION_SUMMARY>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); var entity = this.GetEntity<T_SK_RISK_EVALUATION_SUMMARY>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
entity.END_DATE = DateTime.Now; //entity.END_DATE = DateTime.Now;
var sumDetails = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)); var sumDetails = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == entity.ID, new BaseFilter(entity.ORG_ID));
//触发风险检查关联表 //触发风险检查关联表
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;

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

@ -1707,7 +1707,7 @@ namespace APT.PP.WebApi.Controllers.Api
if (planIds != null && planIds.Any() && dtNow.Hour >= 23)//&& dtNow.Hour >= 16 && dtNow.Hour <= 20 if (planIds != null && planIds.Any() && dtNow.Hour >= 23)//&& dtNow.Hour >= 16 && dtNow.Hour <= 20
{ {
//plans.ForEach(t => t.STATUS = PFStandardStatus.Close); //plans.ForEach(t => t.STATUS = PFStandardStatus.Close);
identitys.ForEach(m => { m.STATUS = PFStandardStatus.Close; m.END_DATE = DateTime.Now; }); identitys.ForEach(m => { m.STATUS = PFStandardStatus.Close;});
tasks.ForEach(t => { t.NOTICE_STATUS = 4; t.SOURCE_FORMCODE = "SK033_SHOWPRINT"; }); tasks.ForEach(t => { t.NOTICE_STATUS = 4; t.SOURCE_FORMCODE = "SK033_SHOWPRINT"; });
foreach (var plan in planIds) foreach (var plan in planIds)
{ {

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

@ -79,23 +79,32 @@ namespace APT.SK.WebApi.Controllers.Api
deletePostDetIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>(t => deletePostIds.Contains(t.RISK_EVALUATION_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deletePostDetIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>(t => deletePostIds.Contains(t.RISK_EVALUATION_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details) foreach (var item in details)
{ {
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION if (item.MARK == SKMarkEnum.Auto)
&& t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS);
if (temp == null && item.MARK != SKMarkEnum.Add)
{ {
item.MARK = SKMarkEnum.Update; //&& t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS
} var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME);
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (temp == null)
{
foreach (var mes in item.Nav_DetailMeasures)
{ {
var newMes = detailMes.FirstOrDefault(t => t.MEASURES_NAME == mes.MEASURES_NAME && t.RISK_EVALUATION_DETAIL_ID == item.ID); item.MARK = SKMarkEnum.Update;
if (newMes == null && item.MARK != SKMarkEnum.Add)
{
item.MARK = SKMarkEnum.Update;
}
} }
} }
//var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION
// && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS);
//if (temp == null && item.MARK != SKMarkEnum.Add)
//{
// item.MARK = SKMarkEnum.Update;
//}
//if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
//{
// foreach (var mes in item.Nav_DetailMeasures)
// {
// var newMes = detailMes.FirstOrDefault(t => t.MEASURES_NAME == mes.MEASURES_NAME && t.RISK_EVALUATION_DETAIL_ID == item.ID);
// if (newMes == null && item.MARK != SKMarkEnum.Add)
// {
// item.MARK = SKMarkEnum.Update;
// }
// }
//}
} }
//record.Nav_Details.ForEach(t => //record.Nav_Details.ForEach(t =>
//{ //{

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

@ -69,22 +69,25 @@ namespace APT.SK.WebApi.Controllers.Api
deleteMeasureIds = detailMes.Select(t => t.ID).ToList(); deleteMeasureIds = detailMes.Select(t => t.ID).ToList();
foreach (var item in details) foreach (var item in details)
{ {
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION if (item.MARK == SKMarkEnum.Auto)
&& t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS);
if (temp == null && item.MARK != SKMarkEnum.Add)
{ {
item.MARK = SKMarkEnum.Update; //&& t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS
} var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME);
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (temp == null)
{
foreach (var mes in item.Nav_DetailMeasures)
{ {
var newMes = detailMes.FirstOrDefault(t => t.MEASURE == mes.MEASURE && t.RISK_IDENTIFY_DETAIL_ID == item.ID); item.MARK = SKMarkEnum.Update;
if (newMes == null && item.MARK != SKMarkEnum.Add)
{
item.MARK = SKMarkEnum.Update;
}
} }
//if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
//{
// foreach (var mes in item.Nav_DetailMeasures)
// {
// var newMes = detailMes.FirstOrDefault(t => t.MEASURE == mes.MEASURE && t.RISK_IDENTIFY_DETAIL_ID == item.ID);
// if (newMes == null && item.MARK != SKMarkEnum.Add)
// {
// item.MARK = SKMarkEnum.Update;
// }
// }
//}
} }
} }
} }

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

@ -98,23 +98,32 @@ namespace APT.SK.WebApi.Controllers.Api
//}); //});
foreach (var item in details) foreach (var item in details)
{ {
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION if (item.MARK == SKMarkEnum.Auto)
&& t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS);
if (temp == null && item.MARK != SKMarkEnum.Add)
{ {
item.MARK = SKMarkEnum.Update; //&& t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS
} var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME);
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (temp == null)
{
foreach (var mes in item.Nav_DetailMeasures)
{ {
var newMes = detailMes.FirstOrDefault(t => t.MEASURE == mes.MEASURE && t.RISK_IDENTIFY_RESULT_DETAIL_ID == item.ID); item.MARK = SKMarkEnum.Update;
if (newMes == null && item.MARK != SKMarkEnum.Add)
{
item.MARK = SKMarkEnum.Update;
}
} }
} }
//var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION
// && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS);
//if (temp == null && item.MARK != SKMarkEnum.Add)
//{
// item.MARK = SKMarkEnum.Update;
//}
//if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
//{
// foreach (var mes in item.Nav_DetailMeasures)
// {
// var newMes = detailMes.FirstOrDefault(t => t.MEASURE == mes.MEASURE && t.RISK_IDENTIFY_RESULT_DETAIL_ID == item.ID);
// if (newMes == null && item.MARK != SKMarkEnum.Add)
// {
// item.MARK = SKMarkEnum.Update;
// }
// }
//}
} }
} }
if (details != null && details.Any()) if (details != null && details.Any())
@ -315,13 +324,30 @@ namespace APT.SK.WebApi.Controllers.Api
// var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；"; // var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；";
// d.MEASURE = d.MEASURE + temp; // d.MEASURE = d.MEASURE + temp;
//} //}
d.Nav_DetailPosts = d.Nav_DetailPosts.OrderBy(t => t.DEPARTMENT_TYPE).ToList(); if (d.Nav_DetailPosts != null && d.Nav_DetailPosts.Any())
var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE.GetDescription()).Distinct().ToList(); {
d.DEPARTMENT_TYPE = string.Join(",", departTypes); var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
var departs = d.Nav_DetailPosts.Select(t => t.Nav_Department?.NAME).Distinct().ToList(); var j = 1;
d.IDENTIFY_DEPARTMENT = string.Join(",", departs); foreach (var p in departTypes)
var posts = d.Nav_DetailPosts.SelectMany(x=>x.Nav_ResultPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList(); {
d.IDENTIFY_POST = string.Join(",", posts); var temp = j + "、" + p.GetDescription() + "；";
d.DEPARTMENT_TYPE = d.DEPARTMENT_TYPE + temp;
var departs = d.Nav_DetailPosts.Where(x => x.DEPARTMENT_TYPE == p).Select(t => t.Nav_Department?.NAME).Distinct().ToList();
var temp2 = j + "、" + string.Join(",", departs) + "；";
d.IDENTIFY_DEPARTMENT = d.IDENTIFY_DEPARTMENT + temp2;
var posts = d.Nav_DetailPosts.Where(x => x.DEPARTMENT_TYPE == p).SelectMany(x => x.Nav_ResultPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList();
var temp3 = j + "、" + string.Join(",", posts) + "；";
d.IDENTIFY_POST = d.IDENTIFY_POST + temp3;
}
}
//d.Nav_DetailPosts = d.Nav_DetailPosts.OrderBy(t => t.DEPARTMENT_TYPE).ToList();
//var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE.GetDescription()).Distinct().ToList();
//d.DEPARTMENT_TYPE = string.Join(",", departTypes);
//var departs = d.Nav_DetailPosts.Select(t => t.Nav_Department?.NAME).Distinct().ToList();
//d.IDENTIFY_DEPARTMENT = string.Join(",", departs);
//var posts = d.Nav_DetailPosts.SelectMany(x=>x.Nav_ResultPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList();
//d.IDENTIFY_POST = string.Join(",", posts);
} }
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {

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

@ -260,13 +260,30 @@ namespace APT.SK.WebApi.Controllers.Api
// var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；"; // var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；";
// d.MEASURE = d.MEASURE + temp; // d.MEASURE = d.MEASURE + temp;
//} //}
d.Nav_DetailPosts = d.Nav_DetailPosts.OrderBy(t => t.DEPARTMENT_TYPE).ToList(); if (d.Nav_DetailPosts != null && d.Nav_DetailPosts.Any())
var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE.GetDescription()).Distinct().ToList(); {
d.DEPARTMENT_TYPE = string.Join(",", departTypes); var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
var departs = d.Nav_DetailPosts.Select(t => t.Nav_Department?.NAME).Distinct().ToList(); var j = 1;
d.IDENTIFY_DEPARTMENT = string.Join(",", departs); foreach (var p in departTypes)
var posts = d.Nav_DetailPosts.SelectMany(x => x.Nav_SumPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList(); {
d.IDENTIFY_POST = string.Join(",", posts); var temp = j + "、" + p.GetDescription() + "；";
d.DEPARTMENT_TYPE = d.DEPARTMENT_TYPE + temp;
var departs = d.Nav_DetailPosts.Where(x => x.DEPARTMENT_TYPE == p).Select(t => t.Nav_Department?.NAME).Distinct().ToList();
var temp2 = j + "、" + string.Join(",", departs) + "；";
d.IDENTIFY_DEPARTMENT = d.IDENTIFY_DEPARTMENT + temp2;
var posts = d.Nav_DetailPosts.Where(x => x.DEPARTMENT_TYPE == p).SelectMany(x => x.Nav_SumPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList();
var temp3 = j + "、" + string.Join(",", posts) + "；";
d.IDENTIFY_POST = d.IDENTIFY_POST + temp3;
}
}
//d.Nav_DetailPosts = d.Nav_DetailPosts.OrderBy(t => t.DEPARTMENT_TYPE).ToList();
//var departTypes = d.Nav_DetailPosts.Select(t => t.DEPARTMENT_TYPE.GetDescription()).Distinct().ToList();
//d.DEPARTMENT_TYPE = string.Join(",", departTypes);
//var departs = d.Nav_DetailPosts.Select(t => t.Nav_Department?.NAME).Distinct().ToList();
//d.IDENTIFY_DEPARTMENT = string.Join(",", departs);
//var posts = d.Nav_DetailPosts.SelectMany(x => x.Nav_SumPostDets).Select(t => t.Nav_Post?.NAME).Distinct().ToList();
//d.IDENTIFY_POST = string.Join(",", posts);
} }
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)
{ {