From e170c6e3119d6e26f7142b26394350a855e89bb0 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 18 十月 2024 16:36:54 +0800
Subject: [PATCH] 2024-10-18 朱宝民 待关阀列表
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 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 dba5edd..34f6871 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -466,14 +466,17 @@
<if test="intakeNum != null and intakeNum != ''">
AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
</if>
+ <if test="clientName != null and clientName != ''">
+ AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
+ </if>
<if test="rtuAddr != null and rtuAddr != ''">
AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
</if>
- <if test="timeStart_open != null and timeStop_open != null">
- AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
+ <if test="timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != ''">
+ AND oh.open_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
- <if test="timeStart_close != null and timeStop_close != null">
- AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
+ <if test="timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != ''">
+ AND oh.close_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
</select>
@@ -486,12 +489,11 @@
oh.client_name AS clientName,
oh.op_ic_card_no AS openIcNum,
oh.op_ic_card_addr AS openIcAddr,
- oh.op_dt AS openTime,
-
+ oh.open_dt AS openTime,
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 '鏈煡'
@@ -503,18 +505,18 @@
oh.op_ele_total_amount AS openEleTotalAmount,
oh.cl_ic_card_no AS closeIcNum,
oh.cl_ic_card_addr AS closeIcAddr,
- oh.cl_dt AS closeTime,
+ oh.close_dt AS closeTime,
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 = 7 THEN '绱ф�ュ叧闂�'
WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
WHEN oh.cl_type = 10 THEN '寮�鍏抽榾鍗″叧闃�'
WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
- WHEN oh.cl_type = 13 THEN '杩滅▼瀹氭椂鍏抽榾'
- WHEN oh.cl_type = 14 THEN '杩滅▼瀹氶噺鍏抽榾'
+ WHEN oh.cl_type = 13 THEN '鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾'
+ WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
ELSE '鏈煡'
END AS closeType,
oh.cl_this_amount AS closeThisAmount,
@@ -531,14 +533,17 @@
<if test="intakeNum != null and intakeNum != ''">
AND inta.name LIKE CONCAT('%', #{intakeNum}, '%')
</if>
+ <if test="clientName != null and clientName != ''">
+ AND oh.client_name LIKE CONCAT('%', #{clientName}, '%')
+ </if>
<if test="rtuAddr != null and rtuAddr != ''">
AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
</if>
- <if test="timeStart_open != null and timeStop_open != null">
- AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
+ <if test="timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != ''">
+ AND oh.open_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
- <if test="timeStart_close != null and timeStop_close != null">
- AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
+ <if test="timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != ''">
+ AND oh.close_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
ORDER BY oh.op_dt DESC
@@ -554,7 +559,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>
@@ -566,7 +573,9 @@
SELECT COUNT(*) AS recordCount
FROM rm_open_close_valve_history
<where>
- AND cl_type = #{closeType}
+ <if test="closeType != null">
+ AND cl_type = #{closeType}
+ </if>
<if test="timeStart != null and timeStop != null">
AND cl_dt BETWEEN #{timeStart} AND #{timeStop}
</if>
--
Gitblit v1.8.0