From b52d4635bcc07411273361b0ba6092d77d2424a3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 26 三月 2024 09:58:47 +0800
Subject: [PATCH] 完善查询流量监测站 解决添加后查不到问题

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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..d9edbe5 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}
@@ -172,7 +172,7 @@
         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 +191,18 @@
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄨ褰�-->
   <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
         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 +217,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>
 
   <!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->

--
Gitblit v1.8.0