From a07139c573f1512b6796b8b34fe3f9e415bebcdd Mon Sep 17 00:00:00 2001
From: zhuangdashia <cos35507550@163.com>
Date: Tue, 14 Oct 2025 11:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E8=B4=B9:=E6=88=B7=E5=8F=B7+=E6=9C=88?=
 =?UTF-8?q?=E4=BB=BD=E6=A0=A1=E9=AA=8C=20=E7=BD=9A=E6=B2=A1=E6=AC=BE?=
 =?UTF-8?q?=E9=AA=8C=E9=87=8Dbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mps/service/impl/MpsMarketServiceImpl.java   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
index 2c151e3..1215e35 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java
@@ -225,7 +225,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
         Set<String> set = new HashSet<>();
         set.add("BIZ032");//公积金缴纳账户
         set.add("BIZ020");//代收交警罚没款
-        set.add("BIZ022");//代收水费
+//        set.add("BIZ022");//代收水费
         set.add("BIZ021");//代收电费
         set.add("BIZ009");//磁条卡更换登记
         Set<String> set1 = new HashSet<>();
@@ -245,7 +245,17 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
             if (!result.isEmpty()) {
                 throw new ServiceException("当前年度该取暖费户号已存在！");
             }
-        } else if (set1.contains(entity.getSubcategoryId())) {
+        } else if ("BIZ022".equals(entity.getSubcategoryId())) {
+            //水费 不校验身份证，户号+月份不能重 月份取entry_date前7位
+            MpsMarket mpsMarket = new MpsMarket();
+            mpsMarket.setHeatingNo(entity.getHeatingNo());
+            LambdaQueryWrapper<MpsMarket> lqw = new LambdaQueryWrapper<>(mpsMarket);
+            lqw.like(StringUtils.isNotEmpty(entity.getEntryDate()), MpsMarket::getEntryDate, entity.getEntryDate().substring(0,7));
+            List<MpsMarketVo> result = baseMapper.selectVoList(lqw);
+            if (!result.isEmpty()) {
+                throw new ServiceException("当月水费户号已存在！");
+            }
+        }else if (set1.contains(entity.getSubcategoryId())) {
             //在set1中的业务类型身份证号+月份不能重复
             //没有对公业务，不判断custtype
             MpsMarket bo = new MpsMarket();
@@ -345,7 +355,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService {
                     MpsTraffic traffic = new MpsTraffic();
                     traffic.setTrafficNo(mpsTraffic.getTrafficNo());
                     LambdaQueryWrapper<MpsTraffic> lqw1 = new LambdaQueryWrapper<>(traffic);
-                    lqw1.ne( MpsTraffic::getId, mpsTraffic.getId());
+                    lqw1.eq( MpsTraffic::getTrafficNo, mpsTraffic.getTrafficNo());
                     List<MpsTrafficVo> result1 = TrafficMapper.selectVoList(lqw1);
                     if (!result1.isEmpty()) {
                         throw new ServiceException("该代缴交警罚没款已存在，编号："+mpsTraffic.getTrafficNo());