From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:18:51 +0800
Subject: [PATCH] 整理版本

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml |  517 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 517 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
new file mode 100644
index 0000000..da947b9
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
@@ -0,0 +1,517 @@
+<?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.RmWorkReportHistoryMapper">
+  <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory">
+    <!--@mbg.generated-->
+    <!--@Table rm_work_report_history-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="client_id" jdbcType="BIGINT" property="clientId" />
+    <result column="client_name" jdbcType="VARCHAR" property="clientName" />
+    <result column="controller_id" jdbcType="BIGINT" property="controllerId" />
+    <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
+    <result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
+    <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+    <result column="rtu_dt" jdbcType="TIMESTAMP" property="rtuDt" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="ic_card_addr" jdbcType="VARCHAR" property="icCardAddr" />
+    <result column="ic_card_no" jdbcType="VARCHAR" property="icCardNo" />
+    <result column="water_level" jdbcType="FLOAT" property="waterLevel" />
+    <result column="water_press" jdbcType="FLOAT" property="waterPress" />
+    <result column="water_instant" jdbcType="FLOAT" property="waterInstant" />
+    <result column="water_total" jdbcType="FLOAT" property="waterTotal" />
+    <result column="ele_total" jdbcType="FLOAT" property="eleTotal" />
+    <result column="money_remain" jdbcType="FLOAT" property="moneyRemain" />
+    <result column="water_remain" jdbcType="FLOAT" property="waterRemain" />
+    <result column="this_ele" jdbcType="FLOAT" property="thisEle" />
+    <result column="this_water" jdbcType="FLOAT" property="thisWater" />
+    <result column="this_money" jdbcType="FLOAT" property="thisMoney" />
+    <result column="this_duration" jdbcType="INTEGER" property="thisDuration" />
+    <result column="water_price" jdbcType="FLOAT" property="waterPrice" />
+    <result column="ele_price" jdbcType="FLOAT" property="elePrice" />
+    <result column="a_volt" jdbcType="FLOAT" property="aVolt" />
+    <result column="b_volt" jdbcType="FLOAT" property="bVolt" />
+    <result column="c_volt" jdbcType="FLOAT" property="cVolt" />
+    <result column="a_current" jdbcType="FLOAT" property="aCurrent" />
+    <result column="b_current" jdbcType="FLOAT" property="bCurrent" />
+    <result column="c_current" jdbcType="FLOAT" property="cCurrent" />
+    <result column="battery_volt" jdbcType="FLOAT" property="batteryVolt" />
+    <result column="water_meter_trans_volt" jdbcType="FLOAT" property="waterMeterTransVolt" />
+    <result column="water_meter_work_volt" jdbcType="FLOAT" property="waterMeterWorkVolt" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, client_id, client_name,
+    controller_id, intake_id, rtu_addr, dt, rtu_dt, order_no, ic_card_addr, ic_card_no,
+    water_level, water_press, water_instant, water_total, ele_total, money_remain, water_remain, 
+    this_ele, this_water, this_money, this_duration, water_price, ele_price, a_volt, 
+    b_volt, c_volt, a_current, b_current, c_current, battery_volt, water_meter_trans_volt, 
+    water_meter_work_volt
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from rm_work_report_history
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from rm_work_report_history
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory">
+    <!--@mbg.generated-->
+    insert into rm_work_report_history (id, client_id, client_name,
+      controller_id, intake_id,
+      rtu_addr, dt, rtu_dt, 
+      order_no, ic_card_addr, ic_card_no, 
+      water_level, water_press, water_instant, 
+      water_total, ele_total, money_remain, 
+      water_remain, this_ele, this_water, 
+      this_money, this_duration, water_price, 
+      ele_price, a_volt, b_volt, c_volt, 
+      a_current, b_current, c_current, 
+      battery_volt, water_meter_trans_volt, water_meter_work_volt
+      )
+    values (#{id,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT}, #{clientName,jdbcType=VARCHAR},
+      #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
+      #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP}, 
+      #{orderNo,jdbcType=VARCHAR}, #{icCardAddr,jdbcType=VARCHAR}, #{icCardNo,jdbcType=VARCHAR}, 
+      #{waterLevel,jdbcType=FLOAT}, #{waterPress,jdbcType=FLOAT}, #{waterInstant,jdbcType=FLOAT}, 
+      #{waterTotal,jdbcType=FLOAT}, #{eleTotal,jdbcType=FLOAT}, #{moneyRemain,jdbcType=FLOAT}, 
+      #{waterRemain,jdbcType=FLOAT}, #{thisEle,jdbcType=FLOAT}, #{thisWater,jdbcType=FLOAT}, 
+      #{thisMoney,jdbcType=FLOAT}, #{thisDuration,jdbcType=INTEGER}, #{waterPrice,jdbcType=FLOAT}, 
+      #{elePrice,jdbcType=FLOAT}, #{aVolt,jdbcType=FLOAT}, #{bVolt,jdbcType=FLOAT}, #{cVolt,jdbcType=FLOAT}, 
+      #{aCurrent,jdbcType=FLOAT}, #{bCurrent,jdbcType=FLOAT}, #{cCurrent,jdbcType=FLOAT}, 
+      #{batteryVolt,jdbcType=FLOAT}, #{waterMeterTransVolt,jdbcType=FLOAT}, #{waterMeterWorkVolt,jdbcType=FLOAT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory">
+    <!--@mbg.generated-->
+    insert into rm_work_report_history
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="clientId != null">
+        client_id,
+      </if>
+      <if test="clientName != null">
+        client_name,
+      </if>
+      <if test="controllerId != null">
+        controller_id,
+      </if>
+      <if test="intakeId != null">
+        intake_id,
+      </if>
+      <if test="rtuAddr != null">
+        rtu_addr,
+      </if>
+      <if test="dt != null">
+        dt,
+      </if>
+      <if test="rtuDt != null">
+        rtu_dt,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="icCardAddr != null">
+        ic_card_addr,
+      </if>
+      <if test="icCardNo != null">
+        ic_card_no,
+      </if>
+      <if test="waterLevel != null">
+        water_level,
+      </if>
+      <if test="waterPress != null">
+        water_press,
+      </if>
+      <if test="waterInstant != null">
+        water_instant,
+      </if>
+      <if test="waterTotal != null">
+        water_total,
+      </if>
+      <if test="eleTotal != null">
+        ele_total,
+      </if>
+      <if test="moneyRemain != null">
+        money_remain,
+      </if>
+      <if test="waterRemain != null">
+        water_remain,
+      </if>
+      <if test="thisEle != null">
+        this_ele,
+      </if>
+      <if test="thisWater != null">
+        this_water,
+      </if>
+      <if test="thisMoney != null">
+        this_money,
+      </if>
+      <if test="thisDuration != null">
+        this_duration,
+      </if>
+      <if test="waterPrice != null">
+        water_price,
+      </if>
+      <if test="elePrice != null">
+        ele_price,
+      </if>
+      <if test="aVolt != null">
+        a_volt,
+      </if>
+      <if test="bVolt != null">
+        b_volt,
+      </if>
+      <if test="cVolt != null">
+        c_volt,
+      </if>
+      <if test="aCurrent != null">
+        a_current,
+      </if>
+      <if test="bCurrent != null">
+        b_current,
+      </if>
+      <if test="cCurrent != null">
+        c_current,
+      </if>
+      <if test="batteryVolt != null">
+        battery_volt,
+      </if>
+      <if test="waterMeterTransVolt != null">
+        water_meter_trans_volt,
+      </if>
+      <if test="waterMeterWorkVolt != null">
+        water_meter_work_volt,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="clientId != null">
+        #{clientId,jdbcType=BIGINT},
+      </if>
+      <if test="clientName != null">
+        #{clientName,jdbcType=VARCHAR},
+      </if>
+      <if test="controllerId != null">
+        #{controllerId,jdbcType=BIGINT},
+      </if>
+      <if test="intakeId != null">
+        #{intakeId,jdbcType=BIGINT},
+      </if>
+      <if test="rtuAddr != null">
+        #{rtuAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="dt != null">
+        #{dt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rtuDt != null">
+        #{rtuDt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="icCardAddr != null">
+        #{icCardAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="icCardNo != null">
+        #{icCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="waterLevel != null">
+        #{waterLevel,jdbcType=FLOAT},
+      </if>
+      <if test="waterPress != null">
+        #{waterPress,jdbcType=FLOAT},
+      </if>
+      <if test="waterInstant != null">
+        #{waterInstant,jdbcType=FLOAT},
+      </if>
+      <if test="waterTotal != null">
+        #{waterTotal,jdbcType=FLOAT},
+      </if>
+      <if test="eleTotal != null">
+        #{eleTotal,jdbcType=FLOAT},
+      </if>
+      <if test="moneyRemain != null">
+        #{moneyRemain,jdbcType=FLOAT},
+      </if>
+      <if test="waterRemain != null">
+        #{waterRemain,jdbcType=FLOAT},
+      </if>
+      <if test="thisEle != null">
+        #{thisEle,jdbcType=FLOAT},
+      </if>
+      <if test="thisWater != null">
+        #{thisWater,jdbcType=FLOAT},
+      </if>
+      <if test="thisMoney != null">
+        #{thisMoney,jdbcType=FLOAT},
+      </if>
+      <if test="thisDuration != null">
+        #{thisDuration,jdbcType=INTEGER},
+      </if>
+      <if test="waterPrice != null">
+        #{waterPrice,jdbcType=FLOAT},
+      </if>
+      <if test="elePrice != null">
+        #{elePrice,jdbcType=FLOAT},
+      </if>
+      <if test="aVolt != null">
+        #{aVolt,jdbcType=FLOAT},
+      </if>
+      <if test="bVolt != null">
+        #{bVolt,jdbcType=FLOAT},
+      </if>
+      <if test="cVolt != null">
+        #{cVolt,jdbcType=FLOAT},
+      </if>
+      <if test="aCurrent != null">
+        #{aCurrent,jdbcType=FLOAT},
+      </if>
+      <if test="bCurrent != null">
+        #{bCurrent,jdbcType=FLOAT},
+      </if>
+      <if test="cCurrent != null">
+        #{cCurrent,jdbcType=FLOAT},
+      </if>
+      <if test="batteryVolt != null">
+        #{batteryVolt,jdbcType=FLOAT},
+      </if>
+      <if test="waterMeterTransVolt != null">
+        #{waterMeterTransVolt,jdbcType=FLOAT},
+      </if>
+      <if test="waterMeterWorkVolt != null">
+        #{waterMeterWorkVolt,jdbcType=FLOAT},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory">
+    <!--@mbg.generated-->
+    update rm_work_report_history
+    <set>
+      <if test="clientId != null">
+        client_id = #{clientId,jdbcType=BIGINT},
+      </if>
+      <if test="clientName != null">
+        client_name = #{clientName,jdbcType=VARCHAR},
+      </if>
+      <if test="controllerId != null">
+        controller_id = #{controllerId,jdbcType=BIGINT},
+      </if>
+      <if test="intakeId != null">
+        intake_id = #{intakeId,jdbcType=BIGINT},
+      </if>
+      <if test="rtuAddr != null">
+        rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="dt != null">
+        dt = #{dt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="rtuDt != null">
+        rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="icCardAddr != null">
+        ic_card_addr = #{icCardAddr,jdbcType=VARCHAR},
+      </if>
+      <if test="icCardNo != null">
+        ic_card_no = #{icCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="waterLevel != null">
+        water_level = #{waterLevel,jdbcType=FLOAT},
+      </if>
+      <if test="waterPress != null">
+        water_press = #{waterPress,jdbcType=FLOAT},
+      </if>
+      <if test="waterInstant != null">
+        water_instant = #{waterInstant,jdbcType=FLOAT},
+      </if>
+      <if test="waterTotal != null">
+        water_total = #{waterTotal,jdbcType=FLOAT},
+      </if>
+      <if test="eleTotal != null">
+        ele_total = #{eleTotal,jdbcType=FLOAT},
+      </if>
+      <if test="moneyRemain != null">
+        money_remain = #{moneyRemain,jdbcType=FLOAT},
+      </if>
+      <if test="waterRemain != null">
+        water_remain = #{waterRemain,jdbcType=FLOAT},
+      </if>
+      <if test="thisEle != null">
+        this_ele = #{thisEle,jdbcType=FLOAT},
+      </if>
+      <if test="thisWater != null">
+        this_water = #{thisWater,jdbcType=FLOAT},
+      </if>
+      <if test="thisMoney != null">
+        this_money = #{thisMoney,jdbcType=FLOAT},
+      </if>
+      <if test="thisDuration != null">
+        this_duration = #{thisDuration,jdbcType=INTEGER},
+      </if>
+      <if test="waterPrice != null">
+        water_price = #{waterPrice,jdbcType=FLOAT},
+      </if>
+      <if test="elePrice != null">
+        ele_price = #{elePrice,jdbcType=FLOAT},
+      </if>
+      <if test="aVolt != null">
+        a_volt = #{aVolt,jdbcType=FLOAT},
+      </if>
+      <if test="bVolt != null">
+        b_volt = #{bVolt,jdbcType=FLOAT},
+      </if>
+      <if test="cVolt != null">
+        c_volt = #{cVolt,jdbcType=FLOAT},
+      </if>
+      <if test="aCurrent != null">
+        a_current = #{aCurrent,jdbcType=FLOAT},
+      </if>
+      <if test="bCurrent != null">
+        b_current = #{bCurrent,jdbcType=FLOAT},
+      </if>
+      <if test="cCurrent != null">
+        c_current = #{cCurrent,jdbcType=FLOAT},
+      </if>
+      <if test="batteryVolt != null">
+        battery_volt = #{batteryVolt,jdbcType=FLOAT},
+      </if>
+      <if test="waterMeterTransVolt != null">
+        water_meter_trans_volt = #{waterMeterTransVolt,jdbcType=FLOAT},
+      </if>
+      <if test="waterMeterWorkVolt != null">
+        water_meter_work_volt = #{waterMeterWorkVolt,jdbcType=FLOAT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory">
+    <!--@mbg.generated-->
+    update rm_work_report_history
+    set client_id = #{clientId,jdbcType=BIGINT},
+      client_name = #{clientName,jdbcType=VARCHAR},
+      controller_id = #{controllerId,jdbcType=BIGINT},
+      intake_id = #{intakeId,jdbcType=BIGINT},
+      rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
+      dt = #{dt,jdbcType=TIMESTAMP},
+      rtu_dt = #{rtuDt,jdbcType=TIMESTAMP},
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      ic_card_addr = #{icCardAddr,jdbcType=VARCHAR},
+      ic_card_no = #{icCardNo,jdbcType=VARCHAR},
+      water_level = #{waterLevel,jdbcType=FLOAT},
+      water_press = #{waterPress,jdbcType=FLOAT},
+      water_instant = #{waterInstant,jdbcType=FLOAT},
+      water_total = #{waterTotal,jdbcType=FLOAT},
+      ele_total = #{eleTotal,jdbcType=FLOAT},
+      money_remain = #{moneyRemain,jdbcType=FLOAT},
+      water_remain = #{waterRemain,jdbcType=FLOAT},
+      this_ele = #{thisEle,jdbcType=FLOAT},
+      this_water = #{thisWater,jdbcType=FLOAT},
+      this_money = #{thisMoney,jdbcType=FLOAT},
+      this_duration = #{thisDuration,jdbcType=INTEGER},
+      water_price = #{waterPrice,jdbcType=FLOAT},
+      ele_price = #{elePrice,jdbcType=FLOAT},
+      a_volt = #{aVolt,jdbcType=FLOAT},
+      b_volt = #{bVolt,jdbcType=FLOAT},
+      c_volt = #{cVolt,jdbcType=FLOAT},
+      a_current = #{aCurrent,jdbcType=FLOAT},
+      b_current = #{bCurrent,jdbcType=FLOAT},
+      c_current = #{cCurrent,jdbcType=FLOAT},
+      battery_volt = #{batteryVolt,jdbcType=FLOAT},
+      water_meter_trans_volt = #{waterMeterTransVolt,jdbcType=FLOAT},
+      water_meter_work_volt = #{waterMeterWorkVolt,jdbcType=FLOAT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇宸ヤ綔鎶ュ巻鍙茶褰曟暟閲�-->
+  <select id="getWorkReportsCount_history" resultType="java.lang.Long">
+    SELECT
+        COUNT(*) AS recordCount
+    FROM rm_work_report_history wo
+        INNER JOIN pr_intake inta ON inta.id = wo.intake_id
+    <where>
+      <if test="intakeId != null and intakeId >0">
+        AND wo.intake_id = #{intakeId}
+      </if>
+      <if test = "intakeNum != null and intakeNum !=''">
+        AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
+      </if>
+      <if test = "rtuAddr != null and rtuAddr !=''">
+        AND wo.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
+      </if>
+      <if test = "timeStart != null and timeStop != null">
+        AND wo.dt BETWEEN #{timeStart} AND #{timeStop}
+      </if>
+    </where>
+  </select>
+
+  <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇宸ヤ綔鎶ュ巻鍙茶褰�-->
+  <select id="getWorkReports_history" resultType="com.dy.pipIrrGlobal.voRm.VoWork">
+    SELECT
+      wo.intake_id AS intakeId,
+      inta.name AS intakeNum,
+      wo.rtu_addr AS rtuAddr,
+      wo.client_name AS clientName,
+      wo.client_name  AS clientName,
+      cl.address  AS clientAddr,
+      wo.ic_card_no AS icNum,
+      wo.ic_card_addr AS icAddr,
+      wo.dt AS receiveTime,
+      wo.order_no AS orderNo,
+      wo.water_level AS waterLevel,
+      wo.water_press AS waterPress,
+      wo.water_instant AS waterInstant,
+      wo.water_total AS waterTotal,
+      wo.ele_total AS eleTotal,
+      wo.money_remain AS moneyRemain,
+      wo.water_remain AS waterRemain,
+      wo.this_ele AS thisEle,
+      wo.this_water AS thisWater,
+      wo.this_money AS thisMoney,
+      wo.this_duration AS thisDuration,
+      wo.water_price AS waterPrice,
+      wo.ele_price AS elePrice,
+      wo.a_volt AS aVolt,
+      wo.b_volt AS bVolt,
+      wo.c_volt AS cVolt,
+      wo.a_current AS aCurrent,
+      wo.b_current AS bCurrent,
+      wo.c_current AS cCurrent,
+      wo.battery_volt AS batteryVolt,
+      wo.water_meter_trans_volt AS waterMeterTransVolt,
+      wo.water_meter_work_volt AS waterMeterWorkVolt
+    FROM rm_work_report_history wo
+    INNER JOIN pr_intake inta ON inta.id = wo.intake_id
+    LEFT JOIN se_client cl on wo.client_id = cl.id
+    <where>
+      <if test="intakeId != null and intakeId >0">
+        AND wo.intake_id = #{intakeId}
+      </if>
+      <if test = "intakeNum != null and intakeNum !=''">
+        AND inta.name LIKE CONCAT('%',#{intakeNum},'%')
+      </if>
+      <if test = "rtuAddr != null and rtuAddr !=''">
+        AND wo.rtu_addr LIKE CONCAT('%',#{rtuAddr},'%')
+      </if>
+      <if test = "timeStart != null and timeStop != null">
+        AND wo.dt BETWEEN #{timeStart} AND #{timeStop}
+      </if>
+    </where>
+    ORDER BY wo.dt 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