From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 5bdd2d1..d77590b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -473,10 +473,10 @@
AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
</if>
<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}
+ AND oh.open_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
<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}
+ AND oh.close_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
</select>
@@ -489,13 +489,13 @@
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 = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
- WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
+ WHEN oh.op_type = 11 THEN '宸℃鍗″紑闃�'
ELSE '鏈煡'
END AS openType,
oh.op_order_no AS openOrderNo,
@@ -505,7 +505,7 @@
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 '涓績绔欏叧闃�'
@@ -513,7 +513,7 @@
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 = 10 THEN '宸℃鍗″叧闃�'
WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
WHEN oh.cl_type = 13 THEN '鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾'
WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
@@ -540,10 +540,10 @@
AND oh.rtu_addr LIKE CONCAT('%', #{rtuAddr}, '%')
</if>
<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}
+ AND oh.open_dt BETWEEN #{timeStart_open} AND #{timeStop_open}
</if>
<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}
+ AND oh.close_dt BETWEEN #{timeStart_close} AND #{timeStop_close}
</if>
</where>
ORDER BY oh.op_dt DESC
@@ -581,4 +581,11 @@
</if>
</where>
</select>
+
+ <!--涓烘寚瀹氾紙闃�鎺у櫒鍦板潃銆佹按鍗＄紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀�-->
+ <update id="addCloseTime">
+ UPDATE rm_open_close_valve_last
+ SET cl_dt = NOW()
+ WHERE rtu_addr = #{rtuAddr} AND op_ic_card_no = #{icCardNo} AND cl_dt IS NULL
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0