From ecef3df4890be54c1da2a8a4fc1c8c1f50f1c263 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:41:47 +0800
Subject: [PATCH] 式样代码管理
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 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 ae82b5c..1eb144e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -245,8 +245,12 @@
<!-- </if>-->
<!-- </where>-->
FROM ir_irrigate_group grp
+ INNER JOIN ir_project_group pg ON pg.group_id = grp.id
<where>
AND grp.deleted = 0
+ <if test="projectId != null">
+ AND pg.project_id = #{projectId}
+ </if>
<if test="groupCode != null and groupCode != ''">
AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
</if>
@@ -255,27 +259,6 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇杞亴缁勫垪琛�-->
<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,
@@ -283,8 +266,14 @@
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
<where>
AND grp.deleted = 0
+
+ <if test="projectId != null">
+ AND pg.project_id = #{projectId}
+ </if>
+
<if test="groupCode != null and groupCode != ''">
AND grp.group_code LIKE CONCAT('%', #{groupCode}, '%')
</if>
--
Gitblit v1.8.0