From 4989fec546d0ec552f4844b61dc12b6fab03237c Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 五月 2025 15:42:12 +0800
Subject: [PATCH] fix(irrigatePlan): 修复灌溉计划结束时间计算逻辑
---
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