From d44d3c46e27763d6d159b736731b061388798dd7 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, 29 Jun 2026 16:59:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9D=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 5 +++-- APT.MicroApi/APT.FO.WebApi/APT.FO.WebApi.csproj | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index bededf9..3639927 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -14091,6 +14091,7 @@ namespace APT.BaseData.Services.DomainServices { var entity = this.GetEntity(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID); entity.STATUS = PFStandardStatus.Archived; + var plan = this.GetEntity(t => t.ID == entity.IDENTIFY_EVALUATION_PLAN_ID); //entity.END_DATE = DateTime.Now; //触发评估表 List notices = new List(); @@ -14170,8 +14171,8 @@ namespace APT.BaseData.Services.DomainServices result.APPLY_USER_ID = bm.APPLY_USER_ID; result.APPLY_DEPARTMENT_ID = bm.APPLY_DEPARTMENT_ID; result.YEAR = entity.YEAR; - result.START_DATE = entity.START_DATE; - result.END_DATE = entity.END_DATE; + result.START_DATE = plan?.START_DATE; + result.END_DATE = plan?.EVALUATION_END_DATE; result.REQUIRE_ID = requre?.ID; result.ISCOMPANY = bm.ISCOMPANY; results.Add(result); diff --git a/APT.MicroApi/APT.FO.WebApi/APT.FO.WebApi.csproj b/APT.MicroApi/APT.FO.WebApi/APT.FO.WebApi.csproj index 199ec63..110ef55 100644 --- a/APT.MicroApi/APT.FO.WebApi/APT.FO.WebApi.csproj +++ b/APT.MicroApi/APT.FO.WebApi/APT.FO.WebApi.csproj @@ -107,6 +107,7 @@ +