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-06-12 17:22:12 +08:00
parent 4cd4848eca
commit 5b802c8a5f
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12663,7 +12663,7 @@ namespace APT.BaseData.Services.DomainServices
foreach (var item in details)
{
var libraryTemp = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
if (libraryTemp == null && item.MARK == SKMarkEnum.Add && item.ENABLE_STATUS == SKEnableStatusEnum.Yes)
if (libraryTemp == null || (item.MARK == SKMarkEnum.Add && item.ENABLE_STATUS == SKEnableStatusEnum.Yes))
{
T_SK_ENTERPRISE_LIBRARY library = new T_SK_ENTERPRISE_LIBRARY();
library.ORG_ID = item.ORG_ID;
@ -12812,6 +12812,9 @@ namespace APT.BaseData.Services.DomainServices
library.EVALUATE_C = item.EVALUATE_C;
library.EVALUATE_E = item.EVALUATE_E;
library.EVALUATE_L = item.EVALUATE_L;
library.SCOREL_ID = item.SCOREL_ID;
library.SCOREE_ID = item.SCOREE_ID;
library.SCOREC_ID = item.SCOREC_ID;
library.EVALUATE_SCORE = item.EVALUATE_SCORE;
library.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
library.EMERGENCY = item.EMERGENCY;
@ -12847,6 +12850,7 @@ namespace APT.BaseData.Services.DomainServices
T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN hidden = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN();
hidden.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID = content.ID;
hidden.ORG_ID = item4.ORG_ID;
hidden.CHECK_QUESTION_ID = item4.CHECK_QUESTION_ID;
hidden.HIDDEN_DESCRIPTION = item4.HIDDEN_DESCRIPTION;
hidden.HIDDEN_LEVEL = item4.HIDDEN_LEVEL;
hidden.RECTIFICATION_MEASURES = item4.RECTIFICATION_MEASURES;
@ -12947,7 +12951,11 @@ namespace APT.BaseData.Services.DomainServices
if (detailIds != null && detailIds.Any())
BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DETAIL>(detailIds);
if (libraryDepartIds != null && libraryDepartIds.Any())
BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DEPART>(libraryDepartIds);
BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_DEPART>(libraryDepartIds);
if (libraryPostDetIds != null && libraryPostDetIds.Any())
BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>(libraryPostDetIds);
if (libraryPostIds != null && libraryPostIds.Any())
BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY_POST>(libraryPostIds);
if (libraryIds != null && libraryIds.Any())
BantchDeleteEntityNoCommit<T_SK_ENTERPRISE_LIBRARY>(libraryIds);
if (libraryList != null && libraryList.Any())
@ -14950,7 +14958,7 @@ namespace APT.BaseData.Services.DomainServices
var mtemp = i + "、" + item2;
detail.MEASURE = detail.MEASURE + mtemp;
douDetailMes.Add(measure);
var libraryDetailFirst = libraryDetails.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst?.ID);
var libraryDetailFirst = libraryDetails.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst?.ID && t.MEASURES_NAME == item2);
var contents = libraryContents.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_ID == libraryDetailFirst?.ID).ToList();
if (contents.Any())
{
@ -15002,6 +15010,7 @@ namespace APT.BaseData.Services.DomainServices
contentPost.ORG_ID = item4.ORG_ID;
contentPost.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID = content.ID;
contentPost.HIDDEN_DESCRIPTION = item4.HIDDEN_DESCRIPTION;
contentPost.CHECK_QUESTION_ID = item4.CHECK_QUESTION_ID;
contentPost.HIDDEN_LEVEL = item4.HIDDEN_LEVEL;
contentPost.RECTIFICATION_MEASURES = item4.RECTIFICATION_MEASURES;
contentPost.NUM = item4.NUM;
@ -15297,7 +15306,7 @@ namespace APT.BaseData.Services.DomainServices
measure.MEASURES_NAME = item2;
measure.NUM = i;
douDetailMes.Add(measure);
var libraryDetailFirst = libraryDetails.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst?.ID);
var libraryDetailFirst = libraryDetails.FirstOrDefault(t => t.ENTERPRISE_LIBRARY_ID == libraryFirst?.ID && t.MEASURES_NAME == item2);
var contents = libraryContents.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_ID == libraryDetailFirst?.ID).ToList();
if (contents.Any())
{
@ -15348,6 +15357,7 @@ namespace APT.BaseData.Services.DomainServices
T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN contentPost = new T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_HIDDEN();
contentPost.ORG_ID = item4.ORG_ID;
contentPost.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT_ID = content.ID;
contentPost.CHECK_QUESTION_ID = item4.CHECK_QUESTION_ID;
contentPost.HIDDEN_DESCRIPTION = item4.HIDDEN_DESCRIPTION;
contentPost.HIDDEN_LEVEL = item4.HIDDEN_LEVEL;
contentPost.RECTIFICATION_MEASURES = item4.RECTIFICATION_MEASURES;

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs
View File

@ -449,7 +449,7 @@ namespace APT.SK.WebApi.Controllers.Api
// "Nav_DetailMeasureContents.Nav_DetailMeasureContentHiddens"
var measureIds = measures.Select(t => t.ID).ToList();
var measureContents = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_CONTENT>(t => measureIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES_ID), new BaseFilter(filter.OrgId), "Nav_DetailMeasureContentBasics.Nav_Law",
"Nav_Contents", "Nav_DetailMeasureContentPosts.Nav_Department", "Nav_DetailMeasureContentPosts.Nav_CheckType", "Nav_DetailMeasureContentPosts.Nav_DetailPosts.Nav_Post", "Nav_DetailMeasureContentHiddens");
"Nav_Contents", "Nav_DetailMeasureContentPosts.Nav_Department", "Nav_DetailMeasureContentPosts.Nav_CheckType", "Nav_DetailMeasureContentPosts.Nav_DetailPosts.Nav_Post", "Nav_DetailMeasureContentHiddens.Nav_Question");
foreach (var detail in details)
{