From b8470f5e90d0aed22bf2c4bf9f5d2a13cd60b15f Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 30 十二月 2024 14:03:41 +0800 Subject: [PATCH] 1、统计模块实现农户日用水量纵转横转存,月、年用水量统计; 2、临时模块农户日用水量纵转横转存,月、年用水量统计; --- 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