优化
This commit is contained in:
何美荣
parent
384679a47e
commit
f08ca4d72e
@ -12733,18 +12733,21 @@ namespace APT.BaseData.Services.DomainServices
|
||||
ideDetail.RISK_DESCRIPTION = library?.RISK_DESCRIPTION;
|
||||
ideDetail.TYPE_ID = library?.TYPE_ID;
|
||||
ideDetail.EMERGENCY = library?.EMERGENCY;
|
||||
var detailList = detailss.Where(t => t.ENTERPRISE_LIBRARY_ID == library.ID).OrderBy(t => t.NUM).ToList();
|
||||
var detailList = detailss.Where(t => t.ENTERPRISE_LIBRARY_ID == library.ID).OrderBy(t => t.NUM).Select(m=>m.MEASURES_NAME).Distinct().ToList();
|
||||
if (detailList.Any())
|
||||
{
|
||||
var i = 1;
|
||||
foreach (var id2 in detailList)
|
||||
{
|
||||
T_SK_RISK_IDENTIFY_DETAIL_MEASURE mes = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE();
|
||||
mes.ORG_ID = id2.ORG_ID;
|
||||
mes.ORG_ID = ideDetail.ORG_ID;
|
||||
mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID;
|
||||
mes.MEASURE = id2.MEASURES_NAME;
|
||||
mes.EMERGENCY = id2.EMERGENCY;
|
||||
mes.NUM = id2.NUM;
|
||||
mes.MEASURE = id2;
|
||||
mes.NUM = i;
|
||||
var temp = i + "、" + id2;
|
||||
ideDetail.MEASURE = ideDetail.MEASURE + temp;
|
||||
detailMeasures.Add(mes);
|
||||
i++;
|
||||
}
|
||||
//var measuresTemp = detailList.Select(t => t.MEASURES_NAME).Distinct().ToList();
|
||||
//if (measuresTemp.Any())
|
||||
@ -13121,7 +13124,7 @@ namespace APT.BaseData.Services.DomainServices
|
||||
mes.NUM = i;
|
||||
mes.MEASURE = mm;
|
||||
resultDetailMes.Add(mes);
|
||||
var mtemp = i + "、" + mm + "；";
|
||||
var mtemp = i + "、" + mm;
|
||||
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
|
||||
i++;
|
||||
}
|
||||
@ -13514,7 +13517,7 @@ namespace APT.BaseData.Services.DomainServices
|
||||
mes.NUM = i;
|
||||
mes.MEASURE = mm;
|
||||
summaryMeasures.Add(mes);
|
||||
var mtemp = i + "、" + mm + "；";
|
||||
var mtemp = i + "、" + mm;
|
||||
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
|
||||
i++;
|
||||
}
|
||||
@ -13802,21 +13805,20 @@ namespace APT.BaseData.Services.DomainServices
|
||||
detail.EMERGENCY = de.EMERGENCY;
|
||||
//if (departTemp != null)
|
||||
//{
|
||||
var sumDetailTemps = summaryMes.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).ToList();
|
||||
var sumDetailTemps = summaryMes.Where(t => t.RISK_IDENTIFY_RESULT_DETAIL_ID == de.ID).Select(m=>m.MEASURE).Distinct().ToList();
|
||||
if (sumDetailTemps.Any())
|
||||
{
|
||||
var i = 1;
|
||||
foreach (var item in sumDetailTemps)
|
||||
{
|
||||
T_SK_RISK_EVALUATION_DETAIL_MEASURE dep = new T_SK_RISK_EVALUATION_DETAIL_MEASURE();
|
||||
dep.MEASURES_NAME = item.MEASURE;
|
||||
dep.EMERGENCY = item.EMERGENCY;
|
||||
dep.NUM = item.NUM;
|
||||
dep.ORG_ID = item.ORG_ID;
|
||||
dep.MEASURES_NAME = item;
|
||||
dep.NUM = i;
|
||||
dep.ORG_ID = detail.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;
|
||||
detail.MEASURE = detail.MEASURE + measureTemp;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
@ -14247,7 +14249,7 @@ namespace APT.BaseData.Services.DomainServices
|
||||
mes.NUM = i;
|
||||
mes.MEASURES_NAME = mm;
|
||||
detailMeasures.Add(mes);
|
||||
var mtemp = i + "、" + mm + "；";
|
||||
var mtemp = i + "、" + mm;
|
||||
detail.MEASURE = detail.MEASURE + mtemp;
|
||||
i++;
|
||||
}
|
||||
@ -14278,6 +14280,7 @@ namespace APT.BaseData.Services.DomainServices
|
||||
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART depart = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART();
|
||||
depart.ORG_ID = ite.ORG_ID;
|
||||
depart.DEPARTMENT_ID = ite.ID;
|
||||
depart.USER_ID = ite?.USER_ID;
|
||||
depart.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)ite.DEPARTMENT_TYPE;
|
||||
depart.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID;
|
||||
detailDepartSums.Add(depart);
|
||||
@ -14506,17 +14509,19 @@ namespace APT.BaseData.Services.DomainServices
|
||||
// detailPosts.Add(post);
|
||||
// }
|
||||
// }
|
||||
var measures = detailMeasures.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
|
||||
var measures = detailMeasures.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).Select(m=>m.MEASURES_NAME).Distinct().ToList();
|
||||
if (measures.Any())
|
||||
{
|
||||
var i = 1;
|
||||
foreach (var item2 in measures)
|
||||
{
|
||||
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES measure = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES();
|
||||
measure.ORG_ID = item2.ORG_ID;
|
||||
measure.ORG_ID = detail.ORG_ID;
|
||||
measure.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
|
||||
measure.MEASURES_NAME = item2.MEASURES_NAME;
|
||||
measure.EMERGENCY = item2.EMERGENCY;
|
||||
measure.NUM = item2.NUM;
|
||||
measure.MEASURES_NAME = item2;
|
||||
measure.NUM = i;
|
||||
var mtemp = i + "、" + item2;
|
||||
detail.MEASURE = detail.MEASURE + mtemp;
|
||||
douDetailMes.Add(measure);
|
||||
var libraryDetailFirst = libraryDetails.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst?.ID);
|
||||
var contents = libraryContents.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_ID == libraryDetailFirst?.ID).ToList();
|
||||
@ -14578,6 +14583,7 @@ namespace APT.BaseData.Services.DomainServices
|
||||
}
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
//}
|
||||
@ -14852,17 +14858,17 @@ namespace APT.BaseData.Services.DomainServices
|
||||
// detailPosts.Add(post);
|
||||
// }
|
||||
// }
|
||||
var measures = detailMeasures.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
|
||||
var measures = detailMeasures.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).Select(m=>m.MEASURES_NAME).Distinct().ToList();
|
||||
if (measures.Any())
|
||||
{
|
||||
var i = 1;
|
||||
foreach (var item2 in measures)
|
||||
{
|
||||
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES measure = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES();
|
||||
measure.ORG_ID = item2.ORG_ID;
|
||||
measure.ORG_ID = detail.ORG_ID;
|
||||
measure.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
|
||||
measure.MEASURES_NAME = item2.MEASURES_NAME;
|
||||
measure.EMERGENCY = item2.EMERGENCY;
|
||||
measure.NUM = item2.NUM;
|
||||
measure.MEASURES_NAME = item2;
|
||||
measure.NUM = i;
|
||||
douDetailMes.Add(measure);
|
||||
var libraryDetailFirst = libraryDetails.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst?.ID);
|
||||
var contents = libraryContents.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_ID == libraryDetailFirst?.ID).ToList();
|
||||
@ -14924,6 +14930,7 @@ namespace APT.BaseData.Services.DomainServices
|
||||
}
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1389,7 +1389,7 @@ namespace APT.PP.WebApi.Controllers.Api
|
||||
mes.NUM = detais.NUM;
|
||||
mes.MEASURE = detais.MEASURES_NAME;
|
||||
mesList.Add(mes);
|
||||
var temp = (detais.NUM == null || detais.NUM == 0) ? "1" : detais.NUM + "、" + detais.MEASURES_NAME +"；";
|
||||
var temp = (detais.NUM == null || detais.NUM == 0) ? "1" : detais.NUM + "、" + detais.MEASURES_NAME;
|
||||
ideDetail.MEASURE = ideDetail.MEASURE + temp;
|
||||
}
|
||||
}
|
||||
@ -1599,7 +1599,7 @@ namespace APT.PP.WebApi.Controllers.Api
|
||||
mes.NUM = i;
|
||||
mes.MEASURE = mm;
|
||||
resultDetailMes.Add(mes);
|
||||
var mtemp = i + "、" + mm + "；";
|
||||
var mtemp = i + "、" + mm;
|
||||
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
|
||||
i++;
|
||||
}
|
||||
@ -1766,7 +1766,7 @@ namespace APT.PP.WebApi.Controllers.Api
|
||||
mes.NUM = i;
|
||||
mes.MEASURE = mm;
|
||||
resultDetailMes.Add(mes);
|
||||
var mtemp = i + "、" + mm + "；";
|
||||
var mtemp = i + "、" + mm;
|
||||
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
|
||||
i++;
|
||||
}
|
||||
@ -1961,7 +1961,7 @@ namespace APT.PP.WebApi.Controllers.Api
|
||||
mes.NUM = i;
|
||||
mes.MEASURE = mm;
|
||||
resultDetailMes.Add(mes);
|
||||
var mtemp = i + "、" + mm + "；";
|
||||
var mtemp = i + "、" + mm;
|
||||
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
|
||||
i++;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user