From cde47dc3b54984bdba30f42b81fb816163dbc7f4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 三月 2024 19:29:55 +0800
Subject: [PATCH] 2024-03-27 朱宝民 优化Application下的获取交易统计记录

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml
index 2914ee1..65ce426 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowMonitoringMapper.xml
@@ -214,7 +214,7 @@
         INNER JOIN ba_district country ON pfm.countyId = country.id
         INNER JOIN ba_district town ON pfm.townId = town.id
         INNER JOIN ba_district village ON pfm.villageId = village.id
-        INNER JOIN pr_monitoring_flowmeter pmofl ON pmofl.monitoringId = pfm.id
+        LEFT JOIN pr_monitoring_flowmeter pmofl ON pmofl.monitoringId = pfm.id
         <where>
             pfm.deleted = 0
             <if test = "name != null and name !=''">
@@ -228,7 +228,7 @@
 
     <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇娴侀噺鐩戞祴绔欏疄浣撹褰�-->
     <select id="getPrFlowMonitoring" parameterType="map" resultType="com.dy.pipIrrGlobal.voPr.VoFlowMonitoring">
-        select (@i:=@i+1)                                           AS id,
+        select  CAST(pfm.id AS char)                                 AS id,
                 CONCAT(country.`name`, town.`name`, village.`name`) AS address,
                 pfm.`name`                                          AS `name`,
                 pmofl.operateType                                   AS bindState
@@ -236,8 +236,7 @@
         INNER JOIN ba_district country ON pfm.countyId = country.id
         INNER JOIN ba_district town ON pfm.townId = town.id
         INNER JOIN ba_district village ON pfm.villageId = village.id
-        INNER JOIN pr_monitoring_flowmeter pmofl ON pmofl.monitoringId = pfm.id,
-        (SELECT @i:=0) AS itable
+        LEFT JOIN pr_monitoring_flowmeter pmofl ON pmofl.monitoringId = pfm.id
         <where>
             pfm.deleted = 0
             <if test = "name != null and name !=''">
@@ -248,9 +247,10 @@
             </if>
         </where>
         ORDER BY pmofl.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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0