From db31f95644e77010ffb88ac9e57e618818737733 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 09 一月 2025 11:25:23 +0800
Subject: [PATCH] 优化”开阀操作次数“、”关阀操作次数“、”时间段内开阀次数超过指定值“、”时间段内开阀次数低于指定值“、”时间段有开阀无关阀“、”时间段无开阀有关阀“功能实现及sql。

---
 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