From 347bd92b69465e10dd52cf3c44e4070c9e297d0f Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Mon, 10 Nov 2025 19:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E5=92=8C=E5=8F=98=E6=9B=B4=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=B0=E7=AB=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/XzdCsContractChangeServiceImpl.java  | 17 ++++++-----
 .../XzdCsContractInformationServiceImpl.java  | 29 +++++++++++--------
 .../impl/XzdCsContractSuspendServiceImpl.java |  3 +-
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java
index 9b69516e..6759193e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java
@@ -31,6 +31,7 @@ import org.dromara.xzd.domain.XzdContractClause;
 import org.dromara.xzd.domain.XzdDeductionItems;
 import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
 import org.dromara.xzd.enums.XzdClassEnum;
+import org.dromara.xzd.enums.ZxdEnum;
 import org.dromara.xzd.service.impl.XzdBusinessChangeServiceImpl;
 import org.dromara.xzd.service.impl.XzdBusinessSealServiceImpl;
 import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl;
@@ -176,7 +177,7 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
             if (byId.getHtzt().equals("已终止")){
                 throw new RuntimeException("该合同已终止");
             }
-            byId.setHtzt("已变更");
+            byId.setHtzt(ZxdEnum.HETONGZTBG.getTypeValue());
             xzdCsContractInformationService.updateById(byId);
         }
 
@@ -394,16 +395,18 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
 
         //印章信息
         LambdaQueryWrapper<XzdBusinessChange> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper4.select(XzdBusinessChange::getBusinessId);
         lambdaQueryWrapper4.eq(XzdBusinessChange::getContractChangeId, vo.getId());
+        lambdaQueryWrapper4.eq(XzdBusinessChange::getType, "11");
         List<XzdBusinessChange> list3 = xzdBusinessChangeService.list(lambdaQueryWrapper4);
-        for (XzdBusinessChange businessChange : list3) {
-            XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
-            if (sealVo != null){
-                businessChange.setSealName(sealVo.getYzName());
+        if (list3 != null && !list3.isEmpty()){
+            for (XzdBusinessChange businessChange : list3) {
+                XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
+                if (sealVo != null){
+                    businessChange.setSealName(sealVo.getYzName());
+                }
             }
+            vo.setSealInfo(list3);
         }
-        vo.setSealInfo(list3);
     }
 
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java
index 577b3c87..f5fda8da 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java
@@ -34,6 +34,7 @@ import org.dromara.xzd.domain.XzdContractClause;
 import org.dromara.xzd.domain.XzdDeductionItems;
 import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
 import org.dromara.xzd.enums.XzdClassEnum;
+import org.dromara.xzd.enums.ZxdEnum;
 import org.dromara.xzd.service.impl.XzdBusinessChangeServiceImpl;
 import org.dromara.xzd.service.impl.XzdBusinessSealServiceImpl;
 import org.dromara.xzd.service.impl.XzdContractClauseServiceImpl;
@@ -119,16 +120,18 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
 
         //印章信息
         LambdaQueryWrapper<XzdBusinessChange> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper4.select(XzdBusinessChange::getBusinessId);
         lambdaQueryWrapper4.eq(XzdBusinessChange::getContractChangeId, vo.getId());
+        lambdaQueryWrapper4.eq(XzdBusinessChange::getType, "10");
         List<XzdBusinessChange> list3 = xzdBusinessChangeService.list(lambdaQueryWrapper4);
-        for (XzdBusinessChange businessChange : list3) {
-            XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
-            if (sealVo != null){
-                businessChange.setSealName(sealVo.getYzName());
+        if (list3 != null && !list3.isEmpty()){
+            for (XzdBusinessChange businessChange : list3) {
+                XzdBusinessSealVo sealVo = xzdBusinessSealService.queryById(businessChange.getBusinessId());
+                if (sealVo != null){
+                    businessChange.setSealName(sealVo.getYzName());
+                }
             }
+            vo.setSealInfo(list3);
         }
-        vo.setSealInfo(list3);
     }
 
     /**
@@ -219,7 +222,7 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
         validEntityBeforeSave(add);
         String banBen = BatchNumberGenerator.generateBatchNumber("ZHFWHT-");
         add.setContractCode(banBen);
-        add.setHtzt("正常");
+        add.setHtzt(ZxdEnum.HETONGZTYS.getTypeValue());
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -285,7 +288,7 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
             throw new ServiceException("找不到要修改数据！！！");
         }
 
-        if (old.getHtzt().equals("已终止")){
+        if (old.getHtzt().equals(ZxdEnum.HETONGZTZZ.getTypeValue())){
             throw new RuntimeException("该合同已被终止");
         }
 
@@ -344,11 +347,13 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
         }
 
         //印章信息
-        for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
-            xzdBusinessChange.setContractChangeId(update.getId());
-            xzdBusinessChange.setType("10");
+        if (bo.getSealInfo() != null && !bo.getSealInfo().isEmpty()) {
+            for (XzdBusinessChange xzdBusinessChange : bo.getSealInfo()) {
+                xzdBusinessChange.setContractChangeId(update.getId());
+                xzdBusinessChange.setType("10");
+            }
+            xzdBusinessChangeService.saveBatch(bo.getSealInfo());
         }
-        xzdBusinessChangeService.saveBatch(bo.getSealInfo());
 
         return baseMapper.updateById(update) > 0;
     }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java
index 88d95f4a..019afa5d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java
@@ -21,6 +21,7 @@ import org.dromara.xzd.comprehensive.domain.bo.XzdCsContractSuspendBo;
 import org.dromara.xzd.comprehensive.domain.vo.XzdCsContractSuspendVo;
 import org.dromara.xzd.comprehensive.mapper.XzdCsContractSuspendMapper;
 import org.dromara.xzd.comprehensive.service.IXzdCsContractSuspendService;
+import org.dromara.xzd.enums.ZxdEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
@@ -127,7 +128,7 @@ public class XzdCsContractSuspendServiceImpl extends ServiceImpl<XzdCsContractSu
 
         XzdCsContractInformation byId = xzdCsContractInformationService.getById(bo.getContractInformationId());
         if (byId != null){
-            byId.setHtzt("已终止");
+            byId.setHtzt(ZxdEnum.HETONGZTZZ.getTypeValue());
             xzdCsContractInformationService.updateById(byId);
         }