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-07-13 11:36:45 +08:00
parent 7fb92e2c7e
commit a98bcd7422
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11824,8 +11824,8 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.HIDDEN_PLACE = detail.HIDDEN_PLACE; noticeDetail.HIDDEN_PLACE = detail.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = detail.RECITIFY_TIME; noticeDetail.RECITIFY_TIME = detail.RECITIFY_TIME;
noticeDetail.RECITIFY_USER_ID = detail.RECITIFY_USER_ID; noticeDetail.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND; noticeDetail.RECTIFICATION_MEASURES = detail.REMARK;
noticeDetail.REMARK = detail.REMARK; //noticeDetail.REMARK = detail.REMARK;
noticeDetails.Add(noticeDetail); noticeDetails.Add(noticeDetail);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any()) if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{ {
@ -12077,7 +12077,7 @@ namespace APT.BaseData.Services.DomainServices
record.HIDDEN_PLACE = entity.HIDDEN_PLACE; record.HIDDEN_PLACE = entity.HIDDEN_PLACE;
record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_ID; record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_ID;
record.CHECK_QUESTION_ID = entity.CHECK_QUESTION_ID; record.CHECK_QUESTION_ID = entity.CHECK_QUESTION_ID;
record.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; record.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION_DETAIL;
record.HIDDEN_LEVEL = entity.HIDDEN_LEVEL; record.HIDDEN_LEVEL = entity.HIDDEN_LEVEL;
record.RECITIFY_TIME = entity.RECITIFY_TIME; record.RECITIFY_TIME = entity.RECITIFY_TIME;
record.RECITIFY_USER_ID = entity.RECITIFY_USER_ID; record.RECITIFY_USER_ID = entity.RECITIFY_USER_ID;
@ -12086,7 +12086,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_PERSON = user.NAME; record.CHECK_PERSON = user.NAME;
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID; record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser?.ID; record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = entity.REMARK; record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
record.NOTICE_CODE = entity.NOTICE_CODE; record.NOTICE_CODE = entity.NOTICE_CODE;
if (photos != null && photos.Any()) if (photos != null && photos.Any())
{ {
@ -12142,7 +12142,7 @@ namespace APT.BaseData.Services.DomainServices
record.HIDDEN_PLACE = entity.HIDDEN_PLACE; record.HIDDEN_PLACE = entity.HIDDEN_PLACE;
record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_ID; record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_ID;
record.CHECK_QUESTION_ID = entity.CHECK_QUESTION_ID; record.CHECK_QUESTION_ID = entity.CHECK_QUESTION_ID;
record.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; record.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION_DETAIL;
record.HIDDEN_LEVEL = entity.HIDDEN_LEVEL; record.HIDDEN_LEVEL = entity.HIDDEN_LEVEL;
record.RECITIFY_TIME = entity.RECITIFY_TIME; record.RECITIFY_TIME = entity.RECITIFY_TIME;
record.RECITIFY_USER_ID = entity.RECITIFY_USER_ID; record.RECITIFY_USER_ID = entity.RECITIFY_USER_ID;
@ -12151,7 +12151,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_PERSON = user.NAME; record.CHECK_PERSON = user.NAME;
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID; record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser?.ID; record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = entity.REMARK; record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
record.NOTICE_CODE = entity.NOTICE_CODE; record.NOTICE_CODE = entity.NOTICE_CODE;
if (photos != null && photos.Any()) if (photos != null && photos.Any())
{ {
@ -12238,8 +12238,8 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.CHECKCONTENT = entity.CHECKCONTENT; noticeDetail.CHECKCONTENT = entity.CHECKCONTENT;
noticeDetail.CHECKPROOF = entity.CHECKPROOF; noticeDetail.CHECKPROOF = entity.CHECKPROOF;
noticeDetail.CHECKSTANDARD = entity.CHECKSTANDARD; noticeDetail.CHECKSTANDARD = entity.CHECKSTANDARD;
noticeDetail.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; noticeDetail.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION_DETAIL;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND; noticeDetail.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
noticeDetail.HIDDEN_LEVEL = entity.HIDDEN_LEVEL; noticeDetail.HIDDEN_LEVEL = entity.HIDDEN_LEVEL;
noticeDetail.HIDDEN_PLACE = entity.HIDDEN_PLACE; noticeDetail.HIDDEN_PLACE = entity.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = entity.RECITIFY_TIME; noticeDetail.RECITIFY_TIME = entity.RECITIFY_TIME;

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

@ -622,7 +622,7 @@ namespace APT.SK.WebApi.Controllers.Api
record.HIDDEN_PLACE = detail.HIDDEN_PLACE; record.HIDDEN_PLACE = detail.HIDDEN_PLACE;
record.HIDDEN_DESCRIPTION = detail.HIDDEN_DESCRIPTION; record.HIDDEN_DESCRIPTION = detail.HIDDEN_DESCRIPTION;
record.HIDDEN_LEVEL = detail.HIDDEN_LEVEL; record.HIDDEN_LEVEL = detail.HIDDEN_LEVEL;
record.RECTIFICATION_MEASURES = detail.REMARK; record.RECTIFICATION_MEASURES = detail.RECTIFICATION_MEASURES;
record.RECITIFY_TIME = detail.RECITIFY_TIME; record.RECITIFY_TIME = detail.RECITIFY_TIME;
record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID; record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = detail.ACCEPT_USER_ID; record.ACCEPT_USER_ID = detail.ACCEPT_USER_ID;

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -306,7 +306,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.CHECKCONTENT = item.CHECKCONTENT; detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF; detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD; detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION; detail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL; detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE; detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK; detail.MARK = item.MARK;
@ -501,7 +501,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.CHECKCONTENT = item.CHECKCONTENT; detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF; detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD; detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION; detail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL; detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE; detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK; detail.MARK = item.MARK;
@ -652,7 +652,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.CHECKCONTENT = item.CHECKCONTENT; detail.CHECKCONTENT = item.CHECKCONTENT;
detail.CHECKPROOF = item.CHECKPROOF; detail.CHECKPROOF = item.CHECKPROOF;
detail.CHECKSTANDARD = item.CHECKSTANDARD; detail.CHECKSTANDARD = item.CHECKSTANDARD;
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION; detail.HIDDEN_DESCRIPTION = item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL; detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE; detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK; detail.MARK = item.MARK;