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

37
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.Entities;
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();
mes.ORG_ID = ideDetail.ORG_ID;
mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID;
mes.MEASURE = id2;
mes.MEASURE = (id2 ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
mes.NUM = i;
var temp = i + "、" + id2;
var temp = i + "、" + id2 + "；";
ideDetail.MEASURE = ideDetail.MEASURE + temp;
detailMeasures.Add(mes);
i++;
@ -13495,9 +13495,9 @@ namespace APT.BaseData.Services.DomainServices
mes.ORG_ID = filter.OrgId;
mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
mes.NUM = i;
mes.MEASURE = mm;
mes.MEASURE = (mm ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
resultDetailMes.Add(mes);
var mtemp = i + "、" + mm;
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
@ -13587,7 +13587,7 @@ namespace APT.BaseData.Services.DomainServices
if (resultDetailPosts != null && resultDetailPosts.Count > 0)
BantchSaveEntityNoCommit(resultDetailPosts);
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)
// BantchSaveEntityNoCommit(resultDetailDeps);
});
@ -13915,9 +13915,9 @@ namespace APT.BaseData.Services.DomainServices
mes.ORG_ID = filter.OrgId;
mes.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = ideDetail.ID;
mes.NUM = i;
mes.MEASURE = mm;
mes.MEASURE = (mm ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
summaryMeasures.Add(mes);
var mtemp = i + "、" + mm;
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
@ -14279,7 +14279,7 @@ namespace APT.BaseData.Services.DomainServices
detailPosts.Add(pos);
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();
depDetail.POST_ID = item2.POST_ID;
@ -14294,7 +14294,8 @@ namespace APT.BaseData.Services.DomainServices
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);
//T_SC_MT_MEETING_BEGIN modelBegin = new T_SC_MT_MEETING_BEGIN();
//modelBegin.ID = Guid.NewGuid();
@ -14719,7 +14720,7 @@ namespace APT.BaseData.Services.DomainServices
pos.DEPARTMENT_ID = ite.ID;
pos.RISK_EVALUATION_SUMMARY_DETAIL_ID = detail.ID;
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())
{
foreach (var poId in postIds)
@ -14912,7 +14913,7 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = item.ORG_ID;
dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
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())
{
foreach (var item3 in lpostDetails)
@ -15053,7 +15054,7 @@ namespace APT.BaseData.Services.DomainServices
if (detailPostSums != null && detailPostSums.Any())
BantchSaveEntityNoCommit(detailPostSums);
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)
this.UpdateEntityNoCommit(notice);
if (dou != null)
@ -15067,7 +15068,7 @@ namespace APT.BaseData.Services.DomainServices
if (douDetailPosts != null && douDetailPosts.Count > 0)
BantchSaveEntityNoCommit(douDetailPosts);
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)
BantchSaveEntityNoCommit(douDetailContents);
if (douContentPosts != null && douContentPosts.Count > 0)
@ -15104,7 +15105,7 @@ namespace APT.BaseData.Services.DomainServices
if (detailPostSums != null && detailPostSums.Any())
BantchSaveEntityNoCommit(detailPostSums);
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)
this.UpdateEntityNoCommit(notice);
if (dou != null)
@ -15118,7 +15119,7 @@ namespace APT.BaseData.Services.DomainServices
if (douDetailPosts != null && douDetailPosts.Count > 0)
BantchSaveEntityNoCommit(douDetailPosts);
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)
BantchSaveEntityNoCommit(douDetailContents);
if (douContentPosts != null && douContentPosts.Count > 0)
@ -15262,7 +15263,7 @@ namespace APT.BaseData.Services.DomainServices
dep.ORG_ID = item.ORG_ID;
dep.DOUBLE_PREVENT_MECHANISM_DETAIL_ID = detail.ID;
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())
{
foreach (var item3 in lpostDetails)
@ -15398,7 +15399,7 @@ namespace APT.BaseData.Services.DomainServices
if (douDetailPosts != null && douDetailPosts.Count > 0)
BantchSaveEntityNoCommit(douDetailPosts);
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)
BantchSaveEntityNoCommit(douDetailContents);
if (douContentPosts != null && douContentPosts.Count > 0)

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

@ -1447,18 +1447,24 @@ namespace APT.FO.WebApi.Controllers
curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
notices.Add(curentTask);
T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL();
detail.APPROVE_ID = approve.ID;
detail.IS_CURRENT = false;
detail.ORG_ID = approveTemp.ORG_ID;
detail.NAME = applyApprove.FirstOrDefault()?.NAME;
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);
applyApprove.ForEach(t =>
{
t.IS_CURRENT = false;t.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done;
t.NODE_APPROVE_TIME = DateTime.Now;
});
//T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL();
//detail.APPROVE_ID = approve.ID;
//detail.IS_CURRENT = false;
//detail.ORG_ID = approveTemp.ORG_ID;
//detail.NAME = applyApprove.FirstOrDefault()?.NAME;
//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();
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 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>();
foreach (var u in sendUserIds)
foreach (var u in sendUserIdNews)
{
var current = users.FirstOrDefault(t => t.ID == u);
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.Services\APT.BaseData.Services.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.Utility\APT.Utility.csproj" />
</ItemGroup>

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

@ -1,4 +1,4 @@
using APT.BaseData.Domain.ApiModel;
using APT.BaseData.Domain.ApiModel;
using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Enums;
@ -1084,56 +1084,13 @@ namespace APT.PP.WebApi.Controllers.Api
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, filter.OrgId.Value, DateTime.Now, null, null);
if (setList != null && setList.Any())
{
var departMentTemps = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(filter.OrgId)).ToList();
var topDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 5 && t.PARENT_ID == null).OrderBy(t => t.NUM).ToList();
deppartList.AddRange(topDeparts);
//var departMents = GetSons(departMentTemps, topDepart.ID).OrderBy(t => t.PARENT_ID).ThenBy(t => t.NUM);
var comDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 5 && t.PARENT_ID != null).OrderBy(t => t.NUM).ToList();
//deppartList.AddRange(comDeparts);
foreach (var cm in comDeparts)
{
deppartList.Add(cm);
var bmDepart = departMentTemps.Where(t => t.PARENT_ID == cm.ID).OrderBy(t => t.NUM).ToList();
if (bmDepart.Any())
{
foreach (var bm in bmDepart)
{
deppartList.Add(bm);
var cjDepart = departMentTemps.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList();
if (cjDepart.Any())
{
foreach (var cj in cjDepart)
{
deppartList.Add(cj);
var bzDepart = departMentTemps.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList();
if (bzDepart.Any())
{
deppartList.AddRange(bzDepart);
}
}
}
}
}
}
var departTempIds = deppartList.Select(t => t.ID).ToList();
var bmDeparts = departMentTemps.Where(t => t.DEPARTMENT_TYPE == 10 && !departTempIds.Contains(t.ID)).ToList();
foreach (var bm in bmDeparts)
{
deppartList.Add(bm);
var cjDepart = departMentTemps.Where(t => t.PARENT_ID == bm.ID).OrderBy(t => t.NUM).ToList();
if (cjDepart.Any())
{
foreach (var cj in cjDepart)
{
deppartList.Add(cj);
var bzDepart = departMentTemps.Where(t => t.PARENT_ID == cj.ID).OrderBy(t => t.NUM).ToList();
if (bzDepart.Any())
{
deppartList.AddRange(bzDepart);
}
}
}
}
// 加载所有启用的部门（包含实际组织和虚拟组织），虚拟组织作为中间层级用于递归遍历
var allDeparts = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)).ToList();
// 递归遍历整棵树：虚拟组织只参与遍历不加入结果，实际组织才加入 deppartList
// 从 parentId=null 开始，根节点也会被正确处理（是实际组织就加入，是虚拟组织就跳过但继续向下）
CollectActualDeparts(allDeparts, null, deppartList);
// 去重
deppartList = deppartList.GroupBy(t => t.ID).Select(g => g.First()).ToList();
foreach (var set in setList)
{
T_SK_IDENTIFY_EVALUATION_PLAN plan = new T_SK_IDENTIFY_EVALUATION_PLAN();
@ -1217,6 +1174,23 @@ namespace APT.PP.WebApi.Controllers.Api
return query.ToList().Concat(query.ToList().SelectMany(t => GetSonList(list, t.ID))).ToList();
}
/// <summary>
/// 递归收集实际组织部门：虚拟组织跳过但继续向下遍历，实际组织加入结果集
/// </summary>
private void CollectActualDeparts(List<T_FM_DEPARTMENT> allDeparts, Guid? parentId, List<T_FM_DEPARTMENT> result)
{
var children = allDeparts.Where(t => t.PARENT_ID == parentId).OrderBy(t => t.NUM).ToList();
foreach (var child in children)
{
if (child.CATEGORY == FMCATEGORY.ACTURE)
{
result.Add(child);
}
// 无论虚拟还是实际，都继续向下递归，确保虚拟组织下的实际组织也能被找到
CollectActualDeparts(allDeparts, child.ID, result);
}
}
/// <summary>
/// 补触发安全风险辨识表
/// </summary>
@ -1588,7 +1562,7 @@ namespace APT.PP.WebApi.Controllers.Api
mes.ORG_ID = library.ORG_ID;
mes.RISK_IDENTIFY_DETAIL_ID = ideDetail.ID;
mes.NUM = detais.NUM;
mes.MEASURE = detais.MEASURES_NAME;
mes.MEASURE = (detais.MEASURES_NAME ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
mesList.Add(mes);
var temp = (detais.NUM == null || detais.NUM == 0) ? "1" : detais.NUM + "、" + detais.MEASURES_NAME;
ideDetail.MEASURE = ideDetail.MEASURE + temp;
@ -1678,7 +1652,6 @@ namespace APT.PP.WebApi.Controllers.Api
var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId));
var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "ID", "START_DATE", "END_DATE" }; //指定字段，包括导航属性
Expression<Func<T_SK_IDENTIFY_EVALUATION_PLAN, bool>> expression = i => i.END_DATE.Value.Date == dtNow.Date && i.STATUS == PFStandardStatus.Archived;
List<T_SK_IDENTIFY_EVALUATION_PLAN> planTemps = this.GetEntities(expression, baseFilter, "Nav_Requires").ToList();
var planIds = planTemps.Select(t => t.ID).ToList();
@ -1771,7 +1744,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS, m.MARK }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
@ -1790,8 +1763,9 @@ namespace APT.PP.WebApi.Controllers.Api
//ideDetail.MEASURE = item.MEASURE;
//ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.MARK = item.MARK;
//汇总去重
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS && m.MARK == item.MARK).ToList();
//管控措施
var identifyDetailIds = temp.Select(t => t.ID).ToList();
var mesTemps = identityDetailMes.Where(t => identifyDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID)).OrderBy(n=>n.NUM).Select(m=>m.MEASURE).Distinct().ToList();
@ -1804,9 +1778,9 @@ namespace APT.PP.WebApi.Controllers.Api
mes.ORG_ID = filter.OrgId;
mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
mes.NUM = i;
mes.MEASURE = mm;
mes.MEASURE = (mm ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
resultDetailMes.Add(mes);
var mtemp = i + "、" + mm;
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
@ -1960,7 +1934,7 @@ namespace APT.PP.WebApi.Controllers.Api
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS, m.MARK }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
@ -1979,8 +1953,9 @@ namespace APT.PP.WebApi.Controllers.Api
//ideDetail.MEASURE = item.MEASURE;
//ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.MARK = item.MARK;
//汇总去重
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS && m.MARK == item.MARK).ToList();
//管控措施
var identifyDetailIds = temp.Select(t => t.ID).ToList();
var mesTemps = identityDetailMes.Where(t => identifyDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID)).OrderBy(n => n.NUM).Select(m => m.MEASURE).Distinct().ToList();
@ -1993,9 +1968,9 @@ namespace APT.PP.WebApi.Controllers.Api
mes.ORG_ID = filter.OrgId;
mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
mes.NUM = i;
mes.MEASURE = mm;
mes.MEASURE = (mm ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
resultDetailMes.Add(mes);
var mtemp = i + "、" + mm;
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
@ -2186,7 +2161,7 @@ namespace APT.PP.WebApi.Controllers.Api
var ideIds = ides.Where(m => m.APPLY_DEPARTMENT_ID == de || classIds.Contains((Guid)m.APPLY_DEPARTMENT_ID)).Select(t => t.ID).ToList();
var list = details.Where(t => ideIds.Contains(t.RISK_IDENTIFY_ID)).ToList();
//汇总去重
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS }).Select(g => g.FirstOrDefault()).ToList();
var detailListYes = list.GroupBy(m => new { m.AREA_ID, m.PRODUCTION_UNIT_ID, m.RISK_NAME, m.RISK_DESCRIPTION, m.TYPE_ID, m.ENABLE_STATUS, m.MARK }).Select(g => g.FirstOrDefault()).ToList();
if (detailListYes.Any())
{
foreach (var item in detailListYes)
@ -2205,8 +2180,9 @@ namespace APT.PP.WebApi.Controllers.Api
//ideDetail.MEASURE = item.MEASURE;
//ideDetail.EMERGENCY = item.EMERGENCY;
ideDetail.ENABLE_STATUS = item.ENABLE_STATUS;
ideDetail.MARK = item.MARK;
//汇总去重
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS).ToList();
var temp = list.Where(m => m.AREA_ID == item.AREA_ID && m.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && m.RISK_NAME == item.RISK_NAME && m.RISK_DESCRIPTION == item.RISK_DESCRIPTION && m.TYPE_ID == item.TYPE_ID && m.ENABLE_STATUS == item.ENABLE_STATUS && m.MARK == item.MARK).ToList();
//管控措施
var identifyDetailIds = temp.Select(t => t.ID).ToList();
var mesTemps = identityDetailMes.Where(t => identifyDetailIds.Contains(t.RISK_IDENTIFY_DETAIL_ID)).OrderBy(n => n.NUM).Select(m => m.MEASURE).Distinct().ToList();
@ -2219,9 +2195,9 @@ namespace APT.PP.WebApi.Controllers.Api
mes.ORG_ID = filter.OrgId;
mes.RISK_IDENTIFY_RESULT_DETAIL_ID = ideDetail.ID;
mes.NUM = i;
mes.MEASURE = mm;
mes.MEASURE = (mm ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
resultDetailMes.Add(mes);
var mtemp = i + "、" + mm;
var mtemp = i + "、" + mm + "；";
ideDetail.MEASURE = ideDetail.MEASURE + mtemp;
i++;
}
@ -2332,7 +2308,7 @@ namespace APT.PP.WebApi.Controllers.Api
if (resultDetailPosts != null && resultDetailPosts.Any())
BantchSaveEntityNoCommit(resultDetailPosts);
if (resultDetailPostDets != null && resultDetailPostDets.Any())
BantchSaveEntityNoCommit(resultDetailPostDets);
BantchSaveEntityNoCommit(resultDetailPostDets.GroupBy(p => new { p.RISK_IDENTIFY_DETAIL_RESULT_POST_ID, p.POST_ID }).Select(g => g.First()).ToList());
});
}
catch (Exception ex)

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.Enums;
using APT.BaseData.Domain.Enums.PF;
@ -48,7 +48,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
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;
entity.Nav_Details = null;
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))
{
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.RISK_EVALUATION_ID = entity.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))
{
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.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURES_NAME = mm.MEASURES_NAME;
measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
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;
}
}
@ -176,6 +179,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_DETAIL_ID = de.ID;
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))
{
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.RISK_EVALUATION_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2);
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();
item3.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_DETAIL_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID;
@ -303,7 +309,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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, "安全风险评估表审批");
return true;
}
@ -334,7 +340,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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;
});

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.Enums.PF;
using APT.BaseData.Domain.Enums;
@ -44,7 +44,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
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;
entity.Nav_Details = null;
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))
{
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.RISK_EVALUATION_SUMMARY_ID = entity.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))
{
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.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURES_NAME = mm.MEASURES_NAME;
measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine;
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;
}
}
@ -114,6 +117,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
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))
{
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.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_ID = mm.DEPARTMENT_ID;
postList.Add(item2);
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();
item3.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.ORG_ID = entity.ORG_ID;
item3.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = item2.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, () =>
{
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())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
@ -203,14 +209,14 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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, "安全风险评估汇总表审批");
return true;
}
this.UnifiedCommit(() =>
{
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())
this.BantchDeleteEntityNoCommit<T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
@ -234,7 +240,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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;
});

16
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.MS.Domain.Entities.SK;
using APT.Utility;
@ -96,6 +96,7 @@ namespace APT.SK.WebApi.Controllers.Api
foreach (var item in details.Where(t => !t.IS_DELETED))
{
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.RISK_IDENTIFY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
@ -107,21 +108,28 @@ namespace APT.SK.WebApi.Controllers.Api
de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
//de.MEASURE = item.MEASURE;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_DETAIL_ID = de.ID;
item2.MEASURE = mm.MEASURE;
item2.MEASURE = (mm.MEASURE ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
item2.NUM = mm.NUM;
item2.EMERGENCY = mm.EMERGENCY;
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 + Environment.NewLine;
de.MEASURE = de.MEASURE + temp;
}
}
else
{
// 兜底：如果前端没传 Nav_DetailMeasures，但传了 MEASURE 字符串，直接用
de.MEASURE = item.MEASURE;
}
item.Nav_DetailMeasures = null;
detailList.Add(de);
}

20
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.Enums;
using APT.BaseData.Domain.Enums.PF;
@ -48,7 +48,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
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;
entity.Nav_Details = null;
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))
{
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.RISK_IDENTIFY_RESULT_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
@ -151,12 +152,14 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURE = mm.MEASURE;
item2.MEASURE = (mm.MEASURE ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
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;
}
}
@ -167,6 +170,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
@ -180,6 +184,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
@ -187,9 +192,10 @@ namespace APT.SK.WebApi.Controllers.Api
postList.Add(item2);
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();
item3.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.ORG_ID = entity.ORG_ID;
item3.RISK_IDENTIFY_DETAIL_RESULT_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID;
@ -263,7 +269,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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, "安全风险辨识结果表审批");
return true;
}
@ -294,7 +300,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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;
});

22
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.Enums;
using APT.BaseData.Domain.Enums.PF;
@ -45,7 +45,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.APPLY_DEPARTMENT_ID == null)
entity.APPLY_DEPARTMENT_ID = departId;
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;
entity.Nav_Details = null;
var requires = entity.Nav_Requires;
@ -74,6 +74,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
de.ID = item.ID == Guid.Empty ? Guid.NewGuid() : item.ID;
de.ORG_ID = entity.ORG_ID;
de.IDENTIFY_RESULT_SUMMARY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
@ -94,12 +95,14 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.NUM = mm.NUM;
item2.MEASURE = mm.MEASURE;
item2.MEASURE = (mm.MEASURE ?? "").Replace("、", "，").Replace("\\", "，").Replace("/", "，");
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;
}
}
@ -110,6 +113,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
@ -123,6 +127,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item2.ID = mm.ID == Guid.Empty ? Guid.NewGuid() : mm.ID;
item2.ORG_ID = entity.ORG_ID;
item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID;
item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE;
@ -133,6 +138,7 @@ namespace APT.SK.WebApi.Controllers.Api
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();
item3.ID = nn.ID == Guid.Empty ? Guid.NewGuid() : nn.ID;
item3.ORG_ID = entity.ORG_ID;
item3.IDENTIFY_RESULT_SUMMARY_POST_ID = item2.ID;
item3.POST_ID = nn.POST_ID;
@ -178,7 +184,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds);
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
@ -200,7 +206,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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, "安全风险辨识结果汇总表审批");
return true;
}
@ -209,7 +215,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (deleteMeasureIds != null && deleteMeasureIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE>(deleteMeasureIds);
if (deleteDepartIds != null && deleteDepartIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART>(deleteDepartIds);
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART>(deleteDepartIds);
if (deletePostDetailIds != null && deletePostDetailIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL>(deletePostDetailIds);
if (deletePostIds != null && deletePostIds.Any())
@ -231,7 +237,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (postList != null && postList.Any())
BantchSaveEntityNoCommit(postList);
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;
});