调整培训模块触发

This commit is contained in:
wjn 2024-04-12 11:32:49 +08:00
parent 0b2c338025
commit 645cd494cd
2 changed files with 3 additions and 3 deletions

View File

@ -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)
{

View File

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