修改新增合并项目逻辑

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);