From 742b6bbac1b4609386817a6e6fb489ec098a5490 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 21 一月 2025 18:29:44 +0800
Subject: [PATCH] 重构获取分水房详情接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
index fa78683..ae93ff0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -119,7 +119,7 @@
left join ir_project pro on pro.id = gro.project_id
left join se_client cli on cli.id = gro.operator
left join ir_group_unit gu on gu.group_id = gro.id
- where gro.id = #{id,jdbcType=BIGINT} and gro.deleted = 0 and gu.deleted = 0 and pro.deleted = 0
+ where gro.id = #{id,jdbcType=BIGINT} and gro.deleted = 0 and pro.deleted != 1
</select>
<!--鍒嗛〉鏌ヨ疆鐏岀粍-->
@@ -139,7 +139,7 @@
left join se_client cli on cli.id = gro.operator
left join ir_group_unit gu on gu.group_id = gro.id
<where>
- gro.deleted = 0 and gu.deleted = 0 and pro.deleted = 0
+ gro.deleted = 0 and pro.deleted != 1
<if test="projectName != null and projectName != ''">
AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
</if>
@@ -147,6 +147,7 @@
AND gro.group_code = #{groupCode}
</if>
</where>
+ GROUP BY gro.id
ORDER BY gro.operate_time DESC
<if test="pageCurr != null and pageSize != null">
LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
@@ -154,13 +155,14 @@
</select>
<!--鍒嗛〉鏌ヨ疆鐏岀粍璁板綍鏁�-->
<select id="getRecordCount" resultType="java.lang.Long">
- SELECT COUNT(*) AS recordCount
+ SELECT COUNT(*) FROM(
+ SELECT COUNT(*),gro.id AS recordCount
from ir_irrigate_group gro
left join ir_project pro on pro.id = gro.project_id
left join se_client cli on cli.id = gro.operator
left join ir_group_unit gu on gu.group_id = gro.id
<where>
- gro.deleted = 0 and gu.deleted = 0 and pro.deleted = 0
+ gro.deleted = 0 and pro.deleted != 1
<if test="projectName != null and projectName != ''">
AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
</if>
@@ -168,5 +170,7 @@
AND gro.group_code = #{groupCode}
</if>
</where>
+ GROUP BY gro.id
+ ) a
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0