2134
This commit is contained in:
parent
3b2e9c3730
commit
1a932be031
@ -80,6 +80,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
|
|||||||
foreach (var item in ListPlanDetail)
|
foreach (var item in ListPlanDetail)
|
||||||
{
|
{
|
||||||
item.DATE_TRAIN = Convert.ToDateTime(entity.YEAR + "-" + item.MONTH + "-01 00:00:00");
|
item.DATE_TRAIN = Convert.ToDateTime(entity.YEAR + "-" + item.MONTH + "-01 00:00:00");
|
||||||
|
item.Nav_TrainTypeEnum = null;//待测试 是否会影响 TYPE_ID
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ListPlanDetail != null && ListPlanDetail.Count() > 0)
|
if (ListPlanDetail != null && ListPlanDetail.Count() > 0)
|
||||||
@ -203,7 +204,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
|
|||||||
result.LAUNCH_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
|
result.LAUNCH_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
|
||||||
result.DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
|
result.DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
|
||||||
result.LAUNCH_TIME = DateTime.Now;
|
result.LAUNCH_TIME = DateTime.Now;
|
||||||
var detail = GetEntities<T_SE_TRAIN_PLAN_DETAIL>(e => e.DATE_TRAIN >= dtMin && e.DATE_TRAIN <= dtMax && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID && !e.IS_DELETED && e.STATUS != PFStandardStatus.Draft && e.Nav_Plan.STATUS == PFStandardStatus.Archived, null, "Nav_Plan").ToList();
|
var detail = GetEntities<T_SE_TRAIN_PLAN_DETAIL>(e => e.DATE_TRAIN >= dtMin && e.DATE_TRAIN <= dtMax && e.DEPARTMENT_ID.HasValue && e.DEPARTMENT_ID.Value == APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID && !e.IS_DELETED && e.STATUS != PFStandardStatus.Draft && e.Nav_Plan.STATUS == PFStandardStatus.Archived, null, "Nav_Plan", "Nav_TrainTypeEnum").ToList();
|
||||||
if (detail != null && detail.Count() > 0)
|
if (detail != null && detail.Count() > 0)
|
||||||
{
|
{
|
||||||
detail = detail.OrderBy(e => e.DATE_TRAIN).ToList();
|
detail = detail.OrderBy(e => e.DATE_TRAIN).ToList();
|
||||||
@ -221,6 +222,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
|
|||||||
item.DEPARTMENT_ID = null;
|
item.DEPARTMENT_ID = null;
|
||||||
item.STATUS = PFStandardStatus.Draft;
|
item.STATUS = PFStandardStatus.Draft;
|
||||||
item.Nav_Plan = null;
|
item.Nav_Plan = null;
|
||||||
|
item.TYPE_ID = item.TYPE_ID;
|
||||||
|
item.Nav_TrainTypeEnum = item.Nav_TrainTypeEnum;
|
||||||
}
|
}
|
||||||
result.Nav_ListPlanDetail = detail;
|
result.Nav_ListPlanDetail = detail;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user