From 15d77d1e9ba1c089c3c908547e33e2e1fa0c16f2 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 24 Jun 2024 10:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../government/GovEngineeringStageController.java           | 3 ++-
 .../xmgl/modules/basicdata/entity/EngineeringStage.java     | 2 +-
 .../basicdata/service/impl/EngineeringServiceImpl.java      | 2 +-
 .../basicdata/service/impl/EngineeringStageServiceImpl.java | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringStageController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringStageController.java
index 1dd0135..d958895 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringStageController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringStageController.java
@@ -139,7 +139,8 @@ public class GovEngineeringStageController {
     public Result<EngineeringStage> edit(@RequestBody EngineeringStageVo engineeringStage) {
         Result<EngineeringStage> result = new Result<EngineeringStage>();
         Engineering engineering = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery()
-                .eq(Engineering::getEngineeringName, engineeringStage.getEngineeringName()));
+                .eq(Engineering::getEngineeringName, engineeringStage.getEngineeringName())
+                .ne(Engineering::getStageId, engineeringStage.getId()));
         EngineeringStage engineeringStageEntity = engineeringStageService.getOne(Wrappers.<EngineeringStage>lambdaQuery()
                 .eq(EngineeringStage::getEngineeringName, engineeringStage.getEngineeringName())
                 .ne(EngineeringStage::getId, engineeringStage.getId()));
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringStage.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringStage.java
index da5d619..77f44c7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringStage.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/EngineeringStage.java
@@ -249,7 +249,7 @@ public class EngineeringStage implements Serializable {
      */
     @Excel(name = "项目状态（下拉框选择：未开始、进行中、已完结）", width = 15)
     @ApiModelProperty(value = "项目状态（下拉框选择：未开始、进行中、已完结）")
-    private Integer threeState;
+    private String threeState;
     /**
      * 填报人（下拉框选择：曹晓童、黄浩正、黄培峰、李燕、周韵、牟红洁、杨润韬）
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
index e4ed325..4e3fb8d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
@@ -113,7 +113,7 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
         if (engineeringVo.getDraftId() != null) {
             engineeringDraftService.removeById(engineeringVo.getDraftId());
         }
-        engineeringStageService.removeById(engineeringVo.getStageId());
+//        engineeringStageService.removeById(engineeringVo.getStageId());
 //        engineeringVo.setState(1);
         engineeringVo.setCreateTime(new Date());
         engineeringVo.setProjectSn(projectService.list().get(0).getProjectSn());
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringStageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringStageServiceImpl.java
index 25593f2..01580d0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringStageServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringStageServiceImpl.java
@@ -59,6 +59,12 @@ public class EngineeringStageServiceImpl extends ServiceImpl<EngineeringStageMap
             annexFile.setRelevanceId(engineeringStageVo.getId().toString());
         }
         annexFileService.saveBatch(engineeringStageVo.getAnnexFiles());
+        Engineering engineering = engineeringService.getOne(Wrappers.<Engineering>lambdaQuery()
+                .eq(Engineering::getStageId, engineeringStageVo.getId()));
+        if (engineering != null) {
+            engineering.setEngineeringName(engineeringStageVo.getEngineeringName());
+            engineeringService.updateById(engineering);
+        }
         return this.updateById(engineeringStageVo);
     }