From d5b7a5542341ff7fff21cc82b8a582a9fd0f2e93 Mon Sep 17 00:00:00 2001
From: gejunhao <1421207006@qq.com>
Date: Tue, 31 Dec 2024 13:53:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A2=AB=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huzhou/controller/HuzhouProjectController.java        | 8 +++++++-
 .../service/impl/HuzhouMergesplitinfoServiceImpl.java     | 1 +
 .../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
index f870abe..8dc224d 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
+++ b/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);
     }
 
     /**
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 f3537bf..e7ce3a5 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
@@ -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-作废
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index b49f4d0..5696a42 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/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;
     }