修改被选中合并项目状态

huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java

@@ -157,7 +157,13 @@ public class HuzhouProjectController {
     @GetMapping("/queryContractSignIsFinish")
     public Result<?> queryContractSignIsFinish(String projectid){
         Boolean flag =  projectinfoService.queryContractSignIsFinish(projectid);
-        return Result.OK(flag);
+        String msg = "";
+        if (flag){
+             msg = "合同签订阶段已完成";
+        }else {
+             msg = "合同签订阶段未完成";
+        }
+        return Result.OK(msg,flag);
     }
 
     /**

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouMergesplitinfoServiceImpl.java

@@ -223,6 +223,7 @@ public class HuzhouMergesplitinfoServiceImpl extends ServiceImpl<HuzhouMergespli
             userprojectService.removeByProjectId(projectid,"0");
             userprojectService.saveFromProject(huzhouProjectinfo,"0");
             huzhouProjectinfo.setId(projectid);
+            huzhouProjectinfo.setStage("0.1");
             projectinfoService.updateById(huzhouProjectinfo);
         }
         // 1-同意 2-撤回 3-作废

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@@ -2539,10 +2539,10 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         HuzhouPlaninfo huzhouPlaninfo = planinfoService.list(queryWrapper).get(0);
         String flag = huzhouPlaninfo.getIsfinish();
         if (CommonConstant.PRO_PLAN_FINISHED.equals(flag)){
-            log.info("合同签订阶段已完成--project_id：{}", projectid);
+            log.info("合同签订阶段已完成 ", projectid);
             return true;
         }
-        log.info("合同签订阶段未完成--project_id：{} ", projectid);
+        log.info("合同签订阶段 --> 未完成! ");
         return false;
     }