From d52c20ed07bcea2d848bdab25f2c49c21c00d269 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 27 二月 2024 12:56:22 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
index 7af9f8a..9a6cf6d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
@@ -168,7 +168,49 @@
</update>
<!--鏍规嵁娴侀噺璁＄紪鍙疯幏鍙栨湭鍒犻櫎鐨勬祦閲忚鏁伴噺-->
- <select id="getRecordCountOfFlowmeter" resultType="java.lang.Integer">
+ <select id="getRecordCountOfFlowmeterByCode" resultType="java.lang.Integer">
SELECT COUNT(*) AS recordCountOfFlowmeter FROM pr_flowmeter WHERE deleted = 0 AND id = ${flowmeterId}
</select>
+
+ <!--鏍规嵁娴侀噺璁＄紪鍙� 鎴栬�� 鍦ㄧ嚎鐘舵�� 鑾峰彇鏈垹闄ょ殑娴侀噺璁℃暟閲� -->
+ <select id="getRecordCountOfFlowMeterByOthers" resultType="_integer">
+ SELECT COUNT(*) AS recordCountOfFlowmeter FROM pr_flowmeter
+ <where>
+ deleted = 0 AND
+ <if test="code != null">
+ code = #{code,jdbcType=VARCHAR},
+ </if>
+ <if test="onlineState != null ">
+ onlineState = #{onlineState,jdbcType=TINYINT}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁娴侀噺璁＄紪鍙� 鎴栬�� 鍦ㄧ嚎鐘舵�� 鑾峰彇鏈垹闄ょ殑娴侀噺璁¤褰� -->
+ <select id="getFlowMeters" resultType="com.dy.pipIrrGlobal.voPr.VoFlowMeter">
+ select (@i:=@i+1) AS id,
+ pfm.code AS code,
+ pfm.onlineState AS onlineState,
+ pfmt.`name` AS `name`,
+ pfm.operateDt AS operateDt
+ from pr_flowmeter pfm
+ inner join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id
+ inner join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId,
+ (SELECT @i:=0) AS itable
+ <where>
+ pfm.deleted = 0 AND pfmt.deleted = 0 AND pmofl.operateType = 1
+ <if test="code != null">
+ AND code = #{code,jdbcType=VARCHAR}
+ </if>
+ <if test="onlineState != null ">
+ AND onlineState = #{onlineState,jdbcType=TINYINT}
+ </if>
+ </where>
+ ORDER BY pfm.operateDt 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