From c3d51f9ba3300b60261d13a5b0b4f7402bba0ee0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 02 四月 2025 08:30:00 +0800
Subject: [PATCH] 修改轮灌组接口、分页获取轮灌组接口、获取全部轮灌组接口、获取轮灌组详情接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 80 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 20 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 5a23b4d..ae82b5c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -230,16 +230,23 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勮褰曟暟-->
<select id="getSimpleGroupCount" resultType="java.lang.Long">
SELECT COUNT(*) AS recordCount
+<!-- FROM ir_irrigate_group grp-->
+<!-- INNER JOIN ir_project_group pg ON pg.group_id = grp.id-->
+<!-- INNER JOIN ir_project pro ON pg.project_id = pro.id-->
+<!-- <where>-->
+<!-- AND grp.deleted = 0-->
+
+<!-- <if test="projectId != null and projectId != ''">-->
+<!-- AND pro.id = #{projectId}-->
+<!-- </if>-->
+
+<!-- <if test="groupCode != null and groupCode != ''">-->
+<!-- AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')-->
+<!-- </if>-->
+<!-- </where>-->
FROM ir_irrigate_group grp
- INNER JOIN ir_project_group pg ON pg.group_id = grp.id
- INNER JOIN ir_project pro ON pg.project_id = pro.id
<where>
AND grp.deleted = 0
-
- <if test="projectId != null and projectId != ''">
- AND pro.id = #{projectId}
- </if>
-
<if test="groupCode != null and groupCode != ''">
AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
</if>
@@ -248,31 +255,64 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勫垪琛�-->
<select id="getSimpleGroups" resultType="com.dy.pipIrrGlobal.voIr.VoGroupSimple">
+<!-- SELECT-->
+<!-- grp.id AS groupId,-->
+<!-- grp.group_code AS groupCode,-->
+<!-- (SELECT COUNT(*) FROM ir_group_intake WHERE group_id = grp.id) AS intakeCount,-->
+<!-- grp.default_duration AS defaultDuration,-->
+<!-- pg.sort-->
+<!-- FROM ir_irrigate_group grp-->
+<!-- INNER JOIN ir_project_group pg ON pg.group_id = grp.id-->
+<!-- INNER JOIN ir_project pro ON pg.project_id = pro.id-->
+<!-- <where>-->
+<!-- AND grp.deleted = 0-->
+
+<!-- <if test="projectId != null and projectId != ''">-->
+<!-- AND pro.id = #{projectId}-->
+<!-- </if>-->
+
+<!-- <if test="groupCode != null and groupCode != ''">-->
+<!-- AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- ORDER BY pg.sort-->
SELECT
- grp.id AS groupId,
- grp.group_code AS groupCode,
- (SELECT COUNT(*) FROM ir_group_intake WHERE group_id = grp.id) AS intakeCount,
- grp.default_duration AS defaultDuration,
- pg.sort
+ grp.id AS groupId,
+ grp.group_code AS groupCode,
+ (SELECT COUNT(*) FROM ir_group_intake WHERE group_id = grp.id) AS intakeCount,
+ grp.default_duration AS defaultDuration,
+ 0 as sort
FROM ir_irrigate_group grp
- INNER JOIN ir_project_group pg ON pg.group_id = grp.id
- INNER JOIN ir_project pro ON pg.project_id = pro.id
<where>
AND grp.deleted = 0
-
- <if test="projectId != null and projectId != ''">
- AND pro.id = #{projectId}
- </if>
-
<if test="groupCode != null and groupCode != ''">
AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
</if>
</where>
- ORDER BY pg.sort
+ ORDER BY grp.operate_time 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="getGroupDetail" resultType="com.dy.pipIrrGlobal.voIr.VoGroupDetail">
+ SELECT
+ groupCode,
+ defaultDuration,
+ GROUP_CONCAT(intakeId) AS intakes
+ FROM
+ (
+ SELECT
+ grp.group_code AS groupCode,
+ grp.default_duration AS defaultDuration,
+ inta.id AS intakeId
+ FROM ir_irrigate_group grp
+ INNER JOIN ir_group_intake gi ON gi.group_id = grp.id
+ INNER JOIN pr_intake inta ON inta.id = gi.intake_id
+ WHERE grp.deleted = 0 AND grp.id = #{groupId}
+ ) irrigateGroup
+ GROUP BY groupCode,defaultDuration
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0