From 740de92b22fe7e4742bd0f46e3f57debf8370f2f Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 15 七月 2024 14:49:01 +0800
Subject: [PATCH] 2024-07-15 朱宝民 农户修改接口、补卡是否已退款判断条件
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 1ce5038..3099a55 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -358,7 +358,7 @@
WHERE id NOT IN(SELECT intakeId FROM pr_controller) AND deleted = 0
</select>
- <!--鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鍜屼笉鍦ㄥ厛锛�-->
+ <!--鑾峰彇鍙栨按鍙ｆ暟閲忥紙鍦ㄧ嚎鍜屼笉鍦ㄥ厛锛� 搴熷純-->
<select id="getOnLineIntakesCount" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
@@ -382,7 +382,7 @@
</where>
</select>
- <!--鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄥ厛锛�-->
+ <!--鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄥ厛锛� 搴熷純-->
<select id="getOnLineIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoOnLineIntake">
SELECT
con.intakeId,
@@ -404,13 +404,38 @@
rtus.isOnLine = #{isOnLine}
</if>
<if test="intakeNum != null and intakeNum != ''">
- AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
+ AND inta.name = #{intakeNum}
</if>
</where>
order by con.id ASC
<if test="pageCurr != null and pageSize != null">
LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
</if>
+ </select>
+
+ <!--鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栧彇姘村彛瀵硅薄-->
+ <select id="getIntakeByName" resultType="com.dy.pipIrrGlobal.voPr.VoOnLineIntake">
+ SELECT
+ con.intakeId,
+ con.rtuAddr,
+ inta.name AS intakeNum,
+ rtus.isOnLine
+ FROM pr_controller con
+ INNER JOIN pr_intake inta ON con.intakeId = inta.id
+ left JOIN JSON_TABLE(
+ #{onLineMap},
+ '$[*]' COLUMNS(
+ rtuAddr VARCHAR(20) PATH '$.rtuAddr',
+ isOnLine BOOLEAN PATH '$.isOnLine'
+ )
+ ) rtus ON con.rtuAddr = rtus.rtuAddr
+ <where>
+ <if test="intakeNum != null and intakeNum != ''">
+ AND LOWER(inta.name) = #{intakeNum}
+ </if>
+ </where>
+ LIMIT 0,1
+
</select>
<!--鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛-->
@@ -443,8 +468,16 @@
SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
</select>
- <!--寰楀埌鎵�鏈夌殑鍙栨按鍙ｅ悕绉�-->
- <select id="getIntakeName" resultType="java.lang.String">
- SELECT `name` FROM pr_intake WHERE deleted = 0
+ <!--鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�-->
+ <select id="getIntakeIdsByName" resultType="java.lang.Long">
+ SELECT id AS intakeId FROM pr_intake WHERE `name` = #{intakeName}
</select>
+
+ <!--鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�-->
+ <select id="getIntakeIdByNameExcludeId" resultType="java.lang.Long">
+ SELECT id AS intakeId FROM pr_intake WHERE id != #{id} and `name` = #{intakeName}
+ </select>
+
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0