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:
何美荣 2025-12-08 02:44:59 +08:00
parent eafb92933f
commit 366610fa66
6 changed files with 256 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13817,8 +13817,8 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = detail.ORG_ID;
dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
detailMeasures.Add(dep);
var measureTemp = i + "、" + item;
detail.MEASURE = detail.MEASURE + measureTemp;
//var measureTemp = i + "、" + item;
//detail.MEASURE = detail.MEASURE + measureTemp;
i++;
}
}

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

@ -62,6 +62,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> deletePostIds = new List<Guid>();
List<Guid> deletePostDetIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_RISK_EVALUATION_DETAIL> detailList = new List<T_SK_RISK_EVALUATION_DETAIL>();
List<T_SK_RISK_EVALUATION_DETAIL_MEASURE> measureList = new List<T_SK_RISK_EVALUATION_DETAIL_MEASURE>();
List<T_SK_RISK_EVALUATION_DETAIL_DEPART> departList = new List<T_SK_RISK_EVALUATION_DETAIL_DEPART>();
List<T_SK_RISK_EVALUATION_DETAIL_POST> postList = new List<T_SK_RISK_EVALUATION_DETAIL_POST>();
@ -108,41 +109,64 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item in details)
{
item.ORG_ID = entity.ORG_ID;
item.RISK_EVALUATION_ID = entity.ID;
T_SK_RISK_EVALUATION_DETAIL de = new T_SK_RISK_EVALUATION_DETAIL();
de.ORG_ID = entity.ORG_ID;
de.RISK_EVALUATION_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{
foreach (var item2 in item.Nav_DetailMeasures)
foreach (var mm in item.Nav_DetailMeasures)
{
T_SK_RISK_EVALUATION_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_DETAIL_MEASURE();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = item.ID;
item2.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURES_NAME = mm.MEASURES_NAME;
measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
de.MEASURE = de.MEASURE + temp;
}
}
detailList.Add(de);
item.Nav_DetailMeasures = null;
if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
{
foreach (var item2 in item.Nav_DetailDeparts)
foreach (var mm in item.Nav_DetailDeparts)
{
T_SK_RISK_EVALUATION_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_DETAIL_DEPART();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = item.ID;
item2.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
departList.Add(item2);
}
}
item.Nav_DetailDeparts = null;
if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
{
foreach (var item2 in item.Nav_DetailPosts)
foreach (var mm in item.Nav_DetailPosts)
{
T_SK_RISK_EVALUATION_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_DETAIL_POST();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = item.ID;
item2.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2);
if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any())
{
foreach (var item3 in item2.Nav_PostDetails)
foreach (var nn in item2.Nav_PostDetails)
{
T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL();
item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_DETAIL_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID;
postDetList.Add(item3);
}
}
@ -232,8 +256,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL>(deleteDetailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
@ -263,8 +287,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL>(deleteDetailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())

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

@ -53,49 +53,82 @@ namespace APT.SK.WebApi.Controllers.Api
entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
List<Guid> detailIds = new List<Guid>();
List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDepartIds = new List<Guid>();
List<Guid> deletePostIds = new List<Guid>();
List<Guid> deletePostDetailIds = new List<Guid>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL> detailList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART> departList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST> postList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> postDetList = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>();
if (details != null && details.Any())
{
detailIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(t => t.RISK_EVALUATION_SUMMARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostDetailIds = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(t => deletePostIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details)
{
item.ORG_ID = entity.ORG_ID;
item.RISK_EVALUATION_SUMMARY_ID = entity.ID;
T_SK_RISK_EVALUATION_SUMMARY_DETAIL de = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
de.ORG_ID = entity.ORG_ID;
de.RISK_EVALUATION_SUMMARY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{
foreach (var item2 in item.Nav_DetailMeasures)
foreach (var mm in item.Nav_DetailMeasures)
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURES_NAME = mm.MEASURES_NAME;
measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
de.MEASURE = de.MEASURE + temp;
}
}
detailList.Add(de);
item.Nav_DetailMeasures = null;
if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
{
foreach (var item2 in item.Nav_DetailDeparts)
foreach (var mm in item.Nav_DetailDeparts)
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
departList.Add(item2);
}
}
item.Nav_DetailDeparts = null;
if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
{
foreach (var item2 in item.Nav_DetailPosts)
foreach (var mm in item.Nav_DetailPosts)
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2);
if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any())
{
foreach (var item3 in item2.Nav_PostDetails)
foreach (var nn in item2.Nav_PostDetails)
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL();
item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID;
postDetList.Add(item3);
}
}
@ -135,10 +168,20 @@ namespace APT.SK.WebApi.Controllers.Api
var serialCode = codes.Split(new char[] { ',' });
MFlowPermitService.InsertApprove(serialCode[0], "SK041", "", entity.ID, "SK041_SHOWPRINT", entity.TaskID, true, () =>
{
if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(deletePostIds);
if (detailIds != null && detailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(detailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
@ -156,10 +199,20 @@ namespace APT.SK.WebApi.Controllers.Api
}
this.UnifiedCommit(() =>
{
if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(deletePostIds);
if (detailIds != null && detailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(detailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())

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

@ -165,8 +165,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL>(deleteDetailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())

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

@ -60,10 +60,13 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDepartIds = new List<Guid>();
List<Guid> deletePostIds = new List<Guid>();
List<Guid> deletePostDetailIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_RISK_IDENTIFY_RESULT_DETAIL> detailList = new List<T_SK_RISK_IDENTIFY_RESULT_DETAIL>();
List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>();
List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART> departList = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>();
List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST> postList = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>();
List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL> postDetailList = new List<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>();
//更新标识字段
var record = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(t => t.ID == entity.ID, "Nav_Details");
if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any())
@ -72,6 +75,7 @@ namespace APT.SK.WebApi.Controllers.Api
deleteMeasureIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostDetailIds = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(t => deletePostIds.Contains(t.RISK_IDENTIFY_DETAIL_RESULT_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
//record.Nav_Details.ForEach(t =>
//{
// if (t.Nav_DetailMeasures != null && t.Nav_DetailMeasures.Any())
@ -105,38 +109,72 @@ namespace APT.SK.WebApi.Controllers.Api
{
foreach (var item in details)
{
item.ORG_ID = entity.ORG_ID;
item.RISK_IDENTIFY_RESULT_ID = entity.ID;
T_SK_RISK_IDENTIFY_RESULT_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
de.ORG_ID = entity.ORG_ID;
de.RISK_IDENTIFY_RESULT_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{
foreach (var item2 in item.Nav_DetailMeasures)
foreach (var mm in item.Nav_DetailMeasures)
{
T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = item.ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURE = mm.MEASURE;
measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine;
de.MEASURE = de.MEASURE + temp;
}
}
detailList.Add(de);
item.Nav_DetailMeasures = null;
if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
{
foreach (var item2 in item.Nav_DetailDeparts)
foreach (var mm in item.Nav_DetailDeparts)
{
T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = item.ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
departList.Add(item2);
}
}
item.Nav_DetailDeparts = null;
if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
{
foreach (var item2 in item.Nav_DetailPosts)
foreach (var mm in item.Nav_DetailPosts)
{
T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST();
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = item.ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2);
if (mm.Nav_ResultPostDets != null && mm.Nav_ResultPostDets.Any())
{
foreach (var nn in mm.Nav_ResultPostDets)
{
T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL();
item3.ORG_ID = entity.ORG_ID;
item3.RISK_IDENTIFY_DETAIL_RESULT_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID;
postDetailList.Add(item3);
}
}
}
}
item.Nav_DetailPosts = null;
detailList.Add(de);
}
}
if (files != null && files.Any())
@ -180,14 +218,16 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(deletePostIds);
if (deleteDetailIds != null && deleteDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(deleteDetailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
@ -198,6 +238,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList);
}, null, null, null, null, null, "SK035_SHOWPRINT", null, "安全风险辨识结果表审批");
return true;
}
@ -207,14 +249,16 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST>(deletePostIds);
if (deleteDetailIds != null && deleteDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_DETAIL>(deleteDetailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
@ -225,6 +269,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList);
});
return true;
});

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

@ -53,49 +53,87 @@ namespace APT.SK.WebApi.Controllers.Api
entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
List<Guid> detailIds = new List<Guid>();
List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDepartIds = new List<Guid>();
List<Guid> deletePostIds = new List<Guid>();
List<Guid> deletePostDetailIds = new List<Guid>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL> detailList = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART> departList = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST> postList = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>();
List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL> postDetailList = new List<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>();
if (details != null && details.Any())
{
var detailIds = details.Select(t => t.ID).ToList();
detailIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(t => t.IDENTIFY_RESULT_SUMMARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteMeasureIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostDetailIds = this.GetEntities<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(t => deletePostIds.Contains(t.IDENTIFY_RESULT_SUMMARY_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
foreach (var item in details)
{
item.ORG_ID = entity.ORG_ID;
item.IDENTIFY_RESULT_SUMMARY_ID = entity.ID;
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
de.ORG_ID = entity.ORG_ID;
de.IDENTIFY_RESULT_SUMMARY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{
foreach (var item2 in item.Nav_DetailMeasures)
foreach (var mm in item.Nav_DetailMeasures)
{
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE();
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = item.ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURE = mm.MEASURE;
measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine;
de.MEASURE = de.MEASURE + temp;
}
}
detailList.Add(de);
item.Nav_DetailMeasures = null;
if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any())
{
foreach (var item2 in item.Nav_DetailDeparts)
foreach (var mm in item.Nav_DetailDeparts)
{
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART();
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = item.ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
departList.Add(item2);
}
}
item.Nav_DetailDeparts = null;
if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any())
{
foreach (var item2 in item.Nav_DetailPosts)
foreach (var mm in item.Nav_DetailPosts)
{
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST();
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = item.ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2);
if (mm.Nav_SumPostDets != null && mm.Nav_SumPostDets.Any())
{
foreach (var nn in mm.Nav_SumPostDets)
{
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL();
item3.ORG_ID = entity.ORG_ID;
item3.IDENTIFY_RESULT_SUMMARY_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID;
postDetailList.Add(item3);
}
}
}
}
item.Nav_DetailPosts = null;
@ -136,12 +174,16 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>(deletePostIds);
if (detailIds != null && detailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(detailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
@ -152,6 +194,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList);
}, null, null, null, null, null, "SK037_SHOWPRINT", null, "安全风险辨识结果汇总表审批");
return true;
}
@ -161,12 +205,16 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST>(deletePostIds);
if (detailIds != null && detailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL>(detailIds);
if (entity != null)
UpdateEntityNoCommit(entity);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any())
BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any())
@ -177,6 +225,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList);
});
return true;
});