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(); var yearTrainPlanContent = new List(); var depPlan = GetEntity(id, new string[] { "Nav_DepTrainPlanDetail.Nav_DepTrainPlanContent" }); - var yearTrainPlan = GetEntity(t => t.PLAN_YEAR == depPlan.PLAN_YEAR&&t.STATUS== PFStandardStatus.Draft); + var yearTrainPlan = GetEntity(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 {