From fc127750a0fb5433cc4bf12700ffe0482ce819c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 25 十月 2024 10:33:33 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 84 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index 461c803..42a788f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -1264,4 +1264,88 @@
</if>
</trim>
</select>
+
+ <!--鑾峰彇鐗╃悊鍗″紑鍏抽榾璁板綍鏁伴噺锛屽井淇″皬绋嬪簭浣跨敤-->
+ <select id="getCardOpenCloseCount" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM rm_open_close_valve_history his
+ LEFT JOIN pr_intake inta ON inta.id = his.intake_id
+ <where>
+ AND op_type = 1
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
+ </select>
+
+ <!--鑾峰彇鐗╃悊鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤-->
+ <select id="getCardOpenClose" resultType="com.dy.pipIrrGlobal.voRm.VoOpenClostWechat">
+ SELECT
+ cl_this_money AS expense,
+ op_ic_card_no AS cardNum,
+ inta.name AS intakeNum,
+ open_dt AS openTime,
+ close_dt AS closeTime,
+ cl_this_time AS duration,
+ cl_this_amount AS amount,
+ '鍒峰崱寮�闃�' AS openType
+ FROM rm_open_close_valve_history his
+ LEFT JOIN pr_intake inta ON inta.id = his.intake_id
+ <where>
+ AND op_type = 1
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
+ ORDER BY open_dt DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+ <!--鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍鏁伴噺锛屽井淇″皬绋嬪簭浣跨敤-->
+ <select id="getVcCardOpenCloseCount" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM rm_open_close_valve_history his
+ LEFT JOIN pr_intake inta ON inta.id = his.intake_id
+ <where>
+ AND op_type = 8
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
+ </select>
+
+ <!--鑾峰彇铏氭嫙鍗″紑鍏抽榾璁板綍锛屽井淇″皬绋嬪簭浣跨敤-->
+ <select id="getVcCardOpenClose" resultType="com.dy.pipIrrGlobal.voRm.VoOpenClostWechat">
+ SELECT
+ cl_this_money AS expense,
+ op_ic_card_no AS cardNum,
+ inta.name AS intakeNum,
+ open_dt AS openTime,
+ close_dt AS closeTime,
+ cl_this_time AS duration,
+ cl_this_amount AS amount,
+ CASE
+ WHEN cl_type = 13 THEN '瀹氭椂鍏抽榾寮忓紑闃�'
+ WHEN cl_type = 14 THEN '瀹氶噺鍏抽榾寮忓紑闃�'
+ ELSE '杩滅▼寮�闃�'
+ END AS openType
+ FROM rm_open_close_valve_history his
+ LEFT JOIN pr_intake inta ON inta.id = his.intake_id
+ <where>
+ AND op_type = 8
+ <if test = "clientId != null">
+ AND his.client_id = #{clientId}
+ </if>
+ </where>
+ ORDER BY open_dt DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0