From 400af57e240a4c0d74c81ffc8b3417226b51345a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 06 六月 2024 08:19:13 +0800
Subject: [PATCH] 2024-06-06 朱宝民 生产环境版本

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 68dc960..207afc7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -203,8 +203,14 @@
                 isOnLine BOOLEAN PATH '$.isOnLine'
             )
         ) rtus ON com.rtu_addr = rtus.rtuAddr
-    WHERE (com.command_code = '92' OR com.command_code = 'A2') AND com.operator = #{operator}
-    AND NOT EXISTS (SELECT * FROM rm_command_history WHERE (command_code = '93' OR command_code = 'A3') AND param ->>'$.orderNo' = com.param ->>'$.orderNo')
+    WHERE (com.command_code = '92' OR com.command_code = 'A2' OR com.command_code = '97') AND com.operator = #{operator}
+    AND NOT EXISTS (
+        SELECT *
+        FROM rm_command_history
+        WHERE (result IS NULL OR result = 1 )
+            AND (command_code = '93' OR command_code = 'A3' OR command_code = '98')
+            AND param ->>'$.orderNo' = com.param ->>'$.orderNo'
+    )
     ORDER BY com.send_time DESC
   </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0