diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 1ebf06d..832334e 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -11935,7 +11935,7 @@ namespace APT.BaseData.Services.DomainServices } else { - var entity = this.GetEntity(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Report", "Nav_Reasons", "Nav_Files"); + var entity = this.GetEntity(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_ApplyUser", "Nav_Report", "Nav_Reasons", "Nav_Files"); entity.STATUS = PFStandardStatus.Archived; var photos = this.GetEntities(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, new BaseFilter(entity.ORG_ID)); var users = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole"); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs index 02a8616..d3c1f5d 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs @@ -88,7 +88,8 @@ namespace APT.SK.WebApi.Controllers.Api { sendUser = depart.USER_ID; } - var userName = this.GetEntity(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && sendUser == t.ID); + var userName = this.GetEntity(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && sendUser == t.ID, "Nav_Department"); + var checkType = this.GetEntity(t => t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.NAME == "巡回检查"); confirm = new T_SK_HIDDEN_DANGER_CONFIRM(); confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID; confirm.ORG_ID = entity.ORG_ID; @@ -100,6 +101,8 @@ namespace APT.SK.WebApi.Controllers.Api confirm.HIDDEN_PLACE = entity.HIDDEN_PLACE; confirm.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; confirm.NOTICE_CODE = entity.NOTICE_CODE; + confirm.CHECK_TYPE_ID = checkType?.ID; + confirm.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)userName?.Nav_Department?.DEPARTMENT_TYPE; if (files != null && files.Any()) { foreach (var file in files) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs index ab6fedb..5171ff2 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs @@ -307,6 +307,7 @@ namespace APT.SK.WebApi.Controllers if (record.ACCEPT_USER_ID != null) { record.STATUS = PFStandardStatus.Sign; + record.ACCEPT_RESULTE = SKAcceptResultEnum.Yes; //var departName = this.GetEntity(t => t.ID == record.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME; var UserNames = new List(); var user = this.GetEntity(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == record.ACCEPT_USER_ID);