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-10-23 11:10:23 +08:00
parent ce170e3077
commit fbe1d2f644
18 changed files with 260768 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13052,7 +13052,9 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_RISK_EVALUATION_DETAIL> resultDetails = new List<T_SK_RISK_EVALUATION_DETAIL>(); List<T_SK_RISK_EVALUATION_DETAIL> resultDetails = new List<T_SK_RISK_EVALUATION_DETAIL>();
List<T_SK_RISK_EVALUATION_DETAIL_MEASURE> detailMeasures = new List<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(); List<T_SK_RISK_EVALUATION_DETAIL_MEASURE> detailMeasures = new List<T_SK_RISK_EVALUATION_DETAIL_MEASURE>();
List<T_SK_RISK_EVALUATION_DETAIL_DEPART> detailDeparts = new List<T_SK_RISK_EVALUATION_DETAIL_DEPART>(); List<T_SK_RISK_EVALUATION_DETAIL_DEPART> detailDeparts = new List<T_SK_RISK_EVALUATION_DETAIL_DEPART>();
List<T_SC_MT_MEETING_BEGIN> modelBegins = new List<T_SC_MT_MEETING_BEGIN>(); List<T_SK_RISK_EVALUATION_DETAIL_POST> detailPosts = new List<T_SK_RISK_EVALUATION_DETAIL_POST>();
List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> detailPostDetails = new List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>();
//List<T_SC_MT_MEETING_BEGIN> modelBegins = new List<T_SC_MT_MEETING_BEGIN>();
List<Guid> departIds = new List<Guid>(); List<Guid> departIds = new List<Guid>();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)); var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole", "Nav_Person"); var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole", "Nav_Person");
@ -13106,6 +13108,7 @@ namespace APT.BaseData.Services.DomainServices
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)); var libraryDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID));
var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)); var libraryDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID));
var libraryPosts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => libraryIds.Contains(t.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID), "Nav_PostDetails");
foreach (var bm in summarys) foreach (var bm in summarys)
{ {
var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID); var user = users.FirstOrDefault(t => t.ID == bm.APPLY_USER_ID);
@ -13178,8 +13181,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;
detailDeparts.Add(dep); detailDeparts.Add(dep);
var userFirst = users.FirstOrDefault(t => t.ID == item.USER_ID);
var departFirstTemp = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID); var departFirstTemp = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID);
var userFirst = users.FirstOrDefault(t => t.ID == departFirstTemp?.USER_ID);
var typeTemp = i + "、" + item.DEPARTMENT_TYPE.GetDescription() + "；"; var typeTemp = i + "、" + item.DEPARTMENT_TYPE.GetDescription() + "；";
detail.DEPARTMENT_TYPE = detail.DEPARTMENT_TYPE + typeTemp; detail.DEPARTMENT_TYPE = detail.DEPARTMENT_TYPE + typeTemp;
var departTempx = i + "、" + departFirstTemp?.NAME + "；"; ; var departTempx = i + "、" + departFirstTemp?.NAME + "；"; ;
@ -13189,6 +13192,29 @@ namespace APT.BaseData.Services.DomainServices
i++; i++;
} }
} }
var libraryPostTemps = libraryPosts.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList();
if (libraryPostTemps.Any())
{
foreach (var item in libraryPostTemps)
{
T_SK_RISK_EVALUATION_DETAIL_POST dep = new T_SK_RISK_EVALUATION_DETAIL_POST();
dep.DEPARTMENT_ID = item.DEPARTMENT_ID;
dep.ORG_ID = item.ORG_ID;
dep.RISK_EVALUATION_DETAIL_ID = detail.ID;
detailPosts.Add(dep);
if (item.Nav_PostDetails!=null && item.Nav_PostDetails.Any())
{
foreach (var item2 in item.Nav_PostDetails)
{
T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL();
depDetail.POST_ID = item2.POST_ID;
depDetail.ORG_ID = item.ORG_ID;
depDetail.RISK_EVALUATION_DETAIL_POST_ID = dep.ID;
detailPostDetails.Add(depDetail);
}
}
}
}
} }
resultDetails.Add(detail); resultDetails.Add(detail);
} }
@ -13234,8 +13260,12 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(detailDeparts); BantchSaveEntityNoCommit(detailDeparts);
if (detailMeasures != null && detailMeasures.Any()) if (detailMeasures != null && detailMeasures.Any())
BantchSaveEntityNoCommit(detailMeasures); BantchSaveEntityNoCommit(detailMeasures);
if (modelBegins != null && modelBegins.Count > 0) if (detailPosts != null && detailPosts.Any())
BantchSaveEntityNoCommit(modelBegins); BantchSaveEntityNoCommit(detailPosts);
if (detailPostDetails != null && detailPostDetails.Any())
BantchSaveEntityNoCommit(detailPostDetails);
//if (modelBegins != null && modelBegins.Count > 0)
// BantchSaveEntityNoCommit(modelBegins);
}); });
} }
return true; return true;
@ -13280,11 +13310,15 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL> resultDetails = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>(); List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL> resultDetails = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE> detailMeasures = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(); List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE> detailMeasures = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART> detailDeparts = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(); List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART> detailDeparts = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST> detailPostSums = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>();
List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> detailPostDetailSums = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>();
//触发风险检查关联表 //触发风险检查关联表
T_SK_DOUBLE_PREVENT_MECHANISM dou = null; T_SK_DOUBLE_PREVENT_MECHANISM dou = null;
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> douDetails = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> douDetails = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART> detailDeps = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
@ -13293,6 +13327,7 @@ namespace APT.BaseData.Services.DomainServices
List<Guid> departIds = new List<Guid>(); List<Guid> departIds = new List<Guid>();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID)); var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID));
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole"); var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");
var userPosts = this.GetEntities<T_FM_USER_POST>(t => t.IS_DELETED == false, new BaseFilter(entity.ORG_ID));
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == entity.APPLY_DEPARTMENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员")); var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == entity.APPLY_DEPARTMENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user != null) if (user != null)
{ {
@ -13426,7 +13461,7 @@ namespace APT.BaseData.Services.DomainServices
result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID; result.REQUIRE_ID = entity.REQUIRE_ID != null ? entity.REQUIRE_ID : requre?.ID;
result.ISCOMPANY = entity.ISCOMPANY; result.ISCOMPANY = entity.ISCOMPANY;
var resultIds = results.Select(t => t.ID).ToList(); var resultIds = results.Select(t => t.ID).ToList();
var details = GetEntities<T_SK_RISK_EVALUATION_DETAIL>(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts"); var details = GetEntities<T_SK_RISK_EVALUATION_DETAIL>(i => resultIds.Contains(i.RISK_EVALUATION_ID), new BaseFilter(entity.ORG_ID), "Nav_DetailMeasures", "Nav_DetailDeparts", "Nav_DetailPosts.Nav_PostDetails");
var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID }).Select(g => g.FirstOrDefault()); var detailList = details.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID }).Select(g => g.FirstOrDefault());
if (detailList.Any()) if (detailList.Any())
{ {
@ -13496,6 +13531,38 @@ namespace APT.BaseData.Services.DomainServices
i++; i++;
} }
} }
if (de.Nav_DetailPosts != null && de.Nav_DetailPosts.Any())
{
var i = 1;
foreach (var item in de.Nav_DetailPosts)
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST dep = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST();
dep.DEPARTMENT_ID = item.DEPARTMENT_ID;
dep.ORG_ID = item.ORG_ID;
dep.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID;
detailPostSums.Add(dep);
var departFirstTemp = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID);
var departTempx = i + "、" + departFirstTemp?.NAME + "；";
detail.EVALUATION_DEPARTMENT = detail.IDENTIFY_DEPARTMENT + departTempx;
if (item.Nav_PostDetails != null && item.Nav_PostDetails.Any())
{
var postIds = new List<Guid>();
foreach (var item2 in item.Nav_PostDetails)
{
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL();
depDetail.POST_ID = item2.POST_ID;
depDetail.ORG_ID = item.ORG_ID;
depDetail.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = dep.ID;
detailPostDetailSums.Add(depDetail);
postIds.Add((Guid)item2.POST_ID);
}
var postFirstTemp = userPosts.Where(t => postIds.Contains(t.ID)).Select(m=>m.NAME).Distinct().ToList();
var postTempx = i + "、" + string.Join(",",postFirstTemp) + "；";
detail.EVALUATION_POST = detail.EVALUATION_POST + departTempx;
}
i++;
}
}
} }
} }
var param = "部门级"; var param = "部门级";
@ -13525,7 +13592,7 @@ namespace APT.BaseData.Services.DomainServices
var productionId = resultDetails.FirstOrDefault(t=>t.PRODUCTION_UNIT_ID!=null).PRODUCTION_UNIT_ID; var productionId = resultDetails.FirstOrDefault(t=>t.PRODUCTION_UNIT_ID!=null).PRODUCTION_UNIT_ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); //var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
var detailIds = libraryDetails.Select(i => i.ID).ToList(); var detailIds = libraryDetails.Select(i => i.ID).ToList();
var libraryContents = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(i => i.IS_DELETED == false && detailIds.Contains(i.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryContents = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(i => i.IS_DELETED == false && detailIds.Contains(i.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList();
@ -13562,10 +13629,7 @@ namespace APT.BaseData.Services.DomainServices
detail.EMERGENCY = item.EMERGENCY; detail.EMERGENCY = item.EMERGENCY;
detail.MARK = item.MARK; detail.MARK = item.MARK;
douDetails.Add(detail); douDetails.Add(detail);
var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID); var ldeparts = detailDeparts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
if (libraryFirst != null)
{
var ldeparts = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
if (ldeparts.Any()) if (ldeparts.Any())
{ {
foreach (var item2 in ldeparts) foreach (var item2 in ldeparts)
@ -13579,6 +13643,47 @@ namespace APT.BaseData.Services.DomainServices
detailPosts.Add(post); detailPosts.Add(post);
} }
} }
var lposts = detailPostSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
if (lposts.Any())
{
foreach (var item2 in lposts)
{
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART dep = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART();
dep.DEPARTMENT_ID = item2.DEPARTMENT_ID;
dep.ORG_ID = item.ORG_ID;
dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
detailDeps.Add(dep);
var lpostDetails = detailPostDetailSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).ToList();
if (lpostDetails != null && lpostDetails.Any())
{
foreach (var item3 in lpostDetails)
{
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL depDetail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL();
depDetail.POST_ID = item3.POST_ID;
depDetail.ORG_ID = item.ORG_ID;
depDetail.MECHANISM_DETAIL_DEPART_ID = dep.ID;
detailDepDets.Add(depDetail);
}
}
}
}
var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
if (libraryFirst != null)
{
//var ldeparts = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
//if (ldeparts.Any())
//{
// foreach (var item2 in ldeparts)
// {
// T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST post = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST();
// post.ORG_ID = item2.ORG_ID;
// post.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
// post.DEPARTMENT_TYPE = item2.DEPARTMENT_TYPE;
// post.DEPARTMENT_ID = item2.DEPARTMENT_ID;
// post.USER_ID = item2.USER_ID;
// detailPosts.Add(post);
// }
//}
var measures = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList(); var measures = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
if (measures.Any()) if (measures.Any())
{ {
@ -13679,6 +13784,10 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(detailDeparts); BantchSaveEntityNoCommit(detailDeparts);
if (detailMeasures != null && detailMeasures.Any()) if (detailMeasures != null && detailMeasures.Any())
BantchSaveEntityNoCommit(detailMeasures); BantchSaveEntityNoCommit(detailMeasures);
if (detailPostSums != null && detailPostSums.Any())
BantchSaveEntityNoCommit(detailPostSums);
if (detailPostDetailSums != null && detailPostDetailSums.Any())
BantchSaveEntityNoCommit(detailPostDetailSums);
if (notice != null) if (notice != null)
this.UpdateEntityNoCommit(notice); this.UpdateEntityNoCommit(notice);
if (dou != null) if (dou != null)
@ -13689,6 +13798,10 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(detailMes); BantchSaveEntityNoCommit(detailMes);
if (detailPosts != null && detailPosts.Count > 0) if (detailPosts != null && detailPosts.Count > 0)
BantchSaveEntityNoCommit(detailPosts); BantchSaveEntityNoCommit(detailPosts);
if (detailDeps != null && detailDeps.Count > 0)
BantchSaveEntityNoCommit(detailDeps);
if (detailDepDets != null && detailDepDets.Count > 0)
BantchSaveEntityNoCommit(detailDepDets);
if (detailContents != null && detailContents.Count > 0) if (detailContents != null && detailContents.Count > 0)
BantchSaveEntityNoCommit(detailContents); BantchSaveEntityNoCommit(detailContents);
if (contentPosts != null && contentPosts.Count > 0) if (contentPosts != null && contentPosts.Count > 0)
@ -13784,17 +13897,24 @@ namespace APT.BaseData.Services.DomainServices
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> details = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL> details = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES> detailMes = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST> detailPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART> detailDeps = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL> detailDepDets = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT> detailContents = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST> contentPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_POST>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART> contentDepartPosts = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_DEPART>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> contentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>(); List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN> contentHiddenss = new List<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN>();
if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any()) if (entity.APPLY_USER_ID != null && entity.Nav_Details != null && entity.Nav_Details.Any())
{ {
var sumDetailIds = entity.Nav_Details.Select(t => t.ID).ToList();
var sumDetailPosts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID));
var sumPostIds = sumDetailPosts.Select(t => t.ID).ToList();
var sumDetailPostDets = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>(t => sumPostIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID));
var sumDetailDeparts = this.GetEntities<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(t => sumDetailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID));
var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ID == entity.APPLY_USER_ID);
var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID!=null)?.PRODUCTION_UNIT_ID; var productionId = entity.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID!=null)?.PRODUCTION_UNIT_ID;
var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID)); var librarys = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0 && t.PRODUCTION_UNIT_ID == productionId, new BaseFilter(entity.ORG_ID));
var libraryIds = librarys.Select(t => t.ID).ToList(); var libraryIds = librarys.Select(t => t.ID).ToList();
var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); //var libraryDeparts = GetEntities<T_SK_ENTERPRISE_LIBRARY_DEPART>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(i => i.IS_DELETED == false && libraryIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(entity.ORG_ID)).ToList();
var detailIds = libraryDetails.Select(i => i.ID).ToList(); var detailIds = libraryDetails.Select(i => i.ID).ToList();
var libraryContents = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(i => i.IS_DELETED == false && detailIds.Contains(i.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList(); var libraryContents = GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT>(i => i.IS_DELETED == false && detailIds.Contains(i.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList();
@ -13831,13 +13951,10 @@ namespace APT.BaseData.Services.DomainServices
detail.EMERGENCY = item.EMERGENCY; detail.EMERGENCY = item.EMERGENCY;
detail.MARK = item.MARK; detail.MARK = item.MARK;
details.Add(detail); details.Add(detail);
var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID); var ldeparts = sumDetailDeparts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
if (libraryFirst != null) if (ldeparts.Any())
{ {
var departs = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList(); foreach (var item2 in ldeparts)
if (departs.Any())
{
foreach (var item2 in departs)
{ {
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST post = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST(); T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST post = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST();
post.ORG_ID = item2.ORG_ID; post.ORG_ID = item2.ORG_ID;
@ -13848,6 +13965,47 @@ namespace APT.BaseData.Services.DomainServices
detailPosts.Add(post); detailPosts.Add(post);
} }
} }
var lposts = sumDetailPosts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == item.ID).ToList();
if (lposts.Any())
{
foreach (var item2 in lposts)
{
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART dep = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART();
dep.DEPARTMENT_ID = item2.DEPARTMENT_ID;
dep.ORG_ID = item.ORG_ID;
dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
detailDeps.Add(dep);
var lpostDetails = sumDetailPostDets.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).ToList();
if (lpostDetails != null && lpostDetails.Any())
{
foreach (var item3 in lpostDetails)
{
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL depDetail = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART_DETAIL();
depDetail.POST_ID = item3.POST_ID;
depDetail.ORG_ID = item.ORG_ID;
depDetail.MECHANISM_DETAIL_DEPART_ID = dep.ID;
detailDepDets.Add(depDetail);
}
}
}
}
var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
if (libraryFirst != null)
{
//var departs = libraryDeparts.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
//if (departs.Any())
//{
// foreach (var item2 in departs)
// {
// T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST post = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST();
// post.ORG_ID = item2.ORG_ID;
// post.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
// post.DEPARTMENT_TYPE = item2.DEPARTMENT_TYPE;
// post.DEPARTMENT_ID = item2.DEPARTMENT_ID;
// post.USER_ID = item2.USER_ID;
// detailPosts.Add(post);
// }
//}
var measures = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList(); var measures = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst.ID).ToList();
if (measures.Any()) if (measures.Any())
{ {
@ -13949,6 +14107,10 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(detailMes); BantchSaveEntityNoCommit(detailMes);
if (detailPosts != null && detailPosts.Count > 0) if (detailPosts != null && detailPosts.Count > 0)
BantchSaveEntityNoCommit(detailPosts); BantchSaveEntityNoCommit(detailPosts);
if (detailDeps != null && detailDeps.Count > 0)
BantchSaveEntityNoCommit(detailDeps);
if (detailDepDets != null && detailDepDets.Count > 0)
BantchSaveEntityNoCommit(detailDepDets);
if (detailContents != null && detailContents.Count > 0) if (detailContents != null && detailContents.Count > 0)
BantchSaveEntityNoCommit(detailContents); BantchSaveEntityNoCommit(detailContents);
if (contentPosts != null && contentPosts.Count > 0) if (contentPosts != null && contentPosts.Count > 0)

129845
APT.Data.Migrations/Migrations/20251023024405_hmr2025102301.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

222
APT.Data.Migrations/Migrations/20251023024405_hmr2025102301.cs Normal file
View File

@ -0,0 +1,222 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102301 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST");
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
migrationBuilder.RenameColumn(
name: "POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "DEPARTMENT_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DEPARTMENT_ID");
migrationBuilder.RenameColumn(
name: "POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "DEPARTMENT_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DEPARTMENT_ID");
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_DETAIL_POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_T_FM_USER_POST_POST_ID",
column: x => x.POST_ID,
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_T_SK_RISK_EVALUATION_DETAIL_POST_RISK_EVALUATION_DETAIL_POST_ID",
column: x => x.RISK_EVALUATION_DETAIL_POST_ID,
principalTable: "T_SK_RISK_EVALUATION_DETAIL_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
columns: table => new
{
ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
POST_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL", x => x.ID);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_FM_ORGANIZATION_ORG_ID",
column: x => x.ORG_ID,
principalTable: "T_FM_ORGANIZATION",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_FM_USER_POST_POST_ID",
column: x => x.POST_ID,
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_RISK_EVALUATION_SUMMARY_DETAIL_POST~",
column: x => x.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID,
principalTable: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
});
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_ORG_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
column: "POST_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL_RISK_EVALUATION_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL",
column: "RISK_EVALUATION_DETAIL_POST_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_ORG_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
column: "ORG_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
column: "POST_ID");
migrationBuilder.CreateIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL_RISK_EVALUATION_SUMMARY_DETAIL_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL",
column: "RISK_EVALUATION_SUMMARY_DETAIL_POST_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
column: "DEPARTMENT_ID",
principalTable: "T_FM_DEPARTMENT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
column: "DEPARTMENT_ID",
principalTable: "T_FM_DEPARTMENT",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST");
migrationBuilder.DropForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_DEPARTMENT_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL");
migrationBuilder.DropTable(
name: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL");
migrationBuilder.RenameColumn(
name: "DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "POST_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_POST_ID");
migrationBuilder.RenameColumn(
name: "DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "POST_ID");
migrationBuilder.RenameIndex(
name: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_DEPARTMENT_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
newName: "IX_T_SK_RISK_EVALUATION_DETAIL_POST_POST_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_DETAIL_POST",
column: "POST_ID",
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
migrationBuilder.AddForeignKey(
name: "FK_T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_T_FM_USER_POST_POST_ID",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST",
column: "POST_ID",
principalTable: "T_FM_USER_POST",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
}
}

129853
APT.Data.Migrations/Migrations/20251023030919_hmr2025102302.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

35
APT.Data.Migrations/Migrations/20251023030919_hmr2025102302.cs Normal file
View File

@ -0,0 +1,35 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025102302 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "EVALUATION_DEPARTMENT",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "EVALUATION_POST",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
type: "nvarchar(500)",
maxLength: 500,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "EVALUATION_DEPARTMENT",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "EVALUATION_POST",
table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
}
}
}

212
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -79284,6 +79284,63 @@ namespace APT.Data.Migrations.Migrations
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("DEPARTMENT_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_EVALUATION_DETAIL_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("DEPARTMENT_ID");
b.HasIndex("ORG_ID");
b.HasIndex("RISK_EVALUATION_DETAIL_ID");
b.ToTable("T_SK_RISK_EVALUATION_DETAIL_POST");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL", b =>
{ {
b.Property<Guid>("ID") b.Property<Guid>("ID")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -79326,7 +79383,7 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("POST_ID") b.Property<Guid?>("POST_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_EVALUATION_DETAIL_ID") b.Property<Guid>("RISK_EVALUATION_DETAIL_POST_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.HasKey("ID"); b.HasKey("ID");
@ -79335,9 +79392,9 @@ namespace APT.Data.Migrations.Migrations
b.HasIndex("POST_ID"); b.HasIndex("POST_ID");
b.HasIndex("RISK_EVALUATION_DETAIL_ID"); b.HasIndex("RISK_EVALUATION_DETAIL_POST_ID");
b.ToTable("T_SK_RISK_EVALUATION_DETAIL_POST"); b.ToTable("T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL");
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_FILE", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_FILE", b =>
@ -79586,6 +79643,14 @@ namespace APT.Data.Migrations.Migrations
b.Property<decimal>("EVALUATE_SCORE") b.Property<decimal>("EVALUATE_SCORE")
.HasColumnType("decimal(18,2)"); .HasColumnType("decimal(18,2)");
b.Property<string>("EVALUATION_DEPARTMENT")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("EVALUATION_POST")
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<Guid?>("FLOW_ID") b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -79813,6 +79878,63 @@ namespace APT.Data.Migrations.Migrations
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b =>
{
b.Property<Guid>("ID")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("CREATER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("CREATE_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("DEPARTMENT_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
b.Property<int>("FLOW_SEND_STATUS")
.HasColumnType("int");
b.Property<int>("FLOW_STATUS")
.HasColumnType("int");
b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier");
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("MODIFY_TIME")
.HasColumnType("datetime2");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_EVALUATION_SUMMARY_DETAIL_ID")
.HasColumnType("uniqueidentifier");
b.HasKey("ID");
b.HasIndex("DEPARTMENT_ID");
b.HasIndex("ORG_ID");
b.HasIndex("RISK_EVALUATION_SUMMARY_DETAIL_ID");
b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL", b =>
{ {
b.Property<Guid>("ID") b.Property<Guid>("ID")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
@ -79855,7 +79977,7 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("POST_ID") b.Property<Guid?>("POST_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid>("RISK_EVALUATION_SUMMARY_DETAIL_ID") b.Property<Guid>("RISK_EVALUATION_SUMMARY_DETAIL_POST_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.HasKey("ID"); b.HasKey("ID");
@ -79864,9 +79986,9 @@ namespace APT.Data.Migrations.Migrations
b.HasIndex("POST_ID"); b.HasIndex("POST_ID");
b.HasIndex("RISK_EVALUATION_SUMMARY_DETAIL_ID"); b.HasIndex("RISK_EVALUATION_SUMMARY_DETAIL_POST_ID");
b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST"); b.ToTable("T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL");
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_FILE", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_FILE", b =>
@ -121129,6 +121251,32 @@ namespace APT.Data.Migrations.Migrations
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_Department")
.WithMany()
.HasForeignKey("DEPARTMENT_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL", "Nav_EvaluationDetail")
.WithMany("Nav_DetailPosts")
.HasForeignKey("RISK_EVALUATION_DETAIL_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Department");
b.Navigation("Nav_EvaluationDetail");
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL", b =>
{ {
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org") b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany() .WithMany()
@ -121141,13 +121289,13 @@ namespace APT.Data.Migrations.Migrations
.HasForeignKey("POST_ID") .HasForeignKey("POST_ID")
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL", "Nav_EvaluationDetail") b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", "Nav_DetailPost")
.WithMany("Nav_DetailPosts") .WithMany("Nav_PostDetails")
.HasForeignKey("RISK_EVALUATION_DETAIL_ID") .HasForeignKey("RISK_EVALUATION_DETAIL_POST_ID")
.OnDelete(DeleteBehavior.Restrict) .OnDelete(DeleteBehavior.Restrict)
.IsRequired(); .IsRequired();
b.Navigation("Nav_EvaluationDetail"); b.Navigation("Nav_DetailPost");
b.Navigation("Nav_Org"); b.Navigation("Nav_Org");
@ -121367,6 +121515,32 @@ namespace APT.Data.Migrations.Migrations
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b =>
{
b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_DEPARTMENT", "Nav_Department")
.WithMany()
.HasForeignKey("DEPARTMENT_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany()
.HasForeignKey("ORG_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL", "Nav_EvaluationDetail")
.WithMany("Nav_DetailPosts")
.HasForeignKey("RISK_EVALUATION_SUMMARY_DETAIL_ID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("Nav_Department");
b.Navigation("Nav_EvaluationDetail");
b.Navigation("Nav_Org");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL", b =>
{ {
b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org") b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
.WithMany() .WithMany()
@ -121379,13 +121553,13 @@ namespace APT.Data.Migrations.Migrations
.HasForeignKey("POST_ID") .HasForeignKey("POST_ID")
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL", "Nav_EvaluationDetail") b.HasOne("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", "Nav_DetailPost")
.WithMany("Nav_DetailPosts") .WithMany("Nav_PostDetails")
.HasForeignKey("RISK_EVALUATION_SUMMARY_DETAIL_ID") .HasForeignKey("RISK_EVALUATION_SUMMARY_DETAIL_POST_ID")
.OnDelete(DeleteBehavior.Restrict) .OnDelete(DeleteBehavior.Restrict)
.IsRequired(); .IsRequired();
b.Navigation("Nav_EvaluationDetail"); b.Navigation("Nav_DetailPost");
b.Navigation("Nav_Org"); b.Navigation("Nav_Org");
@ -129196,6 +129370,11 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_DetailPosts"); b.Navigation("Nav_DetailPosts");
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_DETAIL_POST", b =>
{
b.Navigation("Nav_PostDetails");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY", b =>
{ {
b.Navigation("Nav_Details"); b.Navigation("Nav_Details");
@ -129214,6 +129393,11 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_DetailPosts"); b.Navigation("Nav_DetailPosts");
}); });
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST", b =>
{
b.Navigation("Nav_PostDetails");
});
modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY", b => modelBuilder.Entity("APT.MS.Domain.Entities.SK.T_SK_RISK_IDENTIFY", b =>
{ {
b.Navigation("Nav_Details"); b.Navigation("Nav_Details");

24
APT.MS.Data/Mapping/T4/T4Map.cs
View File

@ -13635,6 +13635,17 @@ builder.Property(t => t.EMERGENCY).HasMaxLength(500);
{ {
base.Configure(builder); base.Configure(builder);
builder.HasOne(t => t.Nav_EvaluationDetail).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.RISK_EVALUATION_DETAIL_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_EvaluationDetail).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.RISK_EVALUATION_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Department).WithMany().HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskEvaluationDetailPostDetail
public partial class SKRiskEvaluationDetailPostDetailMap :APTEntityBaseMap<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>
{
public override void Configure(EntityTypeBuilder<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_DetailPost).WithMany(t=>t.Nav_PostDetails).HasForeignKey(t => t.RISK_EVALUATION_DETAIL_POST_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict);
} }
} }
@ -13700,6 +13711,8 @@ builder.HasOne(t => t.Nav_RiskName).WithMany().HasForeignKey(t => t.RISK_NAME_ID
builder.HasOne(t => t.Nav_SCOREL).WithMany().HasForeignKey(t => t.SCOREL_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_SCOREL).WithMany().HasForeignKey(t => t.SCOREL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_SCOREE).WithMany().HasForeignKey(t => t.SCOREE_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_SCOREE).WithMany().HasForeignKey(t => t.SCOREE_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_SCOREC).WithMany().HasForeignKey(t => t.SCOREC_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_SCOREC).WithMany().HasForeignKey(t => t.SCOREC_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.EVALUATION_DEPARTMENT).HasMaxLength(500);
builder.Property(t => t.EVALUATION_POST).HasMaxLength(500);
} }
} }
#endregion #endregion
@ -13734,6 +13747,17 @@ builder.Property(t => t.EMERGENCY).HasMaxLength(500);
{ {
base.Configure(builder); base.Configure(builder);
builder.HasOne(t => t.Nav_EvaluationDetail).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_EvaluationDetail).WithMany(t=>t.Nav_DetailPosts).HasForeignKey(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Department).WithMany().HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
#region RiskEvaluationSummaryDetailPostDetail
public partial class SKRiskEvaluationSummaryDetailPostDetailMap :APTEntityBaseMap<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>
{
public override void Configure(EntityTypeBuilder<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> builder)
{
base.Configure(builder);
builder.HasOne(t => t.Nav_DetailPost).WithMany(t=>t.Nav_PostDetails).HasForeignKey(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_Post).WithMany().HasForeignKey(t => t.POST_ID).OnDelete(DeleteBehavior.Restrict);
} }
} }

4
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs
View File

@ -101,10 +101,10 @@ namespace APT.MS.Domain.Entities.SK
[Description("管控措施")] [Description("管控措施")]
[FormFieldEdit] [FormFieldEdit]
public ICollection<T_SK_RISK_EVALUATION_DETAIL_MEASURE> Nav_DetailMeasures { get; set; } public ICollection<T_SK_RISK_EVALUATION_DETAIL_MEASURE> Nav_DetailMeasures { get; set; }
[Description("辨识部门")] [Description("管控部门层级")]
[FormFieldEdit] [FormFieldEdit]
public ICollection<T_SK_RISK_EVALUATION_DETAIL_DEPART> Nav_DetailDeparts { get; set; } public ICollection<T_SK_RISK_EVALUATION_DETAIL_DEPART> Nav_DetailDeparts { get; set; }
[Description("管控部门岗位")] [Description("辨识岗位")]
[FormFieldEdit] [FormFieldEdit]
public ICollection<T_SK_RISK_EVALUATION_DETAIL_POST> Nav_DetailPosts { get; set; } public ICollection<T_SK_RISK_EVALUATION_DETAIL_POST> Nav_DetailPosts { get; set; }

2
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL_DEPART.cs
View File

@ -9,7 +9,7 @@ using System.Text;
namespace APT.MS.Domain.Entities.SK namespace APT.MS.Domain.Entities.SK
{ {
[Description("辨识部门")] [Description("管控部门层级")]
public class T_SK_RISK_EVALUATION_DETAIL_DEPART : MesEntityBase public class T_SK_RISK_EVALUATION_DETAIL_DEPART : MesEntityBase
{ {
/// <summary> /// <summary>

16
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL_POST.cs
View File

@ -7,7 +7,7 @@ using System.Text;
namespace APT.MS.Domain.Entities.SK namespace APT.MS.Domain.Entities.SK
{ {
[Description("管控部门岗位")] [Description("辨识部门")]
public class T_SK_RISK_EVALUATION_DETAIL_POST : MesEntityBase public class T_SK_RISK_EVALUATION_DETAIL_POST : MesEntityBase
{ {
/// <summary> /// <summary>
@ -23,11 +23,15 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航：安全风险评估表")] [Description("导航：安全风险评估表")]
public virtual T_SK_RISK_EVALUATION_DETAIL Nav_EvaluationDetail { get; set; } public virtual T_SK_RISK_EVALUATION_DETAIL Nav_EvaluationDetail { get; set; }
[Description("管控岗位")] [Description("辨识部门")]
[DataFieldForeignKey("Nav_Post")] [DataFieldForeignKey("Nav_Department")]
public Guid? POST_ID { get; set; } public Guid? DEPARTMENT_ID { get; set; }
[Description("导航属性：管控岗位")] [Description("导航属性：辨识部门")]
public T_FM_USER_POST Nav_Post { get; set; } public T_FM_DEPARTMENT Nav_Department { get; set; }
[Description("辨识岗位表")]
[FormFieldEdit]
public ICollection<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> Nav_PostDetails { get; set; }
} }
} }

33
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("辨识岗位")]
public class T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL : MesEntityBase
{
/// <summary>
/// 安全风险评估辨识部门表
/// </summary>
[Description("安全风险评估辨识部门表")]
[DataFieldForeignKey("Nav_DetailPost", "Nav_PostDetails")]
public Guid RISK_EVALUATION_DETAIL_POST_ID { get; set; }
/// <summary>
/// 导航：安全风险评估辨识部门表
/// </summary>
[Description("导航：安全风险评估辨识部门表")]
public virtual T_SK_RISK_EVALUATION_DETAIL_POST Nav_DetailPost { get; set; }
[Description("辨识岗位")]
[DataFieldForeignKey("Nav_Post")]
public Guid? POST_ID { get; set; }
[Description("导航属性：辨识岗位")]
public T_FM_USER_POST Nav_Post { get; set; }
}
}

5
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs
View File

@ -157,5 +157,10 @@ namespace APT.MS.Domain.Entities.SK
/// </summary> /// </summary>
[Description("标识")] [Description("标识")]
public SKMarkEnum MARK { get; set; } public SKMarkEnum MARK { get; set; }
[Description("辨识部门")]
public string EVALUATION_DEPARTMENT { get; set; }
[Description("辨识岗位")]
public string EVALUATION_POST { get; set; }
} }
} }

14
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST.cs
View File

@ -23,11 +23,15 @@ namespace APT.MS.Domain.Entities.SK
[Description("导航：安全风险评估表")] [Description("导航：安全风险评估表")]
public virtual T_SK_RISK_EVALUATION_SUMMARY_DETAIL Nav_EvaluationDetail { get; set; } public virtual T_SK_RISK_EVALUATION_SUMMARY_DETAIL Nav_EvaluationDetail { get; set; }
[Description("管控岗位")] [Description("辨识部门")]
[DataFieldForeignKey("Nav_Post")] [DataFieldForeignKey("Nav_Department")]
public Guid? POST_ID { get; set; } public Guid? DEPARTMENT_ID { get; set; }
[Description("导航属性：管控岗位")] [Description("导航属性：辨识部门")]
public T_FM_USER_POST Nav_Post { get; set; } public T_FM_DEPARTMENT Nav_Department { get; set; }
[Description("辨识岗位表")]
[FormFieldEdit]
public ICollection<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> Nav_PostDetails { get; set; }
} }
} }

33
APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL.cs Normal file
View File

@ -0,0 +1,33 @@
using APT.BaseData.Domain.Entities.FM;
using APT.Infrastructure.Core;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Text;
namespace APT.MS.Domain.Entities.SK
{
[Description("辨识部门")]
public class T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL : MesEntityBase
{
/// <summary>
/// 安全风险评估辨识部门表
/// </summary>
[Description("安全风险评估辨识部门表")]
[DataFieldForeignKey("Nav_DetailPost", "Nav_PostDetails")]
public Guid RISK_EVALUATION_SUMMARY_DETAIL_POST_ID { get; set; }
/// <summary>
/// 导航：安全风险评估辨识部门表
/// </summary>
[Description("导航：安全风险评估辨识部门表")]
public virtual T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST Nav_DetailPost { get; set; }
[Description("辨识岗位")]
[DataFieldForeignKey("Nav_Post")]
public Guid? POST_ID { get; set; }
[Description("导航属性：辨识岗位")]
public T_FM_USER_POST Nav_Post { get; set; }
}
}

5
APT.MS.Domain/Enums/SK/SKEnums.cs
View File

@ -79,6 +79,11 @@ namespace APT.MS.Domain.Enums.SK
/// </summary> /// </summary>
[Description("修改")] [Description("修改")]
Update = 20, Update = 20,
/// <summary>
/// 作废
/// </summary>
[Description("作废")]
Cancel = 25,
} }
/// <summary> /// <summary>
/// 是否入库 /// 是否入库

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

@ -60,10 +60,12 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> deleteMeasureIds = new List<Guid>(); List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDepartIds = new List<Guid>(); List<Guid> deleteDepartIds = new List<Guid>();
List<Guid> deletePostIds = new List<Guid>(); List<Guid> deletePostIds = new List<Guid>();
List<Guid> deletePostDetIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>(); List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_RISK_EVALUATION_DETAIL_MEASURE> measureList = new List<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(); 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_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>(); List<T_SK_RISK_EVALUATION_DETAIL_POST> postList = new List<T_SK_RISK_EVALUATION_DETAIL_POST>();
List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> postDetList = new List<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>();
//更新标识字段 //更新标识字段
var record = this.GetEntity<T_SK_RISK_EVALUATION>(t => t.ID == entity.ID, "Nav_Details"); var record = this.GetEntity<T_SK_RISK_EVALUATION>(t => t.ID == entity.ID, "Nav_Details");
if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any()) if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any())
@ -72,6 +74,7 @@ namespace APT.SK.WebApi.Controllers.Api
deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_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 && t.MEASURE == item.MEASURE 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.MEASURE == item.MEASURE
@ -134,6 +137,15 @@ namespace APT.SK.WebApi.Controllers.Api
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = item.ID; item2.RISK_EVALUATION_DETAIL_ID = item.ID;
postList.Add(item2); postList.Add(item2);
if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any())
{
foreach (var item3 in item2.Nav_PostDetails)
{
item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_DETAIL_POST_ID = item2.ID;
postDetList.Add(item3);
}
}
} }
} }
item.Nav_DetailPosts = null; item.Nav_DetailPosts = null;
@ -208,6 +220,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(deleteMeasureIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any()) if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_DEPART>(deleteDepartIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetIds != null && deletePostDetIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>(deletePostDetIds);
if (deletePostIds != null && deletePostIds.Any()) if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST>(deletePostIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST>(deletePostIds);
if (deleteDetailIds != null && deleteDetailIds.Any()) if (deleteDetailIds != null && deleteDetailIds.Any())
@ -224,6 +238,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(measureList); BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any()) if (departList != null && departList.Any())
BantchSaveEntityNoCommit(departList); BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList);
}, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估表审批"); }, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估表审批");
return true; return true;
} }
@ -233,6 +251,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(deleteMeasureIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any()) if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_DEPART>(deleteDepartIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetIds != null && deletePostDetIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>(deletePostDetIds);
if (deletePostIds != null && deletePostIds.Any()) if (deletePostIds != null && deletePostIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST>(deletePostIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_DETAIL_POST>(deletePostIds);
if (deleteDetailIds != null && deleteDetailIds.Any()) if (deleteDetailIds != null && deleteDetailIds.Any())
@ -249,6 +269,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(measureList); BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any()) if (departList != null && departList.Any())
BantchSaveEntityNoCommit(departList); BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList);
}); });
return true; return true;
}); });
@ -277,7 +301,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_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)
{ {
var measureTemps = measures.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList(); var measureTemps = measures.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList();
@ -285,7 +309,7 @@ namespace APT.SK.WebApi.Controllers.Api
var departTemps = departs.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList(); var departTemps = departs.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList();
detail.Nav_DetailDeparts = departTemps.OrderBy(t => t.DEPARTMENT_TYPE).ThenBy(m => m.Nav_Department.NUM).ToList(); detail.Nav_DetailDeparts = departTemps.OrderBy(t => t.DEPARTMENT_TYPE).ThenBy(m => m.Nav_Department.NUM).ToList();
var postTemps = posts.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList(); var postTemps = posts.Where(t => t.RISK_EVALUATION_DETAIL_ID == detail.ID).ToList();
detail.Nav_DetailPosts = postTemps.OrderBy(t => t.POST_ID).ToList(); detail.Nav_DetailPosts = postTemps.OrderBy(t => t.DEPARTMENT_ID).ToList();
} }
} }
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m => m.AREA_ID).ThenBy(n => n.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m => m.AREA_ID).ThenBy(n => n.TYPE_ID).ToList();

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

@ -56,6 +56,7 @@ namespace APT.SK.WebApi.Controllers.Api
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_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_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> 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()) if (details != null && details.Any())
{ {
foreach (var item in details) foreach (var item in details)
@ -89,6 +90,15 @@ namespace APT.SK.WebApi.Controllers.Api
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID; item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID;
postList.Add(item2); postList.Add(item2);
if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any())
{
foreach (var item3 in item2.Nav_PostDetails)
{
item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = item2.ID;
postDetList.Add(item3);
}
}
} }
} }
item.Nav_DetailPosts = null; item.Nav_DetailPosts = null;
@ -137,6 +147,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(measureList); BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any()) if (departList != null && departList.Any())
BantchSaveEntityNoCommit(departList); BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList);
}, null, null, null, null, null, "SK041_SHOWPRINT", null, "安全风险评估汇总表审批"); }, null, null, null, null, null, "SK041_SHOWPRINT", null, "安全风险评估汇总表审批");
return true; return true;
} }
@ -154,6 +168,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(measureList); BantchSaveEntityNoCommit(measureList);
if (departList != null && departList.Any()) if (departList != null && departList.Any())
BantchSaveEntityNoCommit(departList); BantchSaveEntityNoCommit(departList);
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList);
}); });
return true; return true;
}); });
@ -184,7 +202,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_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)
{ {
var temps = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(); var temps = new List<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>();
@ -197,7 +215,7 @@ namespace APT.SK.WebApi.Controllers.Api
temps.AddRange(tempy); temps.AddRange(tempy);
detail.Nav_DetailDeparts = temps.ToList(); detail.Nav_DetailDeparts = temps.ToList();
var postTemps = posts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList(); var postTemps = posts.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_ID == detail.ID).ToList();
detail.Nav_DetailPosts = postTemps.OrderBy(t => t.POST_ID).ToList(); detail.Nav_DetailPosts = postTemps.OrderBy(t => t.DEPARTMENT_ID).ToList();
} }
} }
result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m => m.AREA_ID).ThenBy(n => n.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.MineType).ThenBy(m => m.AREA_ID).ThenBy(n => n.TYPE_ID).ToList();

230
APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -10468,9 +10468,9 @@ namespace APT.SK.WebApi.Controllers.Api
} }
#endregion #endregion
#region RiskEvaluationDetailDepart-辨识部门 #region RiskEvaluationDetailDepart-管控部门层级
/// <summary> /// <summary>
/// 辨识部门 /// 管控部门层级
/// </summary> /// </summary>
[Route("api/SK/RiskEvaluationDetailDepart")] [Route("api/SK/RiskEvaluationDetailDepart")]
public partial class RiskEvaluationDetailDepartController : AuthorizeApiController<T_SK_RISK_EVALUATION_DETAIL_DEPART> public partial class RiskEvaluationDetailDepartController : AuthorizeApiController<T_SK_RISK_EVALUATION_DETAIL_DEPART>
@ -10690,9 +10690,9 @@ namespace APT.SK.WebApi.Controllers.Api
} }
#endregion #endregion
#region RiskEvaluationDetailPost-管控部门岗位 #region RiskEvaluationDetailPost-辨识部门
/// <summary> /// <summary>
/// 管控部门岗位 /// 辨识部门
/// </summary> /// </summary>
[Route("api/SK/RiskEvaluationDetailPost")] [Route("api/SK/RiskEvaluationDetailPost")]
public partial class RiskEvaluationDetailPostController : AuthorizeApiController<T_SK_RISK_EVALUATION_DETAIL_POST> public partial class RiskEvaluationDetailPostController : AuthorizeApiController<T_SK_RISK_EVALUATION_DETAIL_POST>
@ -10798,6 +10798,117 @@ namespace APT.SK.WebApi.Controllers.Api
} }
}
#endregion
#region RiskEvaluationDetailPostDetail-辨识岗位
/// <summary>
/// 辨识岗位
/// </summary>
[Route("api/SK/RiskEvaluationDetailPostDetail")]
public partial class RiskEvaluationDetailPostDetailController : AuthorizeApiController<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
} }
#endregion #endregion
@ -11575,6 +11686,117 @@ namespace APT.SK.WebApi.Controllers.Api
} }
}
#endregion
#region RiskEvaluationSummaryDetailPostDetail-辨识部门
/// <summary>
/// 辨识部门
/// </summary>
[Route("api/SK/RiskEvaluationSummaryDetailPostDetail")]
public partial class RiskEvaluationSummaryDetailPostDetailController : AuthorizeApiController<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
} }
#endregion #endregion