From 1e567af8bbdda31ce3342cd41bb40157168b3da9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index 0896dac..0f5291c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -490,7 +490,7 @@
CASE
WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
- WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
ELSE '鏈煡'
@@ -506,7 +506,7 @@
CASE
WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
- WHEN oh.cl_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.cl_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�'
WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闂�'
WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
@@ -560,7 +560,7 @@
CASE
WHEN oh.op_type = 1 THEN '鍒峰崱寮�闃�'
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
- WHEN oh.op_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
ELSE '鏈煡'
@@ -576,7 +576,7 @@
CASE
WHEN oh.cl_type = 2 THEN '鍒峰崱鍏抽榾'
WHEN oh.cl_type = 4 THEN '涓績绔欏叧闃�'
- WHEN oh.cl_type = 5 THEN '娆犺垂鍏抽榾'
+ WHEN oh.cl_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�'
WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闃�'
WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
@@ -623,7 +623,9 @@
SELECT COUNT(*) AS recordCount
FROM rm_open_close_valve_history
<where>
- AND op_type = #{openType}
+ <if test="openType != null">
+ AND op_type = #{openType}
+ </if>
<if test="timeStart != null and timeStop != null">
AND op_dt BETWEEN #{timeStart} AND #{timeStop}
</if>
--
Gitblit v1.8.0