From 183ad4afa2f8038271907270e5406c606fa8b075 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 07 八月 2024 10:12:00 +0800
Subject: [PATCH] 指定时间段内用水量超过指定值的取水口，修改上一次提交查询为查累积流量

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml |   89 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index 94c0e2c..fab983b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -20,7 +20,7 @@
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
-    select 
+    select
     <include refid="Base_Column_List" />
     from rm_loss_day_last
     where id = #{id,jdbcType=BIGINT}
@@ -46,12 +46,12 @@
   </delete>
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDayLast">
     <!--@mbg.generated-->
-    insert into rm_loss_day_last (id, last_history_id, controller_id, 
-      intake_id, rtu_addr, dt, dt_last, dt_rtu,
-      loss_amount)
-    values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, 
-      #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=DATE}, #{dtLast,jdbcType=TIMESTAMP}, #{dtRtu,jdbcType=TIMESTAMP},
-      #{lossAmount,jdbcType=DOUBLE})
+    insert into rm_loss_day_last (id, last_history_id, controller_id,
+    intake_id, rtu_addr, dt, dt_last, dt_rtu,
+    loss_amount)
+    values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT},
+    #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=DATE}, #{dtLast,jdbcType=TIMESTAMP}, #{dtRtu,jdbcType=TIMESTAMP},
+    #{lossAmount,jdbcType=DOUBLE})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDayLast">
     <!--@mbg.generated-->
@@ -134,11 +134,11 @@
       <if test="dt != null">
         dt = #{dt,jdbcType=DATE},
       </if>
-     <if test="dtLast != null">
-       dt_last = #{dtLast,jdbcType=TIMESTAMP},
+      <if test="dtLast != null">
+        dt_last = #{dtLast,jdbcType=TIMESTAMP},
       </if>
-     <if test="dtRtu != null">
-       dt_rtu = #{dtRtu,jdbcType=TIMESTAMP},
+      <if test="dtRtu != null">
+        dt_rtu = #{dtRtu,jdbcType=TIMESTAMP},
       </if>
       <if test="lossAmount != null">
         loss_amount = #{lossAmount,jdbcType=DOUBLE},
@@ -150,13 +150,66 @@
     <!--@mbg.generated-->
     update rm_loss_day_last
     set last_history_id = #{lastHistoryId,jdbcType=BIGINT},
-      controller_id = #{controllerId,jdbcType=BIGINT},
-      intake_id = #{intakeId,jdbcType=BIGINT},
-      rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
-      dt = #{dt,jdbcType=DATE},
-      dt_last = #{dtLast,jdbcType=TIMESTAMP},
-      dt_rtu = #{dtRtu,jdbcType=TIMESTAMP},
-      loss_amount = #{lossAmount,jdbcType=DOUBLE}
+    controller_id = #{controllerId,jdbcType=BIGINT},
+    intake_id = #{intakeId,jdbcType=BIGINT},
+    rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
+    dt = #{dt,jdbcType=DATE},
+    dt_last = #{dtLast,jdbcType=TIMESTAMP},
+    dt_rtu = #{dtRtu,jdbcType=TIMESTAMP},
+    loss_amount = #{lossAmount,jdbcType=DOUBLE}
     where id = #{id,jdbcType=BIGINT}
   </update>
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍鎬绘暟-->
+  <select id="getRecordCount" resultType="java.lang.Long">
+    select count(*)
+    from rm_loss_day_last rldl
+    Left join pr_intake pint on pint.id = rldl.intake_id
+    <where>
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+      </if>
+      <if test="startDt != null">
+        and rldl.dt &gt;= #{startDt,jdbcType=DATE}
+      </if>
+      <if test="endDt != null">
+        and rldl.dt &lt;= #{endDt,jdbcType=DATE}
+      </if>
+    </where>
+  </select>
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍-->
+  <select id="getLossDayLast" resultType="com.dy.pipIrrGlobal.voRm.VoLossDay">
+    select
+    CAST(rldl.intake_id AS char)AS intakeId,
+    CAST(rldl.controller_id AS char)AS controllerId,
+    pint.name as intakeName,
+    rldl.rtu_addr as rtuAddr,
+    rldl.dt as dt,
+    rldl.dt_last as dtLast,
+    rldl.dt_rtu as dtRtu,
+    rldl.loss_amount as lossAmount
+    from rm_loss_day_last rldl
+    Left join pr_intake pint on pint.id = rldl.intake_id
+    <where>
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+      </if>
+      <if test="startDt != null">
+        and rldl.dt &gt;= #{startDt,jdbcType=DATE}
+      </if>
+      <if test="endDt != null">
+        and rldl.dt &lt;= #{endDt,jdbcType=DATE}
+      </if>
+    </where>
+    ORDER BY rldl.dt DESC , rldl.loss_amount DESC
+    <if test="pageCurr != null and pageSize != null">
+      LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
+    </if>
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0