From 6cf6a4c4670c2ebd7a2995921dfef74a3139430f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 29 三月 2024 10:34:49 +0800
Subject: [PATCH] 修改 监测站编号获取绑定记录接口 监测站ID流量计ID由Long变为String
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 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 1912ac5..c74808b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
@@ -172,43 +172,55 @@
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
+ SELECT COUNT(*) AS recordCountOfFlowmeter
+ from pr_flowmeter pfm
+ Left join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id
+ Left join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId
<where>
- deleted = 0 AND
- <if test="code != null">
- code = #{code,jdbcType=VARCHAR},
+ pfm.deleted = 0 AND pfmt.deleted = 0
+ <if test = "code != null and code !=''">
+ AND pfm.code like CONCAT('%',#{code},'%')
</if>
<if test="onlineState != null ">
- onlineState = #{onlineState,jdbcType=TINYINT}
+ AND pfm.onlineState = #{onlineState}
</if>
- </where>
+ </where>
</select>
- <!--鏍规嵁娴侀噺璁＄紪鍙� 鎴栬�� 鍦ㄧ嚎鐘舵�� 鑾峰彇鏈垹闄ょ殑娴侀噺璁¤褰� -->
+ <!--鏍规嵁娴侀噺璁＄紪鍙� 鎴栬�� 鍦ㄧ嚎鐘舵�� 鑾峰彇鏈垹闄ょ殑缁戝畾鐨勬祦閲忚璁板綍 -->
<select id="getFlowMeters" resultType="com.dy.pipIrrGlobal.voPr.VoFlowMeter">
- select (@i:=@i+1) AS id,
+ select CAST(pfm.id AS char) 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
+ Left join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id
+ Left join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId
<where>
- pfm.deleted = 0 AND pfmt.deleted = 0 AND pmofl.operateType = 1
- <if test="code != null">
- AND code = #{code,jdbcType=VARCHAR}
+ pfm.deleted = 0 AND pfmt.deleted = 0
+ <if test = "code != null and code !=''">
+ AND pfm.code like CONCAT('%',#{code},'%')
</if>
<if test="onlineState != null ">
- AND onlineState = #{onlineState,jdbcType=TINYINT}
+ AND pfm.onlineState = #{onlineState}
</if>
</where>
ORDER BY pfm.operateDt DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <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="selectAll" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List"/>
+ from pr_flowmeter pfm
+ where deleted != 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0