From 0c5606be951e50c6e86671ecde51b012f5d55735 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 14:32:26 +0800
Subject: [PATCH] 2024-06-18 朱宝民 开关阀报(未完)

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml |  368 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 210 insertions(+), 158 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index 0ffaefd..34d58a7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -5,35 +5,41 @@
     <!--@mbg.generated-->
     <!--@Table rm_open_close_valve_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" />
     <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
     <result column="rtu_addr" jdbcType="VARCHAR" property="rtuAddr" />
     <result column="op_dt" jdbcType="TIMESTAMP" property="opDt" />
-    <result column="op_type" jdbcType="TINYINT" property="opType" />
-    <result column="op_total_amount" jdbcType="DOUBLE" property="opTotalAmount" />
-    <result column="op_ic_card_no" jdbcType="VARCHAR" property="opIcCardNo" />
+    <result column="op_rtu_dt" jdbcType="TIMESTAMP" property="opRtuDt" />
     <result column="op_ic_card_addr" jdbcType="VARCHAR" property="opIcCardAddr" />
-    <result column="op_remain_money" jdbcType="DOUBLE" property="opRemainMoney" />
+    <result column="op_ic_card_no" jdbcType="VARCHAR" property="opIcCardNo" />
+    <result column="op_order_no" jdbcType="VARCHAR" property="opOrderNo" />
     <result column="open_dt" jdbcType="TIMESTAMP" property="openDt" />
-    <result column="cl_dt" jdbcType="TIMESTAMP" property="clDt" />
-    <result column="cl_type" jdbcType="TINYINT" property="clType" />
-    <result column="cl_total_amount" jdbcType="DOUBLE" property="clTotalAmount" />
-    <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
+    <result column="op_water_total_amount" jdbcType="FLOAT" property="opWaterTotalAmount" />
+    <result column="op_ele_total_amount" jdbcType="FLOAT" property="opEleTotalAmount" />
+    <result column="op_money_remain_user" jdbcType="FLOAT" property="opMoneyRemainUser" />
+    <result column="op_water_remain_user" jdbcType="FLOAT" property="opWaterRemainUser" />
+    <result column="op_type" jdbcType="VARCHAR" property="opType" />
     <result column="cl_ic_card_addr" jdbcType="VARCHAR" property="clIcCardAddr" />
-    <result column="cl_remain_money" jdbcType="DOUBLE" property="clRemainMoney" />
-    <result column="cl_this_amount" jdbcType="DOUBLE" property="clThisAmount" />
-    <result column="cl_this_money" jdbcType="DOUBLE" property="clThisMoney" />
-    <result column="cl_this_time" jdbcType="INTEGER" property="clThisTime" />
-    <result column="cl_open_dt" jdbcType="TIMESTAMP" property="clOpenDt" />
-    <result column="close_dt" jdbcType="TIMESTAMP" property="closeDt" />
+    <result column="cl_ic_card_no" jdbcType="VARCHAR" property="clIcCardNo" />
+    <result column="cl_order_no" jdbcType="VARCHAR" property="clOrderNo" />
+    <result column="start_dt" jdbcType="TIMESTAMP" property="startDt" />
+    <result column="end_dt" jdbcType="TIMESTAMP" property="endDt" />
+    <result column="cl_water_total_amount" jdbcType="FLOAT" property="clWaterTotalAmount" />
+    <result column="cl_ele_total_amount" jdbcType="FLOAT" property="clEleTotalAmount" />
+    <result column="cl_money_remain_user" jdbcType="FLOAT" property="clMoneyRemainUser" />
+    <result column="cl_water_remain_user" jdbcType="FLOAT" property="clWaterRemainUser" />
+    <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" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, last_history_id, controller_id, intake_id, rtu_addr, op_dt, op_type, op_total_amount, op_ic_card_no,
-    op_ic_card_addr, op_remain_money, open_dt, cl_dt, cl_type, cl_total_amount, cl_ic_card_no, 
-    cl_ic_card_addr, cl_remain_money, cl_this_amount, cl_this_money, cl_this_time, cl_open_dt, 
-    close_dt
+    id, controller_id, intake_id, rtu_addr, op_dt, op_rtu_dt, op_ic_card_addr, op_ic_card_no, 
+    op_order_no, open_dt, op_water_total_amount, op_ele_total_amount, op_money_remain_user, 
+    op_water_remain_user, op_type, cl_ic_card_addr, cl_ic_card_no, cl_order_no, start_dt, 
+    end_dt, cl_water_total_amount, cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user, 
+    this_ele, this_water, this_money, this_duration
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -42,14 +48,6 @@
     from rm_open_close_valve_last
     where id = #{id,jdbcType=BIGINT}
   </select>
-
-  <select id="selectByRtuAddr" parameterType="java.lang.String" resultMap="BaseResultMap">
-    <!--@mbg.generated-->
-    select
-    <include refid="Base_Column_List" />
-    from rm_open_close_valve_last
-    where rtu_addr = #{rtuAddr,jdbcType=VARCHAR}
-  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
     delete from rm_open_close_valve_last
@@ -57,22 +55,26 @@
   </delete>
   <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
     <!--@mbg.generated-->
-    insert into rm_open_close_valve_last (id, last_history_id, controller_id, intake_id,
-      rtu_addr, op_dt, op_type, 
-      op_total_amount, op_ic_card_no, op_ic_card_addr, 
-      op_remain_money, open_dt, cl_dt, 
-      cl_type, cl_total_amount, cl_ic_card_no, 
-      cl_ic_card_addr, cl_remain_money, cl_this_amount, 
-      cl_this_money, cl_this_time, cl_open_dt, 
-      close_dt)
-    values (#{id,jdbcType=BIGINT}, #{lastHistoryId,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT},
-      #{intakeId,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP},
-      #{opType,jdbcType=TINYINT}, #{opTotalAmount,jdbcType=DOUBLE}, #{opIcCardNo,jdbcType=VARCHAR},
-      #{opIcCardAddr,jdbcType=VARCHAR}, #{opRemainMoney,jdbcType=DOUBLE}, #{openDt,jdbcType=TIMESTAMP},
-      #{clDt,jdbcType=TIMESTAMP}, #{clType,jdbcType=TINYINT}, #{clTotalAmount,jdbcType=DOUBLE},
-      #{clIcCardNo,jdbcType=VARCHAR}, #{clIcCardAddr,jdbcType=VARCHAR}, #{clRemainMoney,jdbcType=DOUBLE},
-      #{clThisAmount,jdbcType=DOUBLE}, #{clThisMoney,jdbcType=DOUBLE}, #{clThisTime,jdbcType=INTEGER},
-      #{clOpenDt,jdbcType=TIMESTAMP}, #{closeDt,jdbcType=TIMESTAMP})
+    insert into rm_open_close_valve_last (id, controller_id, intake_id, 
+      rtu_addr, op_dt, op_rtu_dt, 
+      op_ic_card_addr, op_ic_card_no, op_order_no, 
+      open_dt, op_water_total_amount, op_ele_total_amount, 
+      op_money_remain_user, op_water_remain_user, op_type, 
+      cl_ic_card_addr, cl_ic_card_no, cl_order_no, 
+      start_dt, end_dt, cl_water_total_amount, 
+      cl_ele_total_amount, cl_money_remain_user, cl_water_remain_user, 
+      this_ele, this_water, this_money, 
+      this_duration)
+    values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, 
+      #{rtuAddr,jdbcType=VARCHAR}, #{opDt,jdbcType=TIMESTAMP}, #{opRtuDt,jdbcType=TIMESTAMP}, 
+      #{opIcCardAddr,jdbcType=VARCHAR}, #{opIcCardNo,jdbcType=VARCHAR}, #{opOrderNo,jdbcType=VARCHAR}, 
+      #{openDt,jdbcType=TIMESTAMP}, #{opWaterTotalAmount,jdbcType=FLOAT}, #{opEleTotalAmount,jdbcType=FLOAT}, 
+      #{opMoneyRemainUser,jdbcType=FLOAT}, #{opWaterRemainUser,jdbcType=FLOAT}, #{opType,jdbcType=VARCHAR}, 
+      #{clIcCardAddr,jdbcType=VARCHAR}, #{clIcCardNo,jdbcType=VARCHAR}, #{clOrderNo,jdbcType=VARCHAR}, 
+      #{startDt,jdbcType=TIMESTAMP}, #{endDt,jdbcType=TIMESTAMP}, #{clWaterTotalAmount,jdbcType=FLOAT}, 
+      #{clEleTotalAmount,jdbcType=FLOAT}, #{clMoneyRemainUser,jdbcType=FLOAT}, #{clWaterRemainUser,jdbcType=FLOAT}, 
+      #{thisEle,jdbcType=FLOAT}, #{thisWater,jdbcType=FLOAT}, #{thisMoney,jdbcType=FLOAT}, 
+      #{thisDuration,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
     <!--@mbg.generated-->
@@ -80,9 +82,6 @@
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
-      </if>
-      <if test="lastHistoryId != null">
-        last_history_id,
       </if>
       <if test="controllerId != null">
         controller_id,
@@ -96,64 +95,79 @@
       <if test="opDt != null">
         op_dt,
       </if>
-      <if test="opType != null">
-        op_type,
-      </if>
-      <if test="opTotalAmount != null">
-        op_total_amount,
-      </if>
-      <if test="opIcCardNo != null">
-        op_ic_card_no,
+      <if test="opRtuDt != null">
+        op_rtu_dt,
       </if>
       <if test="opIcCardAddr != null">
         op_ic_card_addr,
       </if>
-      <if test="opRemainMoney != null">
-        op_remain_money,
+      <if test="opIcCardNo != null">
+        op_ic_card_no,
+      </if>
+      <if test="opOrderNo != null">
+        op_order_no,
       </if>
       <if test="openDt != null">
         open_dt,
       </if>
-      <if test="clDt != null">
-        cl_dt,
+      <if test="opWaterTotalAmount != null">
+        op_water_total_amount,
       </if>
-      <if test="clType != null">
-        cl_type,
+      <if test="opEleTotalAmount != null">
+        op_ele_total_amount,
       </if>
-      <if test="clTotalAmount != null">
-        cl_total_amount,
+      <if test="opMoneyRemainUser != null">
+        op_money_remain_user,
       </if>
-      <if test="clIcCardNo != null">
-        cl_ic_card_no,
+      <if test="opWaterRemainUser != null">
+        op_water_remain_user,
+      </if>
+      <if test="opType != null">
+        op_type,
       </if>
       <if test="clIcCardAddr != null">
         cl_ic_card_addr,
       </if>
-      <if test="clRemainMoney != null">
-        cl_remain_money,
+      <if test="clIcCardNo != null">
+        cl_ic_card_no,
       </if>
-      <if test="clThisAmount != null">
-        cl_this_amount,
+      <if test="clOrderNo != null">
+        cl_order_no,
       </if>
-      <if test="clThisMoney != null">
-        cl_this_money,
+      <if test="startDt != null">
+        start_dt,
       </if>
-      <if test="clThisTime != null">
-        cl_this_time,
+      <if test="endDt != null">
+        end_dt,
       </if>
-      <if test="clOpenDt != null">
-        cl_open_dt,
+      <if test="clWaterTotalAmount != null">
+        cl_water_total_amount,
       </if>
-      <if test="closeDt != null">
-        close_dt,
+      <if test="clEleTotalAmount != null">
+        cl_ele_total_amount,
+      </if>
+      <if test="clMoneyRemainUser != null">
+        cl_money_remain_user,
+      </if>
+      <if test="clWaterRemainUser != null">
+        cl_water_remain_user,
+      </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>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
         #{id,jdbcType=BIGINT},
-      </if>
-      <if test="lastHistoryId != null">
-        #{lastHistoryId,jdbcType=BIGINT},
       </if>
       <if test="controllerId != null">
         #{controllerId,jdbcType=BIGINT},
@@ -167,56 +181,74 @@
       <if test="opDt != null">
         #{opDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="opType != null">
-        #{opType,jdbcType=TINYINT},
-      </if>
-      <if test="opTotalAmount != null">
-        #{opTotalAmount,jdbcType=DOUBLE},
-      </if>
-      <if test="opIcCardNo != null">
-        #{opIcCardNo,jdbcType=VARCHAR},
+      <if test="opRtuDt != null">
+        #{opRtuDt,jdbcType=TIMESTAMP},
       </if>
       <if test="opIcCardAddr != null">
         #{opIcCardAddr,jdbcType=VARCHAR},
       </if>
-      <if test="opRemainMoney != null">
-        #{opRemainMoney,jdbcType=DOUBLE},
+      <if test="opIcCardNo != null">
+        #{opIcCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="opOrderNo != null">
+        #{opOrderNo,jdbcType=VARCHAR},
       </if>
       <if test="openDt != null">
         #{openDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="clDt != null">
-        #{clDt,jdbcType=TIMESTAMP},
+      <if test="opWaterTotalAmount != null">
+        #{opWaterTotalAmount,jdbcType=FLOAT},
       </if>
-      <if test="clType != null">
-        #{clType,jdbcType=TINYINT},
+      <if test="opEleTotalAmount != null">
+        #{opEleTotalAmount,jdbcType=FLOAT},
       </if>
-      <if test="clTotalAmount != null">
-        #{clTotalAmount,jdbcType=DOUBLE},
+      <if test="opMoneyRemainUser != null">
+        #{opMoneyRemainUser,jdbcType=FLOAT},
       </if>
-      <if test="clIcCardNo != null">
-        #{clIcCardNo,jdbcType=VARCHAR},
+      <if test="opWaterRemainUser != null">
+        #{opWaterRemainUser,jdbcType=FLOAT},
+      </if>
+      <if test="opType != null">
+        #{opType,jdbcType=VARCHAR},
       </if>
       <if test="clIcCardAddr != null">
         #{clIcCardAddr,jdbcType=VARCHAR},
       </if>
-      <if test="clRemainMoney != null">
-        #{clRemainMoney,jdbcType=DOUBLE},
+      <if test="clIcCardNo != null">
+        #{clIcCardNo,jdbcType=VARCHAR},
       </if>
-      <if test="clThisAmount != null">
-        #{clThisAmount,jdbcType=DOUBLE},
+      <if test="clOrderNo != null">
+        #{clOrderNo,jdbcType=VARCHAR},
       </if>
-      <if test="clThisMoney != null">
-        #{clThisMoney,jdbcType=DOUBLE},
+      <if test="startDt != null">
+        #{startDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="clThisTime != null">
-        #{clThisTime,jdbcType=INTEGER},
+      <if test="endDt != null">
+        #{endDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="clOpenDt != null">
-        #{clOpenDt,jdbcType=TIMESTAMP},
+      <if test="clWaterTotalAmount != null">
+        #{clWaterTotalAmount,jdbcType=FLOAT},
       </if>
-      <if test="closeDt != null">
-        #{closeDt,jdbcType=TIMESTAMP},
+      <if test="clEleTotalAmount != null">
+        #{clEleTotalAmount,jdbcType=FLOAT},
+      </if>
+      <if test="clMoneyRemainUser != null">
+        #{clMoneyRemainUser,jdbcType=FLOAT},
+      </if>
+      <if test="clWaterRemainUser != null">
+        #{clWaterRemainUser,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>
     </trim>
   </insert>
@@ -224,9 +256,6 @@
     <!--@mbg.generated-->
     update rm_open_close_valve_last
     <set>
-      <if test="lastHistoryId != null">
-        last_history_id = #{lastHistoryId,jdbcType=BIGINT},
-      </if>
       <if test="controllerId != null">
         controller_id = #{controllerId,jdbcType=BIGINT},
       </if>
@@ -239,56 +268,74 @@
       <if test="opDt != null">
         op_dt = #{opDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="opType != null">
-        op_type = #{opType,jdbcType=TINYINT},
-      </if>
-      <if test="opTotalAmount != null">
-        op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
-      </if>
-      <if test="opIcCardNo != null">
-        op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+      <if test="opRtuDt != null">
+        op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
       </if>
       <if test="opIcCardAddr != null">
         op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
       </if>
-      <if test="opRemainMoney != null">
-        op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
+      <if test="opIcCardNo != null">
+        op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="opOrderNo != null">
+        op_order_no = #{opOrderNo,jdbcType=VARCHAR},
       </if>
       <if test="openDt != null">
         open_dt = #{openDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="clDt != null">
-        cl_dt = #{clDt,jdbcType=TIMESTAMP},
+      <if test="opWaterTotalAmount != null">
+        op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
       </if>
-      <if test="clType != null">
-        cl_type = #{clType,jdbcType=TINYINT},
+      <if test="opEleTotalAmount != null">
+        op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
       </if>
-      <if test="clTotalAmount != null">
-        cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
+      <if test="opMoneyRemainUser != null">
+        op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
       </if>
-      <if test="clIcCardNo != null">
-        cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+      <if test="opWaterRemainUser != null">
+        op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+      </if>
+      <if test="opType != null">
+        op_type = #{opType,jdbcType=VARCHAR},
       </if>
       <if test="clIcCardAddr != null">
         cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
       </if>
-      <if test="clRemainMoney != null">
-        cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
+      <if test="clIcCardNo != null">
+        cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
       </if>
-      <if test="clThisAmount != null">
-        cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
+      <if test="clOrderNo != null">
+        cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
       </if>
-      <if test="clThisMoney != null">
-        cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
+      <if test="startDt != null">
+        start_dt = #{startDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="clThisTime != null">
-        cl_this_time = #{clThisTime,jdbcType=INTEGER},
+      <if test="endDt != null">
+        end_dt = #{endDt,jdbcType=TIMESTAMP},
       </if>
-      <if test="clOpenDt != null">
-        cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
+      <if test="clWaterTotalAmount != null">
+        cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
       </if>
-      <if test="closeDt != null">
-        close_dt = #{closeDt,jdbcType=TIMESTAMP},
+      <if test="clEleTotalAmount != null">
+        cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+      </if>
+      <if test="clMoneyRemainUser != null">
+        cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
+      </if>
+      <if test="clWaterRemainUser != null">
+        cl_water_remain_user = #{clWaterRemainUser,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>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -296,28 +343,33 @@
   <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast">
     <!--@mbg.generated-->
     update rm_open_close_valve_last
-    set last_history_id = #{lastHistoryId,jdbcType=BIGINT},
-      controller_id = #{controllerId,jdbcType=BIGINT},
+    set controller_id = #{controllerId,jdbcType=BIGINT},
       intake_id = #{intakeId,jdbcType=BIGINT},
       rtu_addr = #{rtuAddr,jdbcType=VARCHAR},
       op_dt = #{opDt,jdbcType=TIMESTAMP},
-      op_type = #{opType,jdbcType=TINYINT},
-      op_total_amount = #{opTotalAmount,jdbcType=DOUBLE},
-      op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+      op_rtu_dt = #{opRtuDt,jdbcType=TIMESTAMP},
       op_ic_card_addr = #{opIcCardAddr,jdbcType=VARCHAR},
-      op_remain_money = #{opRemainMoney,jdbcType=DOUBLE},
+      op_ic_card_no = #{opIcCardNo,jdbcType=VARCHAR},
+      op_order_no = #{opOrderNo,jdbcType=VARCHAR},
       open_dt = #{openDt,jdbcType=TIMESTAMP},
-      cl_dt = #{clDt,jdbcType=TIMESTAMP},
-      cl_type = #{clType,jdbcType=TINYINT},
-      cl_total_amount = #{clTotalAmount,jdbcType=DOUBLE},
-      cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+      op_water_total_amount = #{opWaterTotalAmount,jdbcType=FLOAT},
+      op_ele_total_amount = #{opEleTotalAmount,jdbcType=FLOAT},
+      op_money_remain_user = #{opMoneyRemainUser,jdbcType=FLOAT},
+      op_water_remain_user = #{opWaterRemainUser,jdbcType=FLOAT},
+      op_type = #{opType,jdbcType=VARCHAR},
       cl_ic_card_addr = #{clIcCardAddr,jdbcType=VARCHAR},
-      cl_remain_money = #{clRemainMoney,jdbcType=DOUBLE},
-      cl_this_amount = #{clThisAmount,jdbcType=DOUBLE},
-      cl_this_money = #{clThisMoney,jdbcType=DOUBLE},
-      cl_this_time = #{clThisTime,jdbcType=INTEGER},
-      cl_open_dt = #{clOpenDt,jdbcType=TIMESTAMP},
-      close_dt = #{closeDt,jdbcType=TIMESTAMP}
+      cl_ic_card_no = #{clIcCardNo,jdbcType=VARCHAR},
+      cl_order_no = #{clOrderNo,jdbcType=VARCHAR},
+      start_dt = #{startDt,jdbcType=TIMESTAMP},
+      end_dt = #{endDt,jdbcType=TIMESTAMP},
+      cl_water_total_amount = #{clWaterTotalAmount,jdbcType=FLOAT},
+      cl_ele_total_amount = #{clEleTotalAmount,jdbcType=FLOAT},
+      cl_money_remain_user = #{clMoneyRemainUser,jdbcType=FLOAT},
+      cl_water_remain_user = #{clWaterRemainUser,jdbcType=FLOAT},
+      this_ele = #{thisEle,jdbcType=FLOAT},
+      this_water = #{thisWater,jdbcType=FLOAT},
+      this_money = #{thisMoney,jdbcType=FLOAT},
+      this_duration = #{thisDuration,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0