diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 4b10f25..3e35c03 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -11571,7 +11571,7 @@ namespace APT.BaseData.Services.DomainServices record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID; record.IMPLEMENT_USER_ID = detail.RECITIFY_USER_ID; record.ACCEPT_USER_ID = acceptUser?.ID; - record.CHECK_PERSON = entity.CHECK_PERSON; + record.CHECK_PERSON = detail.CHECK_PERSON; record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID; record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID; @@ -11652,7 +11652,7 @@ namespace APT.BaseData.Services.DomainServices record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID; record.IMPLEMENT_USER_ID = detail.RECITIFY_USER_ID; record.ACCEPT_USER_ID = acceptUser?.ID; - record.CHECK_PERSON = entity.CHECK_PERSON; + record.CHECK_PERSON = detail.CHECK_PERSON; record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID; record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID; diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 2c7b389..08cdaea 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5452,6 +5452,8 @@ namespace APT.PP.WebApi.Controllers.Api record.ORG_ID = filter.OrgId; record.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID; record.APPLY_USER_ID = user.ID; + record.RECORD_USER_ID = user.ID; + record.CHECK_PERSON = user.NAME; record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; record.CHECK_TYPE_ID = item.CheckTypeId; record.PLANCHECKFREQUENCY = item.Cycle; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs index 6f57a91..dfc4a94 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs @@ -379,6 +379,7 @@ namespace APT.SK.WebApi.Controllers.Api record.STATUS = PFStandardStatus.Draft; record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID; record.CHECK_TIME = entity.CHECK_TIME; + record.CHECK_PERSON = detail.CHECK_PERSON; records.Add(record); if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any()) { @@ -629,7 +630,8 @@ namespace APT.SK.WebApi.Controllers.Api record.STATUS = PFStandardStatus.Draft; record.CHECK_TYPE_ID = notice.CHECK_TYPE_ID; record.CHECK_TIME = notice.CHECK_TIME; - record.NOTICE_CODE = notice.NOTICE_CODE; + record.NOTICE_CODE = notice.NOTICE_CODE; + record.CHECK_PERSON = detail.CHECK_PERSON; records.Add(record); if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any()) { diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs index 69bf53d..d6735c8 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs @@ -283,6 +283,7 @@ namespace APT.SK.WebApi.Controllers.Api report.CHECK_TIME = entity.CHECK_TIME; report.STATUS = PFStandardStatus.Draft; report.NOTICE_CODE = entity.NOTICE_CODE; + report.CHECK_PERSON = entity.CHECK_PERSON; //if (record.Nav_CheckRecordFiles != null && record.Nav_CheckRecordFiles.Any()) //{ // foreach (var item in record.Nav_CheckRecordFiles) @@ -475,7 +476,8 @@ namespace APT.SK.WebApi.Controllers.Api report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE; report.CHECK_TIME = record.CHECK_TIME; report.STATUS = PFStandardStatus.Draft; - report.NOTICE_CODE = record.NOTICE_CODE; + report.NOTICE_CODE = record.NOTICE_CODE; + report.CHECK_PERSON = record.CHECK_PERSON; //if (record.Nav_CheckRecordFiles != null && record.Nav_CheckRecordFiles.Any()) //{ // foreach (var item in record.Nav_CheckRecordFiles)