From 62036cc09bbe5346868b98fcc373910b55da08b9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 十二月 2024 14:04:49 +0800
Subject: [PATCH] bug修改

---
 business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
index a202490..b44304c 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanInfoServiceImpl.java
@@ -139,45 +139,55 @@
             return Result.error("璇烽�夋嫨瑕佹坊鍔犵殑璁″垝椤�");
         }}
         // 鍒犻櫎鍘熸湁璁板綍
-        new LambdaUpdateChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getProjectPlanRecordId, request.getProjectPlanRecordId()).remove();
+        new LambdaUpdateChainWrapper<>(baseMapper)
+                .eq(ProjectPlanInfo::getProjectPlanRecordId, request.getProjectPlanRecordId())
+                .set(ProjectPlanInfo::getDeleted, 1)
+                .update();
         // 鎵归噺鎻掑叆鏂拌褰�
         List<ProjectPlanInfo> list = new ArrayList<>();
         request.getAddList().forEach(item -> {
             ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
             projectPlanInfo.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue());
-            projectPlanInfo.setTitle(item.getTitle());
-            projectPlanInfo.setProgressStatus(0);
-            projectPlanInfo.setStartTime(item.getStartTime());
-            projectPlanInfo.setEndTime(item.getEndTime());
+            projectPlanInfo.setTitle(item.getTitle()); // 璁″垝椤规爣棰�
+            projectPlanInfo.setPlanStatus(0); // 璁″垝椤圭姸鎬佷负鏈紑濮�
+            projectPlanInfo.setProgressStatus(0); // 璁″垝椤硅繘搴︿负鏈紑濮�
+            projectPlanInfo.setStartTime(item.getStartTime()); // 璁″垝椤瑰紑濮嬫椂闂�
+            projectPlanInfo.setEndTime(item.getEndTime()); // 璁″垝椤圭粨鏉熸椂闂�
+            projectPlanInfo.setDeleted(0);// 鏈垹闄�
             list.add(projectPlanInfo);
         });
-        baseMapper.batchInsert(list);
+        list.stream().forEach(i -> {
+            baseMapper.insert(i);
+        });
         // 鏇存柊璁″垝璁板綍鐨勬姇璧�,浠ュ強涓婃姤鐘舵��
         new LambdaUpdateChainWrapper<>(projectPlanRecordMapper)
                 .eq(ProjectPlanRecord::getId, request.getProjectPlanRecordId())
                 .set(ProjectPlanRecord::getActualInvest, request.getActualInvest())
                 .set(ProjectPlanRecord::getReportStatus, 0)
                 .update();
+
         // 鏂板涓�鏉″鏍歌褰�
         ProjectPlanExamineRecord item = new ProjectPlanExamineRecord();
         item.setProjectPlanRecordId(request.getProjectPlanRecordId().longValue());
-        item.setEventType(0);
-        item.setGmtCreate(new Date());
-        item.setDeleted(0);
+        item.setEventType(0); // 璁″垝涓婃姤
+        item.setGmtCreate(new Date());  // 鍒涘缓鏃堕棿
+        item.setDeleted(0); // 鏈垹闄�
         list.stream().forEach(i -> {
             item.setProjectPlanInfoId(i.getId().longValue());
-//            projectPlanExamineRecordMapper.insert(item);
             projectPlanExamineRecordMapper.insertOne(item);
         });
         return Result.ok("娣诲姞鎴愬姛");
     }
 
     @Override
-    public Result savePlanInfo(ProjectPlanInfo item) {
-        item.setProgressStatus(0);
+    public Result savePlanInfo(ProjectPlanInfo item, Integer planRecordId) {
+        item.setProjectPlanRecordId(planRecordId.longValue()); // 椤圭洰璁″垝璁板綍id
+        item.setProgressStatus(0); // 鏈紑濮�
+        item.setDeleted(0); // 鏈垹闄�
+        item.setPlanStatus(0); // 鏈鏍�
         // 鍒ゆ柇id鏄惁瀛樺湪锛屽瓨鍦ㄥ垯鏇存柊锛屼笉瀛樺湪鍒欐柊澧�
         if (item.getId() == null) {
-            baseMapper.insertOne(item);
+            baseMapper.insert(item);
         } else {
             new LambdaUpdateChainWrapper<>(baseMapper).eq(ProjectPlanInfo::getId, item.getId())
                     .set(ProjectPlanInfo::getTitle, item.getTitle())
@@ -209,4 +219,28 @@
         projectPlanExamineRecordMapper.insertOne(item);
         return Result.ok("寤舵湡鎴愬姛");
     }
+
+    @Override
+    public Result resubmitPlanInfo(ProjectPlanInfoForm form) {
+        // 鏇存柊閲嶆柊涓婃姤鍚庣殑鍐呭
+        new LambdaUpdateChainWrapper<>(baseMapper)
+                .eq(ProjectPlanInfo::getId, form.getId())
+                .set(ProjectPlanInfo::getTitle, form.getTitle())
+                .set(ProjectPlanInfo::getStartTime, form.getStartTime())
+                .set(ProjectPlanInfo::getEndTime, form.getEndTime())
+                .set(ProjectPlanInfo::getPlanStatus, 0) // 灏嗚璁″垝椤硅缃负鏈鏍哥殑鐘舵��
+                .update();
+
+        // 鏂板涓�鏉¤鍒掍笂鎶ョ殑瀹℃牳璁板綍
+        ProjectPlanExamineRecord item = new ProjectPlanExamineRecord();
+        item.setProjectPlanRecordId(form.getProjectPlanRecordId().longValue());
+        item.setProjectPlanInfoId(form.getId().longValue());
+        item.setEventType(0); // 璁″垝涓婃姤
+        item.setDelayStartTime(form.getStartTime());
+        item.setDelayEndTime(form.getEndTime());
+        item.setGmtCreate(new Date());
+        item.setDeleted(0); // 鏈垹闄�
+        projectPlanExamineRecordMapper.insertOne(item);
+        return Result.ok("閲嶆柊涓婃姤鎴愬姛");
+    }
 }

--
Gitblit v1.8.0