From 3fe912a1d0ceca7cd0281e26b798b55b539ec2cd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 15 十月 2024 15:19:56 +0800
Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑，对于当天发现的控制器，控制器计算的漏损量一定不正确，强制设置成0；
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
index cfebc59..65bb9e1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientMapper.xml
@@ -325,6 +325,16 @@
<if test = "address != null and address !=''">
AND cli.address like CONCAT('%',#{address},'%')
</if>
+
+ <if test = "villageId != null and villageId !=''">
+ AND cli.villageId = #{villageId}
+ </if>
+ <if test = "blockId != null and blockId !=''">
+ AND cli.blockId = #{blockId}
+ </if>
+ <if test = "divideId != null and divideId !=''">
+ AND cli.divideId = #{divideId}
+ </if>
</where>
</select>
@@ -351,7 +361,7 @@
cli.phone,
cli.idCard,
cli.area,
- (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id) AS cardCount,
+ (SELECT COUNT(*) FROM se_client_card WHERE clientId = cli.id)+(SELECT COUNT(*) FROM se_virtual_card WHERE client_id = cli.id) AS cardCount,
cli.address,
cli.remarks,
cli.operateDt
@@ -380,6 +390,16 @@
<if test = "address != null and address !=''">
AND cli.address like CONCAT('%',#{address},'%')
</if>
+
+ <if test = "villageId != null and villageId !=''">
+ AND cli.villageId = #{villageId}
+ </if>
+ <if test = "blockId != null and blockId !=''">
+ AND cli.blockId = #{blockId}
+ </if>
+ <if test = "divideId != null and divideId !=''">
+ AND cli.divideId = #{divideId}
+ </if>
</where>
ORDER BY cli.operateDt DESC
<trim prefix="limit " >
--
Gitblit v1.8.0