diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java index f8ba98d6..8c0ab848 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java @@ -92,11 +92,11 @@ public class ProPlanController extends BaseController //subTask.setId(proPlan.getTaskId().intValue()); subTask.setOutlineLevel(proPlan.getTaskOutlineLevel().intValue()); subTask.setGuid(proPlan.getTaskUniqueId()); - if(proPlan.getStartDate()!=null){ - subTask.setStart(proPlan.getStartDate()); + if(proPlan.getPlanStartDate()!=null){ + subTask.setStart(proPlan.getPlanStartDate()); } - if(proPlan.getFinishDate()!=null){ - subTask.setFinish(proPlan.getFinishDate()); + if(proPlan.getPlanFinishDate()!=null){ + subTask.setFinish(proPlan.getPlanFinishDate()); } } @@ -141,6 +141,8 @@ public class ProPlanController extends BaseController plan.setTaskDuation(task.getDuration().toDouble()); plan.setPlanStartDate(task.getStart()); plan.setPlanFinishDate(task.getFinish()); + plan.setStartDate(task.getStart()); + plan.setFinishDate(task.getFinish()); TaskCollection task_predecessors = task.getPredecessors(); //4. 获取前置任务(任务流) StringBuilder beforeTaskId = new StringBuilder();