From acccf8a6aab49208a43fda862487aebcaa2cdb73 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 05 八月 2024 15:31:03 +0800
Subject: [PATCH] 1. 从未开过阀的取水口； 2. 指定时间段内开阀次数超过指定值的取水口； 3. 指定时间段内开阀次数低于指定值的取水口； 4.获取开关阀报（历史）完善接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 8f9d0cc..fcd8e06 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -445,10 +445,10 @@
<if test = "rtuAddr != null and rtuAddr !=''">
AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
</if>
- <if test = "timeStart_open != null and timeStop_open != null">
+ <if test = "timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != '' ">
AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
- <if test = "timeStart_close != null and timeStop_close != null">
+ <if test = "timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != '' ">
AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
@@ -464,7 +464,14 @@
oh.op_ic_card_no AS openIcNum,
oh.op_ic_card_addr AS openIcAddr,
oh.op_dt AS openTime,
- oh.op_type AS openType,
+ CASE
+ WHEN oh.op_type = 1 THEN "鍒峰崱寮�闃�"
+ WHEN oh.op_type = 3 THEN "涓績绔欏紑闃�"
+ WHEN oh.op_type = 5 THEN "娆犺垂鍏抽榾"
+ WHEN oh.op_type = 8 THEN "鐢ㄦ埛杩滅▼寮�闃�"
+ WHEN oh.op_type = 11 THEN "寮�鍏抽榾鍗″紑闃�"
+ ELSE "鏈煡"
+ END AS openType,
oh.op_order_no AS openOrderNo,
oh.op_total_amount AS openTotalAmount,
oh.op_remain_money AS openRemainMoney,
@@ -473,7 +480,19 @@
oh.cl_ic_card_no AS closeIcNum,
oh.cl_ic_card_addr AS closeIcAddr,
oh.cl_dt AS closeTime,
- oh.cl_type AS closeType,
+ CASE
+ WHEN oh.cl_type = 2 THEN "鍒峰崱鍏抽榾"
+ WHEN oh.cl_type = 4 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 "鐢ㄦ埛杩滅▼鍏抽榾"
+ WHEN oh.cl_type = 10 THEN "寮�鍏抽榾鍗″叧闃�"
+ WHEN oh.cl_type = 12 THEN "榛戝悕鍗曞懡浠ゅ叧闃�"
+ WHEN oh.cl_type = 13 THEN "鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾"
+ WHEN oh.cl_type = 14 THEN "鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾"
+ ELSE "鏈煡"
+ END AS closeType,
oh.cl_this_amount AS closeThisAmount,
oh.cl_this_time AS thisTime,
oh.cl_this_money AS thisMoney,
@@ -491,10 +510,10 @@
<if test = "rtuAddr != null and rtuAddr !=''">
AND oh.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
</if>
- <if test = "timeStart_open != null and timeStop_open != null">
+ <if test = "timeStart_open != null and timeStart_open != '' and timeStop_open != null and timeStop_open != '' ">
AND oh.op_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
- <if test = "timeStart_close != null and timeStop_close != null">
+ <if test = "timeStart_close != null and timeStart_close != '' and timeStop_close != null and timeStop_close != '' ">
AND oh.cl_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
--
Gitblit v1.8.0