From f8d55d7c0a4ad36143f7e8a8acd8b58ae71722a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Wed, 7 May 2025 23:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yanzhu/manage/controller/ProPlanController.java  |  2 --
 .../service/impl/ProPlanScheduleServiceImpl.java     | 12 ++++++++----
 yanzhu-ui-vue3/src/views/manage/schedule/index.vue   |  6 +++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

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<ProPlan> 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<ProPlan> 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]"
             >
               <image-preview :src="scope.row.images" :width="50" :height="50" />
             </el-badge>
@@ -256,6 +257,9 @@
         <el-form-item label="施工作业图" prop="images">
           <image-upload v-model="form.images" :limit="5" />
         </el-form-item>
+        <el-form-item label="填报时间" prop="createDate">
+          <el-date-picker v-model="form.createDate" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -318,7 +322,7 @@ const data = reactive({
     ],
     finishDate: [{ required: true, message: "完成时间不能为空", trigger: "change" }],
     description: [{ required: true, message: "施工进度描述不能为空", trigger: "blur" }],
-    images: [{ required: true, message: "施工作业图不能为空", trigger: "change" }],
+    images_1: [{ required: true, message: "施工作业图不能为空", trigger: "change" }],
   },
 });