From 77547e85cac1f2e9a02e770fb8dfb603d236c67a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 11:50:36 +0800
Subject: [PATCH] 1、取水口年月水量统计、农户年月用水量统计、取水口漏损年月统计存在bug，进行了修改； 2、生成新的pipIrr-web-temp临时任务模块，执行一些临时任务，例如删除数据库中一些出错的数据。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 12 ++++++++----
1 files changed, 8 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 599e0cc..7201f42 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -225,14 +225,16 @@
ord.dispatch_time AS dispatchTime,
ord.reject_times AS rejectTimes,
res.id AS proResultId,
+ res.state AS proResultStateId,
CASE
WHEN ord.state = 1 THEN '鏈畬鎴�'
WHEN ord.state = 2 THEN '宸插畬鎴�'
END AS state,
CASE
- WHEN res.state = 1 THEN '宸蹭笂鎶�'
+ WHEN res.state = 0 THEN '鏈笂鎶�'
+ WHEN res.state = 1 THEN '寰呭鏍�'
WHEN res.state = 2 THEN '宸查�氳繃'
- WHEN res.state = 3 THEN '宸查┏鍥�'
+ WHEN res.state = 3 THEN '琚┏鍥�'
ELSE '鏈笂鎶�'
END AS processingState
FROM ope_work_order ord
@@ -312,14 +314,16 @@
ord.complete_time AS completeTime,
ord.dispatch_time AS dispatchTime,
ord.reject_times AS rejectTimes,
+ res.state AS proResultStateId,
CASE
WHEN ord.state = 1 THEN '鏈畬鎴�'
WHEN ord.state = 2 THEN '宸插畬鎴�'
END AS state,
CASE
- WHEN res.state = 1 THEN '宸蹭笂鎶�'
+ WHEN res.state = 0 THEN '鏈笂鎶�'
+ WHEN res.state = 1 THEN '寰呭鏍�'
WHEN res.state = 2 THEN '宸查�氳繃'
- WHEN res.state = 3 THEN '宸查┏鍥�'
+ WHEN res.state = 3 THEN '琚┏鍥�'
ELSE '鏈笂鎶�'
END AS processingState,
res.id AS proResultId
--
Gitblit v1.8.0