From a98bcd7422b8ecf40954f960d00fab22dedb1dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 13 Jul 2026 11:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=85=B7=E4=BD=93=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=EF=BC=8C=E6=95=B4=E6=94=B9=E6=8E=AA=E6=96=BD=E5=85=B7?= =?UTF-8?q?=E4=BD=93=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 16 ++++++++-------- .../Api/HiddenDangerRectifyNoticeController.cs | 2 +- .../SecurityInspectionRecordSummaryController.cs | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 3639927..1ebc8a3 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -11824,8 +11824,8 @@ namespace APT.BaseData.Services.DomainServices noticeDetail.HIDDEN_PLACE = detail.HIDDEN_PLACE; noticeDetail.RECITIFY_TIME = detail.RECITIFY_TIME; noticeDetail.RECITIFY_USER_ID = detail.RECITIFY_USER_ID; - noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND; - noticeDetail.REMARK = detail.REMARK; + noticeDetail.RECTIFICATION_MEASURES = detail.REMARK; + //noticeDetail.REMARK = detail.REMARK; noticeDetails.Add(noticeDetail); 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.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_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.RECITIFY_TIME = entity.RECITIFY_TIME; record.RECITIFY_USER_ID = entity.RECITIFY_USER_ID; @@ -12086,7 +12086,7 @@ namespace APT.BaseData.Services.DomainServices record.CHECK_PERSON = user.NAME; record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID; record.ACCEPT_USER_ID = acceptUser?.ID; - record.RECTIFICATION_MEASURES = entity.REMARK; + record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES; record.NOTICE_CODE = entity.NOTICE_CODE; if (photos != null && photos.Any()) { @@ -12142,7 +12142,7 @@ namespace APT.BaseData.Services.DomainServices record.HIDDEN_PLACE = entity.HIDDEN_PLACE; record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_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.RECITIFY_TIME = entity.RECITIFY_TIME; record.RECITIFY_USER_ID = entity.RECITIFY_USER_ID; @@ -12151,7 +12151,7 @@ namespace APT.BaseData.Services.DomainServices record.CHECK_PERSON = user.NAME; record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID; record.ACCEPT_USER_ID = acceptUser?.ID; - record.RECTIFICATION_MEASURES = entity.REMARK; + record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES; record.NOTICE_CODE = entity.NOTICE_CODE; if (photos != null && photos.Any()) { @@ -12238,8 +12238,8 @@ namespace APT.BaseData.Services.DomainServices noticeDetail.CHECKCONTENT = entity.CHECKCONTENT; noticeDetail.CHECKPROOF = entity.CHECKPROOF; noticeDetail.CHECKSTANDARD = entity.CHECKSTANDARD; - noticeDetail.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; - noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND; + noticeDetail.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION_DETAIL; + noticeDetail.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES; noticeDetail.HIDDEN_LEVEL = entity.HIDDEN_LEVEL; noticeDetail.HIDDEN_PLACE = entity.HIDDEN_PLACE; noticeDetail.RECITIFY_TIME = entity.RECITIFY_TIME; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs index 1ac1662..c337a90 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs @@ -622,7 +622,7 @@ namespace APT.SK.WebApi.Controllers.Api record.HIDDEN_PLACE = detail.HIDDEN_PLACE; record.HIDDEN_DESCRIPTION = detail.HIDDEN_DESCRIPTION; 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_USER_ID = detail.RECITIFY_USER_ID; record.ACCEPT_USER_ID = detail.ACCEPT_USER_ID; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs index d37e849..57f2869 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs @@ -306,7 +306,7 @@ namespace APT.SK.WebApi.Controllers.Api detail.CHECKCONTENT = item.CHECKCONTENT; detail.CHECKPROOF = item.CHECKPROOF; 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_PLACE = item.HIDDEN_PLACE; detail.MARK = item.MARK; @@ -501,7 +501,7 @@ namespace APT.SK.WebApi.Controllers.Api detail.CHECKCONTENT = item.CHECKCONTENT; detail.CHECKPROOF = item.CHECKPROOF; 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_PLACE = item.HIDDEN_PLACE; detail.MARK = item.MARK; @@ -652,7 +652,7 @@ namespace APT.SK.WebApi.Controllers.Api detail.CHECKCONTENT = item.CHECKCONTENT; detail.CHECKPROOF = item.CHECKPROOF; 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_PLACE = item.HIDDEN_PLACE; detail.MARK = item.MARK;