From 645cd494cd9c483b246acede18b9f7737567bf2b Mon Sep 17 00:00:00 2001
From: wjn <xmwjn@qq.com>
Date: Fri, 12 Apr 2024 11:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=B9=E8=AE=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/PF/PFApproveCallBackSEService.cs                 | 2 +-
 APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs
index 178802c..5265868 100644
--- a/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs
+++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackSEService.cs
@@ -51,7 +51,7 @@ namespace APT.BaseData.Services.DomainServices
             var yearTrainPlanDetail = new List<T_SE_YEAR_TRAIN_PLAN_DETAIL>();
             var yearTrainPlanContent = new List<T_SE_YEAR_TRAIN_PLAN_CONTENT>();
             var depPlan = GetEntity<T_SE_DEP_TRAIN_PLAN>(id, new string[] { "Nav_DepTrainPlanDetail.Nav_DepTrainPlanContent" });
-            var yearTrainPlan = GetEntity<T_SE_YEAR_TRAIN_PLAN>(t => t.PLAN_YEAR == depPlan.PLAN_YEAR&&t.STATUS== PFStandardStatus.Draft);
+            var yearTrainPlan = GetEntity<T_SE_YEAR_TRAIN_PLAN>(t => t.PLAN_YEAR == depPlan.PLAN_YEAR);
             var addyearTrainPlan = false;
             if (yearTrainPlan == null)
             {
diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
index 1095998..1a85246 100644
--- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
+++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
@@ -785,12 +785,12 @@ namespace APT.PP.WebApi.Controllers.Api.PP
             {
                 if (config.DEP_TRAIN_PLAN_START_TIME != null)
                 {
-                    startTime = config.DEP_TRAIN_PLAN_START_TIME.Value;
+                    startTime = new DateTime(dt.Year, config.DEP_TRAIN_PLAN_START_TIME.Value.Month, config.DEP_TRAIN_PLAN_START_TIME.Value.Day);
                     mm = startTime.Month;
                     dd = startTime.Day;
                     if (config.DEP_TRAIN_PLAN_END_TIME != null)
                     {
-                        endTime = config.DEP_TRAIN_PLAN_END_TIME.Value;
+                        endTime = new DateTime(dt.Year, config.DEP_TRAIN_PLAN_END_TIME.Value.Month, config.DEP_TRAIN_PLAN_END_TIME.Value.Day);
                     }
                     else
                     {