From f4d1e8f5e01e12a90050d94e50571b9cb1ebe109 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 09:01:14 +0800
Subject: [PATCH] 灌溉模块4个接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 23 +++++++++++++++++++----
1 files changed, 19 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..242f89b 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,18 @@
AND gro.group_code = #{groupCode}
</if>
</where>
+ GROUP BY gro.id
+ ) a
+ </select>
+
+ <!--鏍规嵁杞亴缁勭紪鍙疯幏鍙栧彇姘村彛鍒楄〃-->
+ <select id="getIntakesByGroupId" resultType="java.lang.Long">
+ SELECT
+ uni.intake_id AS intakeId
+ FROM ir_irrigate_group grp
+ INNER JOIN ir_group_unit gu ON gu.group_id = grp.id
+ INNER JOIN ir_irrigate_unit uni ON uni.id = gu.unit_id
+ WHERE grp.deleted = 0 AND grp.id = #{groupId}
+
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0