From 5ade866b912c6098da132afb23d175e016de6c9f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 09:36:07 +0800
Subject: [PATCH] 取水口查询排序规则调整
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 1 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 5873b07..5852ca9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -378,7 +378,7 @@
AND bindNumTb.num = #{bindNumber}
</if>
</where>
- ORDER BY ge.operateDt DESC
+ ORDER BY ge.divideId DESC, ge.id DESC
<trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
@@ -402,6 +402,13 @@
FROM pr_intake
WHERE deleted = 0
AND id = #{intakeId}
+ </select>
+
+ <!--鏍规嵁鏉慖D鑾峰彇鍏ㄩ儴鍦板潃-->
+ <select id="getNameById" resultType="java.lang.String">
+ select name
+ from pr_intake
+ where id = #{intakeId, jdbcType=BIGINT}
</select>
<!--鏍规嵁鏉慖D鑾峰彇鍏ㄩ儴鍦板潃-->
@@ -589,6 +596,7 @@
inta.name AS intakeNum,
inta.lng,
inta.lat,
+ IFNULL(hou.instant_amount, 0) AS instantAmount,
IFNULL(hou.total_amount, 0) AS totalAmount,
<if test="onLineMap != null and onLineMap !='' and isOnLine != null">
rtus.isOnLine,
@@ -709,4 +717,85 @@
WHERE id != #{id}
and `name` = #{intakeName}
</select>
+ <!--app淇敼鍙栨按鍙ｇ粡绾害-->
+ <update id="updateByPrimaryKeySelective1" parameterType="com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat">
+ <!--@mbg.generated-->
+ update pr_intake
+ <set>
+ <if test="lng != null">
+ lng = #{lng,jdbcType=DOUBLE},
+ </if>
+ <if test="lat != null">
+ lat = #{lat,jdbcType=DOUBLE},
+ </if>
+ <if test="operator != null">
+ `operator` = #{operator,jdbcType=BIGINT},
+ </if>
+ <if test="operateDt != null">
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
+ </if>
+ </set>
+ where id = #{id,jdbcType=BIGINT}
+ </update>
+
+ <!--鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙ｅ垪琛�-->
+ <select id="getFreeIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoIntakeSimple">
+ SELECT
+ id AS intakeId,
+ name AS intakeName
+ FROM pr_intake inta
+ <where>
+ AND inta.deleted = 0
+ AND NOT EXISTS (SELECT 1 FROM ir_group_intake gi WHERE gi.intake_id = inta.id)
+ <if test="intakeName != null and intakeName != ''">
+ AND LOWER(inta.name) LIKE CONCAT('%', #{intakeName}, '%')
+ </if>
+ </where>
+ </select>
+
+ <!--鑾峰彇鏈粦瀹氳櫄鎷熷崱鐨勫彇姘村彛鍒楄〃锛岀粰鍙栨按鍙ｇ粦铏氭嫙鍗′娇鐢�-->
+ <select id="getNotLinkVcIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoIntakeSimple">
+ SELECT
+ id AS intakeId,
+ name AS intakeName
+ FROM pr_intake inta
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM pr_intake_vc iv
+ WHERE iv.intake_id = inta.id
+ ) AND inta.deleted = 0
+ </select>
+
+
+
+ <!-- 涓簑echat,鏍规嵁鎸囧畾鍙栨按鍙ｅ悕绉版ā绯婏紙鍚庣锛夋煡璇㈡按鍙ｈ褰曟暟 -->
+ <select id="getSomeIntakesCount4Wx" parameterType="java.util.Map" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM pr_intake tb
+ <where>
+ tb.deleted = 0
+ <if test="intakeNum != null and intakeNum != ''">
+ AND tb.name LIKE CONCAT('%', #{intakeNum})
+ </if>
+ </where>
+ </select>
+
+ <!-- 涓簑echat,鏍规嵁鎸囧畾鍙栨按鍙ｅ悕绉版ā绯婏紙鍚庣锛夋煡璇㈡按鍙ｈ褰� -->
+ <select id="getSomeIntakes4Wx" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voPr.VoOnLineIntake">
+ SELECT
+ inta.id AS intakeId,
+ con.rtuAddr,
+ inta.name AS intakeNum
+ FROM pr_intake inta
+ INNER JOIN pr_controller con ON con.intakeId = inta.id
+ <where>
+ inta.deleted = 0
+ <if test="intakeNum != null and intakeNum != ''">
+ AND inta.name LIKE CONCAT('%', #{intakeNum})
+ </if>
+ </where>
+ ORDER BY inta.id DESC
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0