From e9e91d14c9436b29292054e3de0445dbb7d8601c Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 12 六月 2024 09:17:14 +0800
Subject: [PATCH] 修改 检测控制取水口列表 增加排序asc
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index aa36478..c0f940b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -30,7 +30,7 @@
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
- select
+ select
<include refid="Base_Column_List" />
from pr_controller
where id = #{id,jdbcType=BIGINT}
@@ -168,11 +168,10 @@
SELECT
COUNT(*) AS recordCount
FROM pr_controller con
- INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
+ LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
- AND ic.operateType = 1
- AND deleted = 0
+ AND con.deleted = 0
<if test = "id != null and id > 0">
AND con.id = ${id}
@@ -191,16 +190,17 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰�-->
<select id="getControllers" resultType="com.dy.pipIrrGlobal.voPr.VoController">
SELECT
+ CAST(con.id AS char) AS id,
con.rtuAddr AS rtuAddr,
inta.name AS intakeName,
+ "鍦ㄧ嚎" AS onlineState,
(SELECT COUNT(*) FROM pr_intake_controller WHERE controllerId = con.id AND intakeId = inta.id AND operateType = 1) AS bindNumber,
- con.findDt
+ con.findDt AS findDt
FROM pr_controller con
- INNER JOIN pr_intake_controller ic ON ic.controllerId = con.id
+ LEFT JOIN pr_intake_controller ic ON ic.controllerId = con.id
INNER JOIN pr_intake inta ON con.intakeId = inta.id
<where>
- AND ic.operateType = 1
- AND deleted = 0
+ AND con.deleted = 0
<if test = "id != null and id > 0">
AND con.id = ${id}
@@ -215,9 +215,11 @@
</if>
</where>
ORDER BY con.operateDt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->
@@ -243,8 +245,23 @@
SELECT COUNT(*) AS recordCount FROM pr_controller WHERE deleted = 0 AND id = ${controllerId}
</select>
- <!--鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�-->
+ <!--鏍规嵁娴佹氮鎺у埗鍣ㄧ紪鍙疯幏鍙栧凡缁戝畾璁板綍鏁�-->
<select id="getBindedCount" resultType="java.lang.Integer">
SELECT COUNT(*) AS recordCount FROM pr_controller WHERE rtuAddr = (SELECT rtuAddr FROM pr_controller_tramp WHERE id = ${controllerId}) AND intakeId IS NOT NULL
</select>
+
+ <!--鏍规嵁鍙栨按鍙D鎴栭榾鎺у櫒鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄-->
+ <select id="getRtu" resultType="com.dy.pipIrrGlobal.pojoPr.PrController">
+ SELECT * FROM pr_controller
+ <where>
+ AND deleted = 0
+ <if test = "intakeId != null">
+ AND intakeId = #{intakeId}
+ </if>
+ <if test = "rtuAddr != null">
+ AND rtuAddr = #{rtuAddr}
+ </if>
+ </where>
+ LIMIT 0,1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0