wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试问题修复

Browse Source
This commit is contained in:
何美荣 2026-09-02 17:30:42 +08:00
parent c604130a0d
commit d8963ba9be
9 changed files with 4762 additions and 4745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
using AlibabaCloud.OpenApiClient.Models; using AlibabaCloud.OpenApiClient.Models;
using APT.BaseData.Domain.ApiModel; using APT.BaseData.Domain.ApiModel;
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
@ -13098,9 +13098,9 @@ namespace APT.BaseData.Services.DomainServices
T_SK_RISK_IDENTIFY_DETAIL_MEASURE mes = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE(); T_SK_RISK_IDENTIFY_DETAIL_MEASURE mes = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE();
mes.ORG_ID = ideDetail.ORG_ID; mes.ORG_ID = ideDetail.ORG_ID;
mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID; mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID;
mes.MEASURE = id2; mes.MEASURE = (id2 ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
mes.NUM = i; mes.NUM = i;
var temp = i + "、" + id2; var temp = i + "、" + id2 + "；";
ideDetail.MEASURE = ideDetail.MEASURE + temp; ideDetail.MEASURE = ideDetail.MEASURE + temp;
detailMeasures.Add(mes); detailMeasures.Add(mes);
i++; i++;
@ -13495,9 +13495,9 @@ namespace APT.BaseData.Services.DomainServices
mes.ORG_ID = filter.OrgId; mes.ORG_ID = filter.OrgId;
mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID; mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
mes.NUM = i; mes.NUM = i;
mes.MEASURE = mm; mes.MEASURE = (mm ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
resultDetailMes.Add(mes); resultDetailMes.Add(mes);
var mtemp = i + "、" + mm; var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp; ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++; i++;
} }
@ -13587,7 +13587,7 @@ namespace APT.BaseData.Services.DomainServices
if (resultDetailPosts != null && resultDetailPosts.Count > 0) if (resultDetailPosts != null && resultDetailPosts.Count > 0)
BantchSaveEntityNoCommit(resultDetailPosts); BantchSaveEntityNoCommit(resultDetailPosts);
if (resultDetailPostDets != null && resultDetailPostDets.Count > 0) if (resultDetailPostDets != null && resultDetailPostDets.Count > 0)
BantchSaveEntityNoCommit(resultDetailPostDets); BantchSaveEntityNoCommit(resultDetailPostDets.GroupBy(p => new { p.RISK_IDENTIFY_DETAIL_RESULT_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
//if (resultDetailDeps != null && resultDetailDeps.Count > 0) //if (resultDetailDeps != null && resultDetailDeps.Count > 0)
// BantchSaveEntityNoCommit(resultDetailDeps); // BantchSaveEntityNoCommit(resultDetailDeps);
}); });
@ -13915,9 +13915,9 @@ namespace APT.BaseData.Services.DomainServices
mes.ORG_ID = filter.OrgId; mes.ORG_ID = filter.OrgId;
mes.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = ideDetail.ID; mes.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = ideDetail.ID;
mes.NUM = i; mes.NUM = i;
mes.MEASURE = mm; mes.MEASURE = (mm ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
summaryMeasures.Add(mes); summaryMeasures.Add(mes);
var mtemp = i + "、" + mm; var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp; ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++; i++;
} }
@ -14279,7 +14279,7 @@ namespace APT.BaseData.Services.DomainServices
detailPosts.Add(pos); detailPosts.Add(pos);
if (item.Nav_ResultPostDets != null && item.Nav_ResultPostDets.Any()) if (item.Nav_ResultPostDets != null && item.Nav_ResultPostDets.Any())
{ {
foreach (var item2 in item.Nav_ResultPostDets) foreach (var item2 in item.Nav_ResultPostDets.Where(t => !t.IS_DELETED).GroupBy(t => t.POST_ID).Select(g => g.First()))
{ {
T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL(); T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL depDetail = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL();
depDetail.POST_ID = item2.POST_ID; depDetail.POST_ID = item2.POST_ID;
@ -14294,7 +14294,8 @@ namespace APT.BaseData.Services.DomainServices
resultDetails.Add(detail); resultDetails.Add(detail);
} }
} }
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0'), result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039"); var param = departs.FirstOrDefault(t => t.ID == bm.APPLY_DEPARTMENT_ID)?.NAME;
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险评估表" + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0') +"("+param+")", result.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK039");
notices.Add(noticeTask); notices.Add(noticeTask);
//T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN(); //T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN();
//modelBegin.ID = Guid.NewGuid(); //modelBegin.ID = Guid.NewGuid();
@ -14719,7 +14720,7 @@ namespace APT.BaseData.Services.DomainServices
pos.DEPARTMENT_ID = ite.ID; pos.DEPARTMENT_ID = ite.ID;
pos.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID; pos.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID;
detailPostSums.Add(pos); detailPostSums.Add(pos);
var postIds = detailPosts.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID).SelectMany(m => m.Nav_PostDetails).Select(n=>n.POST_ID).ToList(); var postIds = detailPosts.Where(t => t.DEPARTMENT_ID != null && t.DEPARTMENT_ID == ite.ID).SelectMany(m => m.Nav_PostDetails).Select(n=>n.POST_ID).Distinct().ToList();
if (postIds.Any()) if (postIds.Any())
{ {
foreach (var poId in postIds) foreach (var poId in postIds)
@ -14912,7 +14913,7 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = item.ORG_ID; dep.ORG_ID = item.ORG_ID;
dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID; dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
douDetailPosts.Add(dep); douDetailPosts.Add(dep);
var lpostDetails = detailPostDetailSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).ToList(); var lpostDetails = detailPostDetailSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).GroupBy(t => t.POST_ID).Select(g => g.First()).ToList();
if (lpostDetails != null && lpostDetails.Any()) if (lpostDetails != null && lpostDetails.Any())
{ {
foreach (var item3 in lpostDetails) foreach (var item3 in lpostDetails)
@ -15053,7 +15054,7 @@ namespace APT.BaseData.Services.DomainServices
if (detailPostSums != null && detailPostSums.Any()) if (detailPostSums != null && detailPostSums.Any())
BantchSaveEntityNoCommit(detailPostSums); BantchSaveEntityNoCommit(detailPostSums);
if (detailPostDetailSums != null && detailPostDetailSums.Any()) if (detailPostDetailSums != null && detailPostDetailSums.Any())
BantchSaveEntityNoCommit(detailPostDetailSums); BantchSaveEntityNoCommit(detailPostDetailSums.GroupBy(p => new { p.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
if (notice != null) if (notice != null)
this.UpdateEntityNoCommit(notice); this.UpdateEntityNoCommit(notice);
if (dou != null) if (dou != null)
@ -15067,7 +15068,7 @@ namespace APT.BaseData.Services.DomainServices
if (douDetailPosts != null && douDetailPosts.Count > 0) if (douDetailPosts != null && douDetailPosts.Count > 0)
BantchSaveEntityNoCommit(douDetailPosts); BantchSaveEntityNoCommit(douDetailPosts);
if (douDetailPostDetails != null && douDetailPostDetails.Count > 0) if (douDetailPostDetails != null && douDetailPostDetails.Count > 0)
BantchSaveEntityNoCommit(douDetailPostDetails); BantchSaveEntityNoCommit(douDetailPostDetails.GroupBy(p => new { p.MECHANISM_DETAIL_DEPART_ID, p.POST_ID }).Select(g => g.First()).ToList());
if (douDetailContents != null && douDetailContents.Count > 0) if (douDetailContents != null && douDetailContents.Count > 0)
BantchSaveEntityNoCommit(douDetailContents); BantchSaveEntityNoCommit(douDetailContents);
if (douContentPosts != null && douContentPosts.Count > 0) if (douContentPosts != null && douContentPosts.Count > 0)
@ -15104,7 +15105,7 @@ namespace APT.BaseData.Services.DomainServices
if (detailPostSums != null && detailPostSums.Any()) if (detailPostSums != null && detailPostSums.Any())
BantchSaveEntityNoCommit(detailPostSums); BantchSaveEntityNoCommit(detailPostSums);
if (detailPostDetailSums != null && detailPostDetailSums.Any()) if (detailPostDetailSums != null && detailPostDetailSums.Any())
BantchSaveEntityNoCommit(detailPostDetailSums); BantchSaveEntityNoCommit(detailPostDetailSums.GroupBy(p => new { p.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
if (notice != null) if (notice != null)
this.UpdateEntityNoCommit(notice); this.UpdateEntityNoCommit(notice);
if (dou != null) if (dou != null)
@ -15118,7 +15119,7 @@ namespace APT.BaseData.Services.DomainServices
if (douDetailPosts != null && douDetailPosts.Count > 0) if (douDetailPosts != null && douDetailPosts.Count > 0)
BantchSaveEntityNoCommit(douDetailPosts); BantchSaveEntityNoCommit(douDetailPosts);
if (douDetailPostDetails != null && douDetailPostDetails.Count > 0) if (douDetailPostDetails != null && douDetailPostDetails.Count > 0)
BantchSaveEntityNoCommit(douDetailPostDetails); BantchSaveEntityNoCommit(douDetailPostDetails.GroupBy(p => new { p.MECHANISM_DETAIL_DEPART_ID, p.POST_ID }).Select(g => g.First()).ToList());
if (douDetailContents != null && douDetailContents.Count > 0) if (douDetailContents != null && douDetailContents.Count > 0)
BantchSaveEntityNoCommit(douDetailContents); BantchSaveEntityNoCommit(douDetailContents);
if (douContentPosts != null && douContentPosts.Count > 0) if (douContentPosts != null && douContentPosts.Count > 0)
@ -15262,7 +15263,7 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = item.ORG_ID; dep.ORG_ID = item.ORG_ID;
dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID; dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
douDetailPosts.Add(dep); douDetailPosts.Add(dep);
var lpostDetails = detailPostDetailSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).ToList(); var lpostDetails = detailPostDetailSums.Where(t => t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID == item2.ID).GroupBy(t => t.POST_ID).Select(g => g.First()).ToList();
if (lpostDetails != null && lpostDetails.Any()) if (lpostDetails != null && lpostDetails.Any())
{ {
foreach (var item3 in lpostDetails) foreach (var item3 in lpostDetails)
@ -15398,7 +15399,7 @@ namespace APT.BaseData.Services.DomainServices
if (douDetailPosts != null && douDetailPosts.Count > 0) if (douDetailPosts != null && douDetailPosts.Count > 0)
BantchSaveEntityNoCommit(douDetailPosts); BantchSaveEntityNoCommit(douDetailPosts);
if (douDetailPostDetails != null && douDetailPostDetails.Count > 0) if (douDetailPostDetails != null && douDetailPostDetails.Count > 0)
BantchSaveEntityNoCommit(douDetailPostDetails); BantchSaveEntityNoCommit(douDetailPostDetails.GroupBy(p => new { p.MECHANISM_DETAIL_DEPART_ID, p.POST_ID }).Select(g => g.First()).ToList());
if (douDetailContents != null && douDetailContents.Count > 0) if (douDetailContents != null && douDetailContents.Count > 0)
BantchSaveEntityNoCommit(douDetailContents); BantchSaveEntityNoCommit(douDetailContents);
if (douContentPosts != null && douContentPosts.Count > 0) if (douContentPosts != null && douContentPosts.Count > 0)

37
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -1447,19 +1447,25 @@ namespace APT.FO.WebApi.Controllers
curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME; curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE; curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
notices.Add(curentTask); notices.Add(curentTask);
T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL(); applyApprove.ForEach(t =>
detail.APPROVE_ID = approve.ID; {
detail.IS_CURRENT = false;
detail.ORG_ID = approveTemp.ORG_ID; t.IS_CURRENT = false;t.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done;
detail.NAME = applyApprove.FirstOrDefault()?.NAME; t.NODE_APPROVE_TIME = DateTime.Now;
detail.NUM = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().NUM:0; });
detail.APPROVE_ROLE_ID = applyApprove.FirstOrDefault()?.APPROVE_ROLE_ID; //T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL();
detail.IS_ALLOW_UPDATE = applyApprove.FirstOrDefault() != null? applyApprove.FirstOrDefault().IS_ALLOW_UPDATE:false; //detail.APPROVE_ID = approve.ID;
detail.APPROVE_USER_ID = applyApprove.FirstOrDefault()?.APPROVE_USER_ID; //detail.IS_CURRENT = false;
detail.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done; //detail.ORG_ID = approveTemp.ORG_ID;
detail.NODE_APPROVE_TIME = DateTime.Now; //detail.NAME = applyApprove.FirstOrDefault()?.NAME;
appdetailAutos.Add(detail); //detail.NUM = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().NUM:0;
} //detail.APPROVE_ROLE_ID = applyApprove.FirstOrDefault()?.APPROVE_ROLE_ID;
//detail.IS_ALLOW_UPDATE = applyApprove.FirstOrDefault() != null? applyApprove.FirstOrDefault().IS_ALLOW_UPDATE:false;
//detail.APPROVE_USER_ID = applyApprove.FirstOrDefault()?.APPROVE_USER_ID;
//detail.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done;
//detail.NODE_APPROVE_TIME = DateTime.Now;
//appdetailAutos.Add(detail);
}
var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList(); var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
if (detailTemps != null && detailTemps.Any()) if (detailTemps != null && detailTemps.Any())
{ {
@ -1482,10 +1488,11 @@ namespace APT.FO.WebApi.Controllers
//var sendUserName = users.Where(i => i.ID == sendUserId).FirstOrDefault().NAME; //var sendUserName = users.Where(i => i.ID == sendUserId).FirstOrDefault().NAME;
//var sendUserIds = detailUsers.Where(t => t.APPROVE_DETAIL_ID == curentApprove.ID).Select(m => (Guid)m.USER_ID).ToList(); //var sendUserIds = detailUsers.Where(t => t.APPROVE_DETAIL_ID == curentApprove.ID).Select(m => (Guid)m.USER_ID).ToList();
if (sendUserIds != null && sendUserIds.Any()) var sendUserIdNews = users.Where(i => sendUserIds.Contains(i.ID)).Select(m => m.ID).ToList();
if (sendUserIdNews != null && sendUserIdNews.Any())
{ {
var sendUserNames = new List<string>(); var sendUserNames = new List<string>();
foreach (var u in sendUserIds) foreach (var u in sendUserIdNews)
{ {
var current = users.FirstOrDefault(t => t.ID == u); var current = users.FirstOrDefault(t => t.ID == u);
sendUserNames.Add(current?.NAME); sendUserNames.Add(current?.NAME);

1
APT.MicroApi/APT.PP.WebApi/APT.PP.WebApi.csproj
View File

@ -117,6 +117,7 @@
<ProjectReference Include="..\..\APT.BaseData.Domain\APT.BaseData.Domain.csproj" /> <ProjectReference Include="..\..\APT.BaseData.Domain\APT.BaseData.Domain.csproj" />
<ProjectReference Include="..\..\APT.BaseData.Services\APT.BaseData.Services.csproj" /> <ProjectReference Include="..\..\APT.BaseData.Services\APT.BaseData.Services.csproj" />
<ProjectReference Include="..\..\APT.Data.Migrations\APT.Data.Migrations.csproj" /> <ProjectReference Include="..\..\APT.Data.Migrations\APT.Data.Migrations.csproj" />
<ProjectReference Include="..\..\APT.MS.Domain\APT.MS.Domain.csproj" />
<ProjectReference Include="..\..\APT.MS.Services\APT.MS.Services.csproj" /> <ProjectReference Include="..\..\APT.MS.Services\APT.MS.Services.csproj" />
<ProjectReference Include="..\..\APT.Utility\APT.Utility.csproj" /> <ProjectReference Include="..\..\APT.Utility\APT.Utility.csproj" />
</ItemGroup> </ItemGroup>

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

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,4 @@
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums; using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Enums.PF; using APT.BaseData.Domain.Enums.PF;
@ -48,7 +48,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null) if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId; entity.APPLY_DEPARTMENT_ID = departId;
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null) if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID; entity.IDENTIFY_EVALUATION_PLAN_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
var details = entity.Nav_Details; var details = entity.Nav_Details;
entity.Nav_Details = null; entity.Nav_Details = null;
var requires = entity.Nav_Requires; var requires = entity.Nav_Requires;
@ -131,6 +131,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var item in details.Where(t => !t.IS_DELETED)) foreach (var item in details.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_DETAIL de = new T_SK_RISK_EVALUATION_DETAIL(); T_SK_RISK_EVALUATION_DETAIL de = new T_SK_RISK_EVALUATION_DETAIL();
de.ID = item.ID == Guid.Empty ? Guid.NewGuid() : item.ID;
de.ORG_ID = entity.ORG_ID; de.ORG_ID = entity.ORG_ID;
de.RISK_EVALUATION_ID = entity.ID; de.RISK_EVALUATION_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
@ -160,12 +161,14 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_DETAIL_MEASURE(); T_SK_RISK_EVALUATION_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_DETAIL_MEASURE();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = de.ID; item2.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.NUM = mm.NUM; item2.NUM = mm.NUM;
item2.MEASURES_NAME = mm.MEASURES_NAME; item2.MEASURES_NAME = mm.MEASURES_NAME;
measureList.Add(item2); measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine; var num = (item2.NUM == null || item2.NUM == 0) ? 1 : item2.NUM.Value;
var temp = num + "、" + item2.MEASURES_NAME + Environment.NewLine;
de.MEASURE = de.MEASURE + temp; de.MEASURE = de.MEASURE + temp;
} }
} }
@ -176,6 +179,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_DETAIL_DEPART(); T_SK_RISK_EVALUATION_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_DETAIL_DEPART();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = de.ID; item2.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
@ -189,15 +193,17 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_DETAIL_POST(); T_SK_RISK_EVALUATION_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_DETAIL_POST();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = de.ID; item2.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2); postList.Add(item2);
if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any()) if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any())
{ {
foreach (var nn in mm.Nav_PostDetails.Where(t => !t.IS_DELETED)) foreach (var nn in mm.Nav_PostDetails.Where(t => !t.IS_DELETED).DistinctBy(t => t.POST_ID))
{ {
T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL(); T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL();
item3.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.ORG_ID = entity.ORG_ID; item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_DETAIL_POST_ID = item2.ID; item3.RISK_EVALUATION_DETAIL_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID; item3.POST_ID = nn.POST_ID;
@ -303,7 +309,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any()) if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList); BantchSaveEntityNoCommit(postDetList.GroupBy(p => new { p.RISK_EVALUATION_DETAIL_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估表审批"); }, null, null, null, null, null, "SK039_SHOWPRINT", null, "安全风险评估表审批");
return true; return true;
} }
@ -334,7 +340,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any()) if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList); BantchSaveEntityNoCommit(postDetList.GroupBy(p => new { p.RISK_EVALUATION_DETAIL_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}); });
return true; return true;
}); });

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

@ -1,4 +1,4 @@
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Enums.PF; using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.Enums; using APT.BaseData.Domain.Enums;
@ -44,7 +44,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null) if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId; entity.APPLY_DEPARTMENT_ID = departId;
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null) if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID; entity.IDENTIFY_EVALUATION_PLAN_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
var details = entity.Nav_Details; var details = entity.Nav_Details;
entity.Nav_Details = null; entity.Nav_Details = null;
var requires = entity.Nav_Requires; var requires = entity.Nav_Requires;
@ -73,6 +73,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var item in details.Where(t => !t.IS_DELETED)) foreach (var item in details.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_SUMMARY_DETAIL de = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL de = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL();
de.ID = item.ID == Guid.Empty ? Guid.NewGuid() : item.ID;
de.ORG_ID = entity.ORG_ID; de.ORG_ID = entity.ORG_ID;
de.RISK_EVALUATION_SUMMARY_ID = entity.ID; de.RISK_EVALUATION_SUMMARY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
@ -98,12 +99,14 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.NUM = mm.NUM; item2.NUM = mm.NUM;
item2.MEASURES_NAME = mm.MEASURES_NAME; item2.MEASURES_NAME = mm.MEASURES_NAME;
measureList.Add(item2); measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine; var num = (item2.NUM == null || item2.NUM == 0) ? 1 : item2.NUM.Value;
var temp = num + "、" + item2.MEASURES_NAME + Environment.NewLine;
de.MEASURE = de.MEASURE + temp; de.MEASURE = de.MEASURE + temp;
} }
} }
@ -114,6 +117,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
@ -127,15 +131,17 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2); postList.Add(item2);
if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any()) if (mm.Nav_PostDetails != null && mm.Nav_PostDetails.Any())
{ {
foreach (var nn in mm.Nav_PostDetails.Where(t => !t.IS_DELETED)) foreach (var nn in mm.Nav_PostDetails.Where(t => !t.IS_DELETED).DistinctBy(t => t.POST_ID))
{ {
T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL(); T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL();
item3.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.ORG_ID = entity.ORG_ID; item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = item2.ID; item3.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID; item3.POST_ID = nn.POST_ID;
@ -179,7 +185,7 @@ namespace APT.SK.WebApi.Controllers.Api
MFlowPermitService.InsertApprove(serialCode[0], "SK041", "", entity.ID, "SK041_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(serialCode[0], "SK041", "", entity.ID, "SK041_SHOWPRINT", entity.TaskID, true, () =>
{ {
if (deleteMeasureIds != null && deleteMeasureIds.Any()) if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any()) if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any()) if (deletePostDetailIds != null && deletePostDetailIds.Any())
@ -203,14 +209,14 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any()) if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList); BantchSaveEntityNoCommit(postDetList.GroupBy(p => new { p.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}, null, null, null, null, null, "SK041_SHOWPRINT", null, "安全风险评估汇总表审批"); }, null, null, null, null, null, "SK041_SHOWPRINT", null, "安全风险评估汇总表审批");
return true; return true;
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {
if (deleteMeasureIds != null && deleteMeasureIds.Any()) if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any()) if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any()) if (deletePostDetailIds != null && deletePostDetailIds.Any())
@ -234,7 +240,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetList != null && postDetList.Any()) if (postDetList != null && postDetList.Any())
BantchSaveEntityNoCommit(postDetList); BantchSaveEntityNoCommit(postDetList.GroupBy(p => new { p.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}); });
return true; return true;
}); });

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

@ -1,4 +1,4 @@
using APT.BaseData.Domain.IServices.FM; using APT.BaseData.Domain.IServices.FM;
using APT.BaseData.Domain.IServices; using APT.BaseData.Domain.IServices;
using APT.MS.Domain.Entities.SK; using APT.MS.Domain.Entities.SK;
using APT.Utility; using APT.Utility;
@ -49,15 +49,15 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null) if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID; entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_IDENTIFY_EVALUATION_PLAN>(t => t.START_DATE.Value.Date == entity.START_DATE.Value.Date && t.STATUS == PFStandardStatus.Archived && t.ISSEND == true)?.ID;
var details = entity.Nav_Details; var details = entity.Nav_Details;
entity.Nav_Details = null; entity.Nav_Details = null;
var requires = entity.Nav_Requires; var requires = entity.Nav_Requires;
entity.Nav_Requires = null; entity.Nav_Requires = null;
var files = entity.Nav_Files; var files = entity.Nav_Files;
entity.Nav_Files = null; entity.Nav_Files = null;
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME; 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; entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
List<Guid> deleteMeasureIds = new List<Guid>(); List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>(); List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_RISK_IDENTIFY_DETAIL> detailList = new List<T_SK_RISK_IDENTIFY_DETAIL>(); List<T_SK_RISK_IDENTIFY_DETAIL> detailList = new List<T_SK_RISK_IDENTIFY_DETAIL>();
List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(); List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>();
//更新标识字段 //更新标识字段
@ -65,64 +65,72 @@ namespace APT.SK.WebApi.Controllers.Api
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())
{ {
deleteDetailIds = record.Nav_Details.Select(t => t.ID).ToList(); deleteDetailIds = record.Nav_Details.Select(t => t.ID).ToList();
var detailMes = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList(); var detailMes = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).ToList();
deleteMeasureIds = detailMes.Select(t => t.ID).ToList(); deleteMeasureIds = detailMes.Select(t => t.ID).ToList();
foreach (var item in details) foreach (var item in details)
{ {
if (item.MARK == SKMarkEnum.Auto) if (item.MARK == SKMarkEnum.Auto)
{ {
//&& t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS //&& t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS
var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME); var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME);
if (temp == null) if (temp == null)
{ {
item.MARK = SKMarkEnum.Update; item.MARK = SKMarkEnum.Update;
} }
//if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) //if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
//{ //{
// foreach (var mes in item.Nav_DetailMeasures) // foreach (var mes in item.Nav_DetailMeasures)
// { // {
// var newMes = detailMes.FirstOrDefault(t => t.MEASURE == mes.MEASURE && t.RISK_IDENTIFY_DETAIL_ID == item.ID); // var newMes = detailMes.FirstOrDefault(t => t.MEASURE == mes.MEASURE && t.RISK_IDENTIFY_DETAIL_ID == item.ID);
// if (newMes == null && item.MARK != SKMarkEnum.Add) // if (newMes == null && item.MARK != SKMarkEnum.Add)
// { // {
// item.MARK = SKMarkEnum.Update; // item.MARK = SKMarkEnum.Update;
// } // }
// } // }
//} //}
} }
} }
} }
if (details != null && details.Any()) if (details != null && details.Any())
{ {
foreach (var item in details.Where(t => !t.IS_DELETED)) foreach (var item in details.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_DETAIL de = new T_SK_RISK_IDENTIFY_DETAIL(); T_SK_RISK_IDENTIFY_DETAIL de = new T_SK_RISK_IDENTIFY_DETAIL();
de.ID = item.ID == Guid.Empty ? Guid.NewGuid() : item.ID;
de.ORG_ID = entity.ORG_ID; de.ORG_ID = entity.ORG_ID;
de.RISK_IDENTIFY_ID = entity.ID; de.RISK_IDENTIFY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID; de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME; de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION; de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID; de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS; de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK; de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY; de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
//de.MEASURE = item.MEASURE;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_DETAIL_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE(); T_SK_RISK_IDENTIFY_DETAIL_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_DETAIL_ID = de.ID; item2.RISK_IDENTIFY_DETAIL_ID = de.ID;
item2.MEASURE = mm.MEASURE; item2.MEASURE = (mm.MEASURE ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
item2.NUM = mm.NUM; item2.NUM = mm.NUM;
measureList.Add(item2); item2.EMERGENCY = mm.EMERGENCY;
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine; measureList.Add(item2);
var num = (item2.NUM == null || item2.NUM == 0) ? 1 : item2.NUM.Value;
var temp = num + "、" + item2.MEASURE + Environment.NewLine;
de.MEASURE = de.MEASURE + temp; de.MEASURE = de.MEASURE + temp;
} }
} }
item.Nav_DetailMeasures = null; else
{
// 兜底：如果前端没传 Nav_DetailMeasures，但传了 MEASURE 字符串，直接用
de.MEASURE = item.MEASURE;
}
item.Nav_DetailMeasures = null;
detailList.Add(de); detailList.Add(de);
} }
} }
@ -134,7 +142,7 @@ namespace APT.SK.WebApi.Controllers.Api
item.RISK_IDENTIFY_ID = entity.ID; item.RISK_IDENTIFY_ID = entity.ID;
item.Nav_ImgFile = null; item.Nav_ImgFile = null;
} }
} }
if (requires != null && requires.Any()) if (requires != null && requires.Any())
{ {
foreach (var item in requires.Where(t => !t.IS_DELETED)) foreach (var item in requires.Where(t => !t.IS_DELETED))
@ -172,8 +180,8 @@ namespace APT.SK.WebApi.Controllers.Api
if (detailList != null && detailList.Any()) if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList); BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any()) if (files != null && files.Any())
BantchSaveEntityNoCommit(files); BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any()) if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires); BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any()) if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList); BantchSaveEntityNoCommit(measureList);
@ -191,8 +199,8 @@ namespace APT.SK.WebApi.Controllers.Api
if (detailList != null && detailList.Any()) if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(detailList); BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any()) if (files != null && files.Any())
BantchSaveEntityNoCommit(files); BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any()) if (requires != null && requires.Any())
BantchSaveEntityNoCommit(requires); BantchSaveEntityNoCommit(requires);
if (measureList != null && measureList.Any()) if (measureList != null && measureList.Any())
BantchSaveEntityNoCommit(measureList); BantchSaveEntityNoCommit(measureList);
@ -249,14 +257,14 @@ namespace APT.SK.WebApi.Controllers.Api
if (result != null) if (result != null)
{ {
var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures"); var details = this.GetEntities<T_SK_RISK_IDENTIFY_DETAIL>(t => t.RISK_IDENTIFY_ID == result.ID, filter, "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_ProductionUnit", "Nav_DetailMeasures");
result.Nav_Details = details.OrderBy(m => m.PRODUCTION_UNIT_ID).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList(); result.Nav_Details = details.OrderBy(m => m.PRODUCTION_UNIT_ID).ThenBy(t => t.AREA_ID).ThenBy(x => x.TYPE_ID).ToList();
foreach (var d in result.Nav_Details) foreach (var d in result.Nav_Details)
{ {
d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(m => m.NUM).ToList(); d.Nav_DetailMeasures = d.Nav_DetailMeasures.OrderBy(m => m.NUM).ToList();
//foreach (var m in d.Nav_DetailMeasures) //foreach (var m in d.Nav_DetailMeasures)
//{ //{
// var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；"; // var temp = (m.NUM == null || m.NUM == 0) ? "1" : m.NUM + "、" + m.MEASURE + "；";
// d.MEASURE = d.MEASURE + temp; // d.MEASURE = d.MEASURE + temp;
//} //}
} }
if (result.STATUS == PFStandardStatus.Rejected) if (result.STATUS == PFStandardStatus.Rejected)

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

@ -1,4 +1,4 @@
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums; using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Enums.PF; using APT.BaseData.Domain.Enums.PF;
@ -48,7 +48,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null) if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId; entity.APPLY_DEPARTMENT_ID = departId;
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null) if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_RISK_IDENTIFY>(t => t.ID == entity.IDENTIFY_ID)?.IDENTIFY_EVALUATION_PLAN_ID; entity.IDENTIFY_EVALUATION_PLAN_ID = this.GetEntity<T_SK_RISK_IDENTIFY>(t => t.ID == entity.IDENTIFY_ID)?.IDENTIFY_EVALUATION_PLAN_ID;
var details = entity.Nav_Details; var details = entity.Nav_Details;
entity.Nav_Details = null; entity.Nav_Details = null;
var requires = entity.Nav_Requires; var requires = entity.Nav_Requires;
@ -129,34 +129,37 @@ namespace APT.SK.WebApi.Controllers.Api
if (details != null && details.Any()) if (details != null && details.Any())
{ {
foreach (var item in details.Where(t => !t.IS_DELETED)) foreach (var item in details.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_RESULT_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); T_SK_RISK_IDENTIFY_RESULT_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_DETAIL();
de.ID = item.ID == Guid.Empty ? Guid.NewGuid() : item.ID;
de.ORG_ID = entity.ORG_ID; de.ORG_ID = entity.ORG_ID;
de.RISK_IDENTIFY_RESULT_ID = entity.ID; de.RISK_IDENTIFY_RESULT_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID; de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME; de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION; de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID; de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS; de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK; de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY; de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
//de.MEASURE = item.MEASURE; //de.MEASURE = item.MEASURE;
de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE;
de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT; de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT;
de.IDENTIFY_POST = item.IDENTIFY_POST; de.IDENTIFY_POST = item.IDENTIFY_POST;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE(); T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID; item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.NUM = mm.NUM; item2.NUM = mm.NUM;
item2.MEASURE = mm.MEASURE; item2.MEASURE = (mm.MEASURE ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
measureList.Add(item2); measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine; var num = (item2.NUM == null || item2.NUM == 0) ? 1 : item2.NUM.Value;
var temp = num + "、" + item2.MEASURE + "；";
de.MEASURE = de.MEASURE + temp; de.MEASURE = de.MEASURE + temp;
} }
} }
@ -167,9 +170,10 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART(); T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID; item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
departList.Add(item2); departList.Add(item2);
} }
@ -180,21 +184,23 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST(); T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID; item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2); postList.Add(item2);
if (mm.Nav_ResultPostDets != null && mm.Nav_ResultPostDets.Any()) if (mm.Nav_ResultPostDets != null && mm.Nav_ResultPostDets.Any())
{ {
foreach (var nn in mm.Nav_ResultPostDets.Where(t => !t.IS_DELETED)) foreach (var nn in mm.Nav_ResultPostDets.Where(t => !t.IS_DELETED).DistinctBy(t => t.POST_ID))
{ {
T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL(); 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.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.RISK_IDENTIFY_DETAIL_RESULT_POST_ID = item2.ID; item3.ORG_ID = entity.ORG_ID;
item3.POST_ID = nn.POST_ID; item3.RISK_IDENTIFY_DETAIL_RESULT_POST_ID = item2.ID;
postDetailList.Add(item3); item3.POST_ID = nn.POST_ID;
} postDetailList.Add(item3);
}
} }
} }
} }
@ -263,7 +269,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any()) if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList); BantchSaveEntityNoCommit(postDetailList.GroupBy(p => new { p.RISK_IDENTIFY_DETAIL_RESULT_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}, null, null, null, null, null, "SK035_SHOWPRINT", null, "安全风险辨识结果表审批"); }, null, null, null, null, null, "SK035_SHOWPRINT", null, "安全风险辨识结果表审批");
return true; return true;
} }
@ -294,7 +300,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any()) if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList); BantchSaveEntityNoCommit(postDetailList.GroupBy(p => new { p.RISK_IDENTIFY_DETAIL_RESULT_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}); });
return true; return true;
}); });

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

@ -1,4 +1,4 @@
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums; using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Enums.PF; using APT.BaseData.Domain.Enums.PF;
@ -45,7 +45,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null) if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId; entity.APPLY_DEPARTMENT_ID = departId;
if (entity.IDENTIFY_EVALUATION_PLAN_ID == null) if (entity.IDENTIFY_EVALUATION_PLAN_ID == null)
entity.APPLY_DEPARTMENT_ID = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(t => t.ID == entity.IDENTIFY_RESULT_ID)?.IDENTIFY_EVALUATION_PLAN_ID; entity.IDENTIFY_EVALUATION_PLAN_ID = this.GetEntity<T_SK_RISK_IDENTIFY_RESULT>(t => t.ID == entity.IDENTIFY_RESULT_ID)?.IDENTIFY_EVALUATION_PLAN_ID;
var details = entity.Nav_Details; var details = entity.Nav_Details;
entity.Nav_Details = null; entity.Nav_Details = null;
var requires = entity.Nav_Requires; var requires = entity.Nav_Requires;
@ -72,34 +72,37 @@ namespace APT.SK.WebApi.Controllers.Api
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(); 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(); 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.Where(t => !t.IS_DELETED)) foreach (var item in details.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL(); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL();
de.ID = item.ID == Guid.Empty ? Guid.NewGuid() : item.ID;
de.ORG_ID = entity.ORG_ID; de.ORG_ID = entity.ORG_ID;
de.IDENTIFY_RESULT_SUMMARY_ID = entity.ID; de.IDENTIFY_RESULT_SUMMARY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID; de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME; de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION; de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID; de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS; de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK; de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY; de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
//de.MEASURE = item.MEASURE; //de.MEASURE = item.MEASURE;
de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE; de.DEPARTMENT_TYPE = item.DEPARTMENT_TYPE;
de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT; de.IDENTIFY_DEPARTMENT = item.IDENTIFY_DEPARTMENT;
de.IDENTIFY_POST = item.IDENTIFY_POST; de.IDENTIFY_POST = item.IDENTIFY_POST;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailMeasures.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE(); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID; item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.NUM = mm.NUM; item2.NUM = mm.NUM;
item2.MEASURE = mm.MEASURE; item2.MEASURE = (mm.MEASURE ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
measureList.Add(item2); measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine; var num = (item2.NUM == null || item2.NUM == 0) ? 1 : item2.NUM.Value;
var temp = num + "、" + item2.MEASURE + "；";
de.MEASURE = de.MEASURE + temp; de.MEASURE = de.MEASURE + temp;
} }
} }
@ -110,9 +113,10 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailDeparts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART(); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID; item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
departList.Add(item2); departList.Add(item2);
} }
@ -123,21 +127,23 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED)) foreach (var mm in item.Nav_DetailPosts.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST(); T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID; item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2); postList.Add(item2);
if (mm.Nav_SumPostDets != null && mm.Nav_SumPostDets.Any()) if (mm.Nav_SumPostDets != null && mm.Nav_SumPostDets.Any())
{ {
foreach (var nn in mm.Nav_SumPostDets.Where(t => !t.IS_DELETED)) foreach (var nn in mm.Nav_SumPostDets.Where(t => !t.IS_DELETED))
{ {
T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL(); 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.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.IDENTIFY_RESULT_SUMMARY_POST_ID = item2.ID; item3.ORG_ID = entity.ORG_ID;
item3.POST_ID = nn.POST_ID; item3.IDENTIFY_RESULT_SUMMARY_POST_ID = item2.ID;
postDetailList.Add(item3); item3.POST_ID = nn.POST_ID;
} postDetailList.Add(item3);
}
} }
} }
} }
@ -178,7 +184,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (deleteMeasureIds != null && deleteMeasureIds.Any()) if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any()) if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any()) if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any()) if (deletePostIds != null && deletePostIds.Any())
@ -200,7 +206,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any()) if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList); BantchSaveEntityNoCommit(postDetailList.GroupBy(p => new { p.IDENTIFY_RESULT_SUMMARY_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}, null, null, null, null, null, "SK037_SHOWPRINT", null, "安全风险辨识结果汇总表审批"); }, null, null, null, null, null, "SK037_SHOWPRINT", null, "安全风险辨识结果汇总表审批");
return true; return true;
} }
@ -209,7 +215,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (deleteMeasureIds != null && deleteMeasureIds.Any()) if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any()) if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any()) if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any()) if (deletePostIds != null && deletePostIds.Any())
@ -231,7 +237,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any()) if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList); BantchSaveEntityNoCommit(postList);
if (postDetailList != null && postDetailList.Any()) if (postDetailList != null && postDetailList.Any())
BantchSaveEntityNoCommit(postDetailList); BantchSaveEntityNoCommit(postDetailList.GroupBy(p => new { p.IDENTIFY_RESULT_SUMMARY_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
}); });
return true; return true;
}); });