From 86719a90118b4b458ae593b53457f23c11ee8d44 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 七月 2024 15:27:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml | 111 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 79 insertions(+), 32 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
similarity index 62%
rename from pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossLastMapper.xml
rename to pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
index 5a99947..cf6a6ca 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmLossDayLastMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmLossLastMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmLossLast">
+<mapper namespace="com.dy.pipIrrGlobal.daoRm.RmLossDayLastMapper">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmLossDayLast">
<!--@mbg.generated-->
- <!--@Table rm_loss_last-->
+ <!--@Table rm_loss_day_last-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="last_history_id" jdbcType="BIGINT" property="lastHistoryId" />
<result column="controller_id" jdbcType="BIGINT" property="controllerId" />
@@ -20,42 +20,42 @@
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
- select
+ select
<include refid="Base_Column_List" />
- from rm_loss_last
+ from rm_loss_day_last
where id = #{id,jdbcType=BIGINT}
</select>
<select id="selectByIntakeId" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
- from rm_loss_last
+ from rm_loss_day_last
where intake_id = #{intakeId,jdbcType=BIGINT}
</select>
<select id="selectByDate" parameterType="java.util.Date" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
- from rm_loss_last
+ from rm_loss_day_last
where dt = #{dt,jdbcType=DATE}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
- delete from rm_loss_last
+ delete from rm_loss_day_last
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossLast">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDayLast">
<!--@mbg.generated-->
- insert into rm_loss_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.RmLossLast">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDayLast">
<!--@mbg.generated-->
- insert into rm_loss_last
+ insert into rm_loss_day_last
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
@@ -115,9 +115,9 @@
</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossLast">
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDayLast">
<!--@mbg.generated-->
- update rm_loss_last
+ update rm_loss_day_last
<set>
<if test="lastHistoryId != null">
last_history_id = #{lastHistoryId,jdbcType=BIGINT},
@@ -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},
@@ -146,17 +146,64 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossLast">
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmLossDayLast">
<!--@mbg.generated-->
- update rm_loss_last
+ 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="intakeName != null">
+ and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+ </if>
+ <if test="startDt != null">
+ and rldl.dt >= #{startDt,jdbcType=DATE}
+ </if>
+ <if test="endDt != null">
+ and rldl.dt <= #{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="intakeName != null">
+ and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
+ </if>
+ <if test="startDt != null">
+ and rldl.dt >= #{startDt,jdbcType=DATE}
+ </if>
+ <if test="endDt != null">
+ and rldl.dt <= #{endDt,jdbcType=DATE}
+ </if>
+ </where>
+ ORDER BY rldl.id 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