From 19c5321559b3f050620719dea61b5f3c6cd4c224 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 12 九月 2024 20:43:00 +0800
Subject: [PATCH] 2024-09-12 朱宝民 完善交易汇总查询接口，完善获取交易明细接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml | 122 ++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 32 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..408b346 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
@@ -5,19 +5,20 @@
<!--@mbg.generated-->
<!--@Table pr_flowmeter-->
<id column="id" jdbcType="BIGINT" property="id" />
+ <result column="monitoringId" jdbcType="BIGINT" property="monitoringId" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
- <result column="onlineState" jdbcType="TINYINT" property="onlinestate" />
- <result column="reportTime" jdbcType="TIMESTAMP" property="reporttime" />
- <result column="addWays" jdbcType="TINYINT" property="addways" />
+ <result column="onlineState" jdbcType="TINYINT" property="onlineState" />
+ <result column="reportTime" jdbcType="TIMESTAMP" property="reportTime" />
+ <result column="addWays" jdbcType="TINYINT" property="addWays" />
<result column="operator" jdbcType="BIGINT" property="operator" />
- <result column="operateDt" jdbcType="TIMESTAMP" property="operatedt" />
+ <result column="operateDt" jdbcType="TIMESTAMP" property="operateDt" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="deleted" jdbcType="TINYINT" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, code, protocol, onlineState, reportTime, addWays, `operator`, operateDt, remarks,
+ id, monitoringId, code, protocol, onlineState, reportTime, addWays, `operator`, operateDt, remarks,
deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -40,8 +41,8 @@
`operator`, operateDt, remarks,
deleted)
values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
- #{onlinestate,jdbcType=TINYINT}, #{reporttime,jdbcType=TIMESTAMP}, #{addways,jdbcType=TINYINT},
- #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
+ #{onlineState,jdbcType=TINYINT}, #{reportTime,jdbcType=TIMESTAMP}, #{addWays,jdbcType=TINYINT},
+ #{operator,jdbcType=BIGINT}, #{operateDt,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
#{deleted,jdbcType=TINYINT})
</insert>
@@ -58,19 +59,19 @@
<if test="protocol != null">
protocol,
</if>
- <if test="onlinestate != null">
+ <if test="onlineState != null">
onlineState,
</if>
- <if test="reporttime != null">
+ <if test="reportTime != null">
reportTime,
</if>
- <if test="addways != null">
+ <if test="addWays != null">
addWays,
</if>
<if test="operator != null">
`operator`,
</if>
- <if test="operatedt != null">
+ <if test="operateDt != null">
operateDt,
</if>
<if test="remarks != null">
@@ -90,20 +91,20 @@
<if test="protocol != null">
#{protocol,jdbcType=VARCHAR},
</if>
- <if test="onlinestate != null">
- #{onlinestate,jdbcType=TINYINT},
+ <if test="onlineState != null">
+ #{onlineState,jdbcType=TINYINT},
</if>
- <if test="reporttime != null">
- #{reporttime,jdbcType=TIMESTAMP},
+ <if test="reportTime != null">
+ #{reportTime,jdbcType=TIMESTAMP},
</if>
- <if test="addways != null">
- #{addways,jdbcType=TINYINT},
+ <if test="addWays != null">
+ #{addWays,jdbcType=TINYINT},
</if>
<if test="operator != null">
#{operator,jdbcType=BIGINT},
</if>
- <if test="operatedt != null">
- #{operatedt,jdbcType=TIMESTAMP},
+ <if test="operateDt != null">
+ #{operateDt,jdbcType=TIMESTAMP},
</if>
<if test="remarks != null">
#{remarks,jdbcType=VARCHAR},
@@ -123,20 +124,20 @@
<if test="protocol != null">
protocol = #{protocol,jdbcType=VARCHAR},
</if>
- <if test="onlinestate != null">
- onlineState = #{onlinestate,jdbcType=TINYINT},
+ <if test="onlineState != null">
+ onlineState = #{onlineState,jdbcType=TINYINT},
</if>
- <if test="reporttime != null">
- reportTime = #{reporttime,jdbcType=TIMESTAMP},
+ <if test="reportTime != null">
+ reportTime = #{reportTime,jdbcType=TIMESTAMP},
</if>
- <if test="addways != null">
- addWays = #{addways,jdbcType=TINYINT},
+ <if test="addWays != null">
+ addWays = #{addWays,jdbcType=TINYINT},
</if>
<if test="operator != null">
`operator` = #{operator,jdbcType=BIGINT},
</if>
- <if test="operatedt != null">
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ <if test="operateDt != null">
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
</if>
<if test="remarks != null">
remarks = #{remarks,jdbcType=VARCHAR},
@@ -152,11 +153,11 @@
update pr_flowmeter
set code = #{code,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- onlineState = #{onlinestate,jdbcType=TINYINT},
- reportTime = #{reporttime,jdbcType=TIMESTAMP},
- addWays = #{addways,jdbcType=TINYINT},
+ onlineState = #{onlineState,jdbcType=TINYINT},
+ reportTime = #{reportTime,jdbcType=TIMESTAMP},
+ addWays = #{addWays,jdbcType=TINYINT},
`operator` = #{operator,jdbcType=BIGINT},
- operateDt = #{operatedt,jdbcType=TIMESTAMP},
+ operateDt = #{operateDt,jdbcType=TIMESTAMP},
remarks = #{remarks,jdbcType=VARCHAR},
deleted = #{deleted,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
@@ -168,7 +169,64 @@
</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 pfm
+ Left join pr_flow_monitoring pfmt on pfmt.id = pfm.monitoringId
+ <where>
+ 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 pfm.onlineState = #{onlineState}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁娴侀噺璁＄紪鍙� 鎴栬�� 鍦ㄧ嚎鐘舵�� 鑾峰彇鏈垹闄ょ殑缁戝畾鐨勬祦閲忚璁板綍 -->
+ <select id="getFlowMeters" resultType="com.dy.pipIrrGlobal.voPr.VoFlowMeter">
+ 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
+ Left join pr_flow_monitoring pfmt on pfmt.id = pfm.monitoringId
+ <where>
+ 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 pfm.onlineState = #{onlineState}
+ </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>
+
+ <select id="selectAll" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List"/>
+ from pr_flowmeter pfm
+ where deleted != 1
+ </select>
+ <update id="flowmeterAddMonId">
+ update pr_flowmeter
+ set monitoringId = #{monitoringId,jdbcType=BIGINT},
+ `operator` = #{operator,jdbcType=BIGINT},
+ operateDt = #{operateDt,jdbcType=TIMESTAMP}
+ where id = #{id,jdbcType=BIGINT}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0