From e29dff84a18c5ccbb891ce760487d45db67a8e17 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 01 十一月 2024 10:27:09 +0800
Subject: [PATCH] 2024-11-01 获取虚拟卡常用充值金额(单位分)

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
index 8f00124..66a399f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -199,7 +199,8 @@
     <select id="getUnclosedValves" resultType="com.dy.pipIrrGlobal.voRm.VoUnclosedValve">
         SELECT
             inta.name AS intakeNum,
-            rtus.isOnLine,
+<!--            rtus.isOnLine,-->
+            IFNULL(rtus.isOnLine,'鏈煡') AS isOnLine,
             com.rtu_addr AS rtuAddr,
             com.param ->> '$.icCardNo' AS vcNum,
             (
@@ -230,6 +231,12 @@
             AND com.operator = #{operator}
             AND (com.protocol = 'p206V1_0_1' AND (com.command_code = '92' OR com.command_code = '97' OR com.command_code = '99' OR com.command_code = 'A0' OR com.command_code = 'A1' OR com.command_code = 'A2'))
             AND (
+                SELECT op_dt FROM rm_open_close_valve_last
+                WHERE rtu_addr = com.rtu_addr AND op_ic_card_no = com.param ->> '$.icCardNo'
+                ORDER BY op_dt DESC
+                LIMIT 1
+            ) IS NOT NULL
+            AND (
                 SELECT cl_dt FROM rm_open_close_valve_last
                 WHERE rtu_addr = com.rtu_addr AND op_ic_card_no = com.param ->> '$.icCardNo'
                 ORDER BY op_dt DESC

--
Gitblit v1.8.0