From 5bf667bf1e50c0f339737c269218f4affb9797a9 Mon Sep 17 00:00:00 2001
From: gejunhao <1421207006@qq.com>
Date: Mon, 30 Dec 2024 17:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E9=A1=B9=E7=9B=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouMergesplitinfoServiceImpl.java        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java
index 17f0dbd..f3537bf 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java
@@ -70,11 +70,13 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
         huzhouProjectinfo.setPayamount2023Money(0.0);
         huzhouProjectinfo.setPayamount2024Money(0.0);
         huzhouProjectinfo.setPayamount2025Money(0.0);
-        huzhouProjectinfo.setStage("-2");//0
+        // 新合并的项目设置为已停止 并且算已入库
+        huzhouProjectinfo.setStage("-2");
+        huzhouProjectinfo.setType("1");
         projectinfoService.save(huzhouProjectinfo);
         userprojectService.saveFromProject(huzhouProjectinfo, "0");
-        for (String oldprojectid :mergesplitinfoVo.getProjectids()
-             ) {
+        for (String oldprojectid : mergesplitinfoVo.getProjectids()
+        ) {
             HuzhouProjectinfo projectinfo = projectinfoService.getById(oldprojectid);
             HuzhouMergesplitinfo huzhouMergesplitinfo = new HuzhouMergesplitinfo();
             BeanUtils.copyProperties(projectinfo, huzhouMergesplitinfo);
@@ -223,6 +225,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             huzhouProjectinfo.setId(projectid);
             projectinfoService.updateById(huzhouProjectinfo);
         }
+        // 1-同意 2-撤回 3-作废
         if("3".equals(flag)){
             processinfoService.modifyStatusByProjectId(projectid,"0",processName);
             return ;
@@ -240,7 +243,8 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             List<HuzhouMergesplitinfo> mergesplitinfos = mergesplitinfoMapper.selectList(lambdaQueryWrapper);
             for (HuzhouMergesplitinfo mergesplitinfo : mergesplitinfos) {
                 HuzhouProjectinfo oldpj = projectinfoService.getById(mergesplitinfo.getId());
-                oldpj.setStage("-1");
+                //oldpj.setStage("-1");
+                oldpj.setStage("0.1");
                 projectinfoService.updateById(oldpj);
             }
             processinfoService.modifyStatusByProjectId(projectid,"2",processName);