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 @@ +