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 b8b3e11d..a4ad3c10 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 @@ -156,8 +156,6 @@ public class ProPlanController extends BaseController String task_predecessors_str_type = beforeTaskType.toString(); plan.setPredecessors(task_predecessors_str); plan.setTaskType(task_predecessors_str_type); - plan.setPlanStartDate(task.getActualStart()); - plan.setPlanFinishDate(task.getActualFinish()); return plan; } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java index 6b5b021f..939a88e0 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanScheduleServiceImpl.java @@ -67,21 +67,24 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService if(proPlanSchedule.getSchedulePercent()!=100L){ proPlanSchedule.setFinishDate(null); } + if(proPlanSchedule.getCreateDate()==null){ + proPlanSchedule.setCreateDate(DateUtils.getNowDate()); + } proPlanSchedule.setCreateBy(SecurityContextHolder.getUserName()); - proPlanSchedule.setCreateDate(DateUtils.getNowDate()); int res = proPlanScheduleMapper.insertProPlanSchedule(proPlanSchedule); if(res>0){ ProPlan plan = proPlanMapper.selectProPlanById(proPlanSchedule.getPlanId()); plan.setScheduleNode(proPlanSchedule.getSchedulePercent().toString()); + plan.setUpdateTime(proPlanSchedule.getCreateDate()); if(proPlanSchedule.getSchedulePercent()>=100){ if(plan.getStartDate()==null){ - plan.setStartDate(DateUtils.getNowDate()); + plan.setStartDate(proPlanSchedule.getCreateDate()); } plan.setFinishDate(proPlanSchedule.getFinishDate()); RecursionEditFinishDate(plan); }else{ if(plan.getStartDate()==null){ - plan.setStartDate(DateUtils.getNowDate()); + plan.setStartDate(proPlanSchedule.getCreateDate()); RecursionEditStartDate(plan); }else{ RecursionEditFinishDate(plan); @@ -282,9 +285,10 @@ public class ProPlanScheduleServiceImpl implements IProPlanScheduleService List brothers = proPlanMapper.selectProPlanBrothers(plan.getProjectId(),plan.getParentId()); if(brothers.size()==0){ ProPlan entity = proPlanMapper.selectProPlanByParams(plan.getProjectId(),plan.getParentId()); + entity.setUpdateTime(plan.getUpdateTime()); if(entity!=null){ if(entity.getStartDate()==null){ - entity.setStartDate(DateUtils.getNowDate()); + entity.setStartDate(entity.getUpdateTime()); } List belows = proPlanMapper.selectProPlanBelows(entity.getProjectId(),entity.getTaskId()); Float Finished = 0.0F; diff --git a/yanzhu-ui-vue3/src/views/manage/schedule/index.vue b/yanzhu-ui-vue3/src/views/manage/schedule/index.vue index 44da4544..1ee7e507 100644 --- a/yanzhu-ui-vue3/src/views/manage/schedule/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/schedule/index.vue @@ -119,6 +119,7 @@ :value="scope.row.images.split(',').length" type="primary" class="item" + :offset="[2, 8]" > @@ -256,6 +257,9 @@ + + +