diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index eed41d5..9d1ef4c 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -11639,8 +11639,8 @@ namespace APT.BaseData.Services.DomainServices record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID; record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now; record.NOTICE_CODE = entity.NOTICE_CODE; - record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND; - record.REMARK = detail.REMARK; + //record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND; + record.RECTIFICATION_MEASURES = detail.REMARK; records.Add(record); if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any()) { @@ -11721,8 +11721,8 @@ namespace APT.BaseData.Services.DomainServices record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID; record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now; record.NOTICE_CODE = entity.NOTICE_CODE; - record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND; - record.REMARK = detail.REMARK; + record.RECTIFICATION_MEASURES = detail.REMARK; + //record.REMARK = detail.REMARK; records.Add(record); if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any()) { @@ -12086,9 +12086,8 @@ 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 = hidDescrip?.DEMAND; - record.NOTICE_CODE = entity.NOTICE_CODE; - record.REMARK = entity.REMARK; + record.RECTIFICATION_MEASURES = entity.REMARK; + record.NOTICE_CODE = entity.NOTICE_CODE; if (photos != null && photos.Any()) { foreach (var item in photos) @@ -12152,9 +12151,8 @@ 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 = hidDescrip?.DEMAND; + record.RECTIFICATION_MEASURES = entity.REMARK; record.NOTICE_CODE = entity.NOTICE_CODE; - record.REMARK = entity.REMARK; if (photos != null && photos.Any()) { foreach (var item in photos) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs index d10cabc..1ac1662 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs @@ -380,7 +380,6 @@ namespace APT.SK.WebApi.Controllers.Api record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; record.CHECK_TIME = entity.CHECK_TIME; record.CHECK_PERSON = detail.CHECK_PERSON; - record.REMARK = detail.REMARK; records.Add(record); if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any()) { @@ -623,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.RECTIFICATION_MEASURES; + record.RECTIFICATION_MEASURES = detail.REMARK; record.RECITIFY_TIME = detail.RECITIFY_TIME; record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID; record.ACCEPT_USER_ID = detail.ACCEPT_USER_ID; @@ -633,7 +632,6 @@ namespace APT.SK.WebApi.Controllers.Api record.CHECK_TIME = notice.CHECK_TIME; record.NOTICE_CODE = notice.NOTICE_CODE; record.CHECK_PERSON = detail.CHECK_PERSON; - record.REMARK = detail.REMARK; records.Add(record); if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any()) {