From 9a332594f1efa890997f9ba8d3a4d964f1b68b72 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 六月 2025 08:57:39 +0800
Subject: [PATCH] 1、中间件设备日志文件针对FBox设备优化；2、表阀一体机功能码92返回结果判断bug修改；3、remote模块中实现表阀一体机协议的功能码9D(正常远程关阀)。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
index 6a1e444..2c29293 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -225,13 +225,13 @@
ord.dispatch_time AS dispatchTime,
ord.reject_times AS rejectTimes,
res.id AS proResultId,
- res.state AS proResultStateId,
+ IFNULL(res.state,0) AS proResultStateId,
CASE
WHEN ord.state = 1 THEN '鏈畬鎴�'
WHEN ord.state = 2 THEN '宸插畬鎴�'
END AS state,
CASE
- WHEN res.state = 0 THEN '鏈笂鎶�'
+ WHEN IFNULL(res.state,0) = 0 THEN '鏈笂鎶�'
WHEN res.state = 1 THEN '寰呭鏍�'
WHEN res.state = 2 THEN '宸查�氳繃'
WHEN res.state = 3 THEN '琚┏鍥�'
@@ -314,13 +314,13 @@
ord.complete_time AS completeTime,
ord.dispatch_time AS dispatchTime,
ord.reject_times AS rejectTimes,
- res.state AS proResultStateId,
+ IFNULL(res.state,0) AS proResultStateId,
CASE
WHEN ord.state = 1 THEN '鏈畬鎴�'
WHEN ord.state = 2 THEN '宸插畬鎴�'
END AS state,
CASE
- WHEN res.state = 0 THEN '鏈笂鎶�'
+ WHEN IFNULL(res.state,0) = 0 THEN '鏈笂鎶�'
WHEN res.state = 1 THEN '寰呭鏍�'
WHEN res.state = 2 THEN '宸查�氳繃'
WHEN res.state = 3 THEN '琚┏鍥�'
--
Gitblit v1.8.0