From bdb2f52b04d53f4e0faaa384238244f253b5334f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 14 七月 2025 15:14:59 +0800
Subject: [PATCH] 修改用水户日、月、年用水量统计查询中的bug
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml | 63 +++++++------------------------
1 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml
index 366e3c2..4108fe1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StClientAmountYearMapper.xml
@@ -125,21 +125,6 @@
</if>
</trim>
</select>
- <select id="selectCountYearStatistics4OneYear" resultType="java.lang.Long">
- select
- count(*)
- from se_client ctb
- INNER JOIN st_client_amount_year cayTb on cayTb.client_id = ctb.id
- where ctb.deleted != 1
- <trim prefix="and" suffixOverrides="and">
- <if test="year != null">
- cayTb.`year` = #{year,jdbcType=INTEGER}
- </if>
- <if test="name != null and name != ''">
- and ctb.name like concat('%', #{name}, '%')
- </if>
- </trim>
- </select>
<select id="selectClientIds4YearStatistics" resultType="com.dy.pipIrrGlobal.voSt.VoStClientIdAmountYearRecord">
select
@@ -158,35 +143,6 @@
</if>
</trim>
</select>
-
- <select id="selectYearStatistics4OneYear" resultType="com.dy.pipIrrGlobal.voSt.VoStClientAmountYearRecord">
- select
- ctb.id as clientId,
- ctb.clientNum as clientNum,
- ctb.name as clientName,
- ctb.address as clientAddress,
- cayTb.amount as amount,
- cayTb.money as money,
- cayTb.times as times
- from se_client ctb
- INNER JOIN st_client_amount_year cayTb on cayTb.client_id = ctb.id
- where ctb.deleted != 1
- <trim prefix="and" suffixOverrides="and">
- <if test="year != null">
- cayTb.`year` = #{year,jdbcType=INTEGER}
- </if>
- <if test="name != null and name != ''">
- and ctb.name like concat('%', #{clientName}, '%')
- </if>
- </trim>
- order by ctb.id DESC
- <trim prefix="limit " >
- <if test="start != null and count != null">
- #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
- </if>
- </trim>
- </select>
-
<select id="selectYearStatistics" resultType="com.dy.pipIrrGlobal.voSt.VoStClientAmountYearRecord">
select
@@ -207,18 +163,27 @@
)
) clientIdTb ON clientIdTb.clientId = ctb.id
</if>
- LEFT JOIN st_client_amount_year cayTb on cayTb.client_id = clientIdTb.clientId
+ LEFT JOIN
+ (
+ select *
+ from st_client_amount_year
+ <where>
+ <if test="year != null">
+ `year` = #{year,jdbcType=INTEGER}
+ </if>
+ </where>
+ ) as cayTb
+ on cayTb.client_id = clientIdTb.clientId
where ctb.deleted != 1
<trim prefix="and" suffixOverrides="and">
- <if test="year != null">
- (cayTb.`year` = #{year,jdbcType=INTEGER} or cayTb.`year` is null)
- </if>
+ <!-- 2025-07-14 鐨剆electClientIds4YearStatisticssselectClientIds4YearStatistics鏌ヨ涓凡缁忕敤浜唍ame鏉′欢
<if test="name != null and name != ''">
and ctb.name like concat('%', #{clientName}, '%')
</if>
+ -->
</trim>
order by ctb.id DESC
- <!-- 2025-07-14 鍥犱负鏈塩lientIdsJson闄愬埗鐨勬暟閲忥紝鎵�浠ヤ笉鍐嶇敤limit浜�
+ <!-- 2025-07-14 鍥犱负鏈塩lientIdsJson闄愬埗浜嗘暟閲忥紝鎵�浠ヤ笉鍐嶇敤limit浜�
<trim prefix="limit " >
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
--
Gitblit v1.8.0