From b763dbd67386c04613fe2b1545517b6e576c3d44 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: Fri, 10 Apr 2026 15:09:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=8D=E6=B5=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 2 +- .../Controllers/Api/HiddenDangerHandReportController.cs | 5 ++++- .../Controllers/Api/HiddenDangerRectifyRecordController.cs | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) 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); From fe170dbb6d7b16b6afb391957beca6574c1f04d9 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: Fri, 10 Apr 2026 15:48:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/CheckContentsController.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs index f2fc36a..87f4c03 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs @@ -51,7 +51,11 @@ namespace APT.SK.WebApi.Controllers.Api pageFilter.FilterGroup.Rules.Remove(filter); } pageFilter.Include.Add("Nav_ListCheckQuestion"); - pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law"); + pageFilter.Include.Add("Nav_ContentsBasics.Nav_Law"); + pageFilter.SelectField.Add("Nav_ProductionUnit.NAME"); + pageFilter.SelectField.Add("CHECKCONTENT"); + pageFilter.SelectField.Add("CHECK_STANDARD"); + pageFilter.SelectField.Add("JT_SYNC"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.NUM"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.DESCREPTION"); pageFilter.SelectField.Add("Nav_ListCheckQuestion.QUESTION_LEVEL");