保存蓝牙充电记录

jsowell-pile/src/main/java/com/jsowell/pile/domain/PersonalChargingRecord.java

@@ -1,7 +1,5 @@
 package com.jsowell.pile.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,9 +7,12 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
-    * 个人充电桩的充电记录
-    */
+ * 个人充电桩的充电记录
+ */
 @Data
 @Accessors(chain = true)
 @SuperBuilder
@@ -20,157 +21,177 @@ import lombok.experimental.SuperBuilder;
 @NoArgsConstructor
 public class PersonalChargingRecord {
     /**
-    * 主键
-    */
+     * 主键
+     */
     private Integer id;
 
     /**
-    * 交易流水号
-    */
+     * 交易流水号
+     */
     private String transactionCode;
 
     /**
-    * 订单状态(0-未启动；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成；7-超时关闭)
-    */
+     * 订单状态(0-未启动；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成；7-超时关闭)
+     */
     private String status;
 
     /**
-    * 会员id
-    */
+     * 会员id
+     */
     private String memberId;
 
     /**
-    * 站点id
-    */
+     * 站点id
+     */
     private String stationId;
 
     /**
-    * 运营商id
-    */
+     * 运营商id
+     */
     private String merchantId;
 
     /**
-    * 充电桩sn
-    */
+     * 充电桩sn
+     */
     private String pileSn;
 
     /**
-    * 充电桩枪口号
-    */
+     * 充电桩枪口号
+     */
     private String connectorCode;
 
     /**
-    * 充电桩枪口编号
-    */
+     * 充电桩枪口编号
+     */
     private String pileConnectorCode;
 
     /**
-    * 卡启动时的卡号
-    */
+     * 卡启动时的卡号
+     */
     private String logicCard;
 
     /**
-    * vin启动时的vin码
-    */
+     * vin启动时的vin码
+     */
     private String vinCode;
 
     /**
-    * 启动方式（0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-第三方平台启动; 5-车辆vin码启动）
-    */
+     * 启动方式（0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-第三方平台启动; 5-车辆vin码启动）
+     */
     private String startMode;
 
     /**
-    * 车牌号码
-    */
+     * 车牌号码
+     */
     private String plateNumber;
 
     /**
-    * 充电开始时间
-    */
+     * 充电开始时间
+     */
     private Date chargeStartTime;
 
     /**
-    * 充电结束时间
-    */
+     * 充电结束时间
+     */
     private Date chargeEndTime;
 
     /**
-    * 启动类型（now-立即启动；reservation-预约启动）
-    */
+     * 启动类型（now-立即启动；reservation-预约启动）
+     */
     private String startType;
 
     /**
-    * 预约开始时间
-    */
+     * 预约开始时间
+     */
     private Date reservationStartTime;
 
     /**
-    * 预约结束时间
-    */
+     * 预约结束时间
+     */
     private Date reservationEndTime;
 
     /**
-    * 开始SOC
-    */
+     * 开始SOC
+     */
     private String startSoc;
 
     /**
-    * 结束SOC
-    */
+     * 结束SOC
+     */
     private String endSoc;
 
     /**
-    * 总用电量
-    */
+     * 电表总起值
+     */
+    private String ammeterTotalStart;
+
+    /**
+     * 电表总止值
+     */
+    private String ammeterTotalEnd;
+
+    /**
+     * 总用电量
+     */
     private BigDecimal totalUsedElectricity;
 
     /**
-    * 尖时段用电量
-    */
+     * 尖时段用电量
+     */
     private BigDecimal sharpUsedElectricity;
 
     /**
-    * 峰时段用电量
-    */
+     * 峰时段用电量
+     */
     private BigDecimal peakUsedElectricity;
 
     /**
-    * 平时段用电量
-    */
+     * 平时段用电量
+     */
     private BigDecimal flatUsedElectricity;
 
     /**
-    * 谷时段用电量
-    */
+     * 谷时段用电量
+     */
     private BigDecimal valleyUsedElectricity;
 
     /**
-    * 异常原因
-    */
+     * 异常原因
+     */
     private String reason;
 
     /**
-    * 创建人
-    */
+     * 交易日期
+     */
+    private Date tradeDate;
+
+    /**
+     * 来源(4G/BT)
+     */
+    private String sourceType;
+
+    /**
+     * 创建人
+     */
     private String createBy;
 
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     private Date createTime;
 
     /**
-    * 更新人
-    */
+     * 更新人
+     */
     private String updateBy;
 
     /**
-    * 更新时间
-    */
+     * 更新时间
+     */
     private Date updateTime;
 
     /**
-    * 删除标识（0-正常；1-删除）
-    */
+     * 删除标识（0-正常；1-删除）
+     */
     private String delFlag;
 }

jsowell-pile/src/main/resources/mapper/pile/PersonalChargingRecordMapper.xml

@@ -24,12 +24,16 @@
     <result column="reservation_end_time" jdbcType="TIMESTAMP" property="reservationEndTime" />
     <result column="start_soc" jdbcType="VARCHAR" property="startSoc" />
     <result column="end_soc" jdbcType="VARCHAR" property="endSoc" />
+    <result column="ammeter_total_start" jdbcType="VARCHAR" property="ammeterTotalStart" />
+    <result column="ammeter_total_end" jdbcType="VARCHAR" property="ammeterTotalEnd" />
     <result column="total_used_electricity" jdbcType="DECIMAL" property="totalUsedElectricity" />
     <result column="sharp_used_electricity" jdbcType="DECIMAL" property="sharpUsedElectricity" />
     <result column="peak_used_electricity" jdbcType="DECIMAL" property="peakUsedElectricity" />
     <result column="flat_used_electricity" jdbcType="DECIMAL" property="flatUsedElectricity" />
     <result column="valley_used_electricity" jdbcType="DECIMAL" property="valleyUsedElectricity" />
     <result column="reason" jdbcType="VARCHAR" property="reason" />
+    <result column="trade_date" jdbcType="TIMESTAMP" property="tradeDate" />
+    <result column="source_type" jdbcType="VARCHAR" property="sourceType" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
@@ -41,9 +45,9 @@
     id, transaction_code, `status`, member_id, station_id, merchant_id, pile_sn, connector_code, 
     pile_connector_code, logic_card, vin_code, start_mode, plate_number, charge_start_time, 
     charge_end_time, start_type, reservation_start_time, reservation_end_time, start_soc, 
-    end_soc, total_used_electricity, sharp_used_electricity, peak_used_electricity, flat_used_electricity, 
-    valley_used_electricity, reason, create_by, create_time, update_by, update_time, 
-    del_flag
+    end_soc, ammeter_total_start, ammeter_total_end, total_used_electricity, sharp_used_electricity, 
+    peak_used_electricity, flat_used_electricity, valley_used_electricity, reason, trade_date, 
+    source_type, create_by, create_time, update_by, update_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -65,24 +69,26 @@
       vin_code, start_mode, plate_number, 
       charge_start_time, charge_end_time, start_type, 
       reservation_start_time, reservation_end_time, 
-      start_soc, end_soc, total_used_electricity, 
+      start_soc, end_soc, ammeter_total_start, 
+      ammeter_total_end, total_used_electricity, 
       sharp_used_electricity, peak_used_electricity, 
       flat_used_electricity, valley_used_electricity, 
-      reason, create_by, create_time, 
-      update_by, update_time, del_flag
-      )
+      reason, trade_date, source_type, 
+      create_by, create_time, update_by, 
+      update_time, del_flag)
     values (#{transactionCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
       #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{pileSn,jdbcType=VARCHAR}, 
       #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR}, #{logicCard,jdbcType=VARCHAR}, 
       #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, #{plateNumber,jdbcType=VARCHAR}, 
       #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR}, 
       #{reservationStartTime,jdbcType=TIMESTAMP}, #{reservationEndTime,jdbcType=TIMESTAMP}, 
-      #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, #{totalUsedElectricity,jdbcType=DECIMAL}, 
+      #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, #{ammeterTotalStart,jdbcType=VARCHAR}, 
+      #{ammeterTotalEnd,jdbcType=VARCHAR}, #{totalUsedElectricity,jdbcType=DECIMAL}, 
       #{sharpUsedElectricity,jdbcType=DECIMAL}, #{peakUsedElectricity,jdbcType=DECIMAL}, 
       #{flatUsedElectricity,jdbcType=DECIMAL}, #{valleyUsedElectricity,jdbcType=DECIMAL}, 
-      #{reason,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}
-      )
+      #{reason,jdbcType=VARCHAR}, #{tradeDate,jdbcType=TIMESTAMP}, #{sourceType,jdbcType=VARCHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.PersonalChargingRecord" useGeneratedKeys="true">
     <!--@mbg.generated-->
@@ -145,6 +151,12 @@
       <if test="endSoc != null">
         end_soc,
       </if>
+      <if test="ammeterTotalStart != null">
+        ammeter_total_start,
+      </if>
+      <if test="ammeterTotalEnd != null">
+        ammeter_total_end,
+      </if>
       <if test="totalUsedElectricity != null">
         total_used_electricity,
       </if>
@@ -163,6 +175,12 @@
       <if test="reason != null">
         reason,
       </if>
+      <if test="tradeDate != null">
+        trade_date,
+      </if>
+      <if test="sourceType != null">
+        source_type,
+      </if>
       <if test="createBy != null">
         create_by,
       </if>
@@ -237,6 +255,12 @@
       <if test="endSoc != null">
         #{endSoc,jdbcType=VARCHAR},
       </if>
+      <if test="ammeterTotalStart != null">
+        #{ammeterTotalStart,jdbcType=VARCHAR},
+      </if>
+      <if test="ammeterTotalEnd != null">
+        #{ammeterTotalEnd,jdbcType=VARCHAR},
+      </if>
       <if test="totalUsedElectricity != null">
         #{totalUsedElectricity,jdbcType=DECIMAL},
       </if>
@@ -255,6 +279,12 @@
       <if test="reason != null">
         #{reason,jdbcType=VARCHAR},
       </if>
+      <if test="tradeDate != null">
+        #{tradeDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceType != null">
+        #{sourceType,jdbcType=VARCHAR},
+      </if>
       <if test="createBy != null">
         #{createBy,jdbcType=VARCHAR},
       </if>
@@ -333,6 +363,12 @@
       <if test="endSoc != null">
         end_soc = #{endSoc,jdbcType=VARCHAR},
       </if>
+      <if test="ammeterTotalStart != null">
+        ammeter_total_start = #{ammeterTotalStart,jdbcType=VARCHAR},
+      </if>
+      <if test="ammeterTotalEnd != null">
+        ammeter_total_end = #{ammeterTotalEnd,jdbcType=VARCHAR},
+      </if>
       <if test="totalUsedElectricity != null">
         total_used_electricity = #{totalUsedElectricity,jdbcType=DECIMAL},
       </if>
@@ -351,6 +387,12 @@
       <if test="reason != null">
         reason = #{reason,jdbcType=VARCHAR},
       </if>
+      <if test="tradeDate != null">
+        trade_date = #{tradeDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceType != null">
+        source_type = #{sourceType,jdbcType=VARCHAR},
+      </if>
       <if test="createBy != null">
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>
@@ -391,12 +433,16 @@
       reservation_end_time = #{reservationEndTime,jdbcType=TIMESTAMP},
       start_soc = #{startSoc,jdbcType=VARCHAR},
       end_soc = #{endSoc,jdbcType=VARCHAR},
+      ammeter_total_start = #{ammeterTotalStart,jdbcType=VARCHAR},
+      ammeter_total_end = #{ammeterTotalEnd,jdbcType=VARCHAR},
       total_used_electricity = #{totalUsedElectricity,jdbcType=DECIMAL},
       sharp_used_electricity = #{sharpUsedElectricity,jdbcType=DECIMAL},
       peak_used_electricity = #{peakUsedElectricity,jdbcType=DECIMAL},
       flat_used_electricity = #{flatUsedElectricity,jdbcType=DECIMAL},
       valley_used_electricity = #{valleyUsedElectricity,jdbcType=DECIMAL},
       reason = #{reason,jdbcType=VARCHAR},
+      trade_date = #{tradeDate,jdbcType=TIMESTAMP},
+      source_type = #{sourceType,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
@@ -503,6 +549,16 @@
           when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR}
         </foreach>
       </trim>
+      <trim prefix="ammeter_total_start = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.ammeterTotalStart,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="ammeter_total_end = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.ammeterTotalEnd,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
       <trim prefix="total_used_electricity = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=INTEGER} then #{item.totalUsedElectricity,jdbcType=DECIMAL}
@@ -533,6 +589,16 @@
           when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR}
         </foreach>
       </trim>
+      <trim prefix="trade_date = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="source_type = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.sourceType,jdbcType=VARCHAR}
+        </foreach>
+      </trim>
       <trim prefix="create_by = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR}
@@ -701,6 +767,20 @@
           </if>
         </foreach>
       </trim>
+      <trim prefix="ammeter_total_start = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.ammeterTotalStart != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.ammeterTotalStart,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="ammeter_total_end = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.ammeterTotalEnd != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.ammeterTotalEnd,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
       <trim prefix="total_used_electricity = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           <if test="item.totalUsedElectricity != null">
@@ -743,6 +823,20 @@
           </if>
         </foreach>
       </trim>
+      <trim prefix="trade_date = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.tradeDate != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.tradeDate,jdbcType=TIMESTAMP}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="source_type = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.sourceType != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.sourceType,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
       <trim prefix="create_by = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           <if test="item.createBy != null">
@@ -790,9 +884,10 @@
     (transaction_code, `status`, member_id, station_id, merchant_id, pile_sn, connector_code, 
       pile_connector_code, logic_card, vin_code, start_mode, plate_number, charge_start_time, 
       charge_end_time, start_type, reservation_start_time, reservation_end_time, start_soc, 
-      end_soc, total_used_electricity, sharp_used_electricity, peak_used_electricity, 
-      flat_used_electricity, valley_used_electricity, reason, create_by, create_time, 
-      update_by, update_time, del_flag)
+      end_soc, ammeter_total_start, ammeter_total_end, total_used_electricity, sharp_used_electricity, 
+      peak_used_electricity, flat_used_electricity, valley_used_electricity, reason, 
+      trade_date, source_type, create_by, create_time, update_by, update_time, del_flag
+      )
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.transactionCode,jdbcType=VARCHAR}, #{item.status,jdbcType=VARCHAR}, #{item.memberId,jdbcType=VARCHAR}, 
@@ -802,12 +897,13 @@
         #{item.plateNumber,jdbcType=VARCHAR}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, 
         #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR}, #{item.reservationStartTime,jdbcType=TIMESTAMP}, 
         #{item.reservationEndTime,jdbcType=TIMESTAMP}, #{item.startSoc,jdbcType=VARCHAR}, 
-        #{item.endSoc,jdbcType=VARCHAR}, #{item.totalUsedElectricity,jdbcType=DECIMAL}, 
-        #{item.sharpUsedElectricity,jdbcType=DECIMAL}, #{item.peakUsedElectricity,jdbcType=DECIMAL}, 
-        #{item.flatUsedElectricity,jdbcType=DECIMAL}, #{item.valleyUsedElectricity,jdbcType=DECIMAL}, 
-        #{item.reason,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-        #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR}
-        )
+        #{item.endSoc,jdbcType=VARCHAR}, #{item.ammeterTotalStart,jdbcType=VARCHAR}, #{item.ammeterTotalEnd,jdbcType=VARCHAR}, 
+        #{item.totalUsedElectricity,jdbcType=DECIMAL}, #{item.sharpUsedElectricity,jdbcType=DECIMAL}, 
+        #{item.peakUsedElectricity,jdbcType=DECIMAL}, #{item.flatUsedElectricity,jdbcType=DECIMAL}, 
+        #{item.valleyUsedElectricity,jdbcType=DECIMAL}, #{item.reason,jdbcType=VARCHAR}, 
+        #{item.tradeDate,jdbcType=TIMESTAMP}, #{item.sourceType,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, 
+        #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+        #{item.delFlag,jdbcType=CHAR})
     </foreach>
   </insert>
   <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.PersonalChargingRecord" useGeneratedKeys="true">
@@ -836,12 +932,16 @@
       reservation_end_time,
       start_soc,
       end_soc,
+      ammeter_total_start,
+      ammeter_total_end,
       total_used_electricity,
       sharp_used_electricity,
       peak_used_electricity,
       flat_used_electricity,
       valley_used_electricity,
       reason,
+      trade_date,
+      source_type,
       create_by,
       create_time,
       update_by,
@@ -872,12 +972,16 @@
       #{reservationEndTime,jdbcType=TIMESTAMP},
       #{startSoc,jdbcType=VARCHAR},
       #{endSoc,jdbcType=VARCHAR},
+      #{ammeterTotalStart,jdbcType=VARCHAR},
+      #{ammeterTotalEnd,jdbcType=VARCHAR},
       #{totalUsedElectricity,jdbcType=DECIMAL},
       #{sharpUsedElectricity,jdbcType=DECIMAL},
       #{peakUsedElectricity,jdbcType=DECIMAL},
       #{flatUsedElectricity,jdbcType=DECIMAL},
       #{valleyUsedElectricity,jdbcType=DECIMAL},
       #{reason,jdbcType=VARCHAR},
+      #{tradeDate,jdbcType=TIMESTAMP},
+      #{sourceType,jdbcType=VARCHAR},
       #{createBy,jdbcType=VARCHAR},
       #{createTime,jdbcType=TIMESTAMP},
       #{updateBy,jdbcType=VARCHAR},
@@ -908,12 +1012,16 @@
       reservation_end_time = #{reservationEndTime,jdbcType=TIMESTAMP},
       start_soc = #{startSoc,jdbcType=VARCHAR},
       end_soc = #{endSoc,jdbcType=VARCHAR},
+      ammeter_total_start = #{ammeterTotalStart,jdbcType=VARCHAR},
+      ammeter_total_end = #{ammeterTotalEnd,jdbcType=VARCHAR},
       total_used_electricity = #{totalUsedElectricity,jdbcType=DECIMAL},
       sharp_used_electricity = #{sharpUsedElectricity,jdbcType=DECIMAL},
       peak_used_electricity = #{peakUsedElectricity,jdbcType=DECIMAL},
       flat_used_electricity = #{flatUsedElectricity,jdbcType=DECIMAL},
       valley_used_electricity = #{valleyUsedElectricity,jdbcType=DECIMAL},
       reason = #{reason,jdbcType=VARCHAR},
+      trade_date = #{tradeDate,jdbcType=TIMESTAMP},
+      source_type = #{sourceType,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
@@ -985,6 +1093,12 @@
       <if test="endSoc != null">
         end_soc,
       </if>
+      <if test="ammeterTotalStart != null">
+        ammeter_total_start,
+      </if>
+      <if test="ammeterTotalEnd != null">
+        ammeter_total_end,
+      </if>
       <if test="totalUsedElectricity != null">
         total_used_electricity,
       </if>
@@ -1003,6 +1117,12 @@
       <if test="reason != null">
         reason,
       </if>
+      <if test="tradeDate != null">
+        trade_date,
+      </if>
+      <if test="sourceType != null">
+        source_type,
+      </if>
       <if test="createBy != null">
         create_by,
       </if>
@@ -1081,6 +1201,12 @@
       <if test="endSoc != null">
         #{endSoc,jdbcType=VARCHAR},
       </if>
+      <if test="ammeterTotalStart != null">
+        #{ammeterTotalStart,jdbcType=VARCHAR},
+      </if>
+      <if test="ammeterTotalEnd != null">
+        #{ammeterTotalEnd,jdbcType=VARCHAR},
+      </if>
       <if test="totalUsedElectricity != null">
         #{totalUsedElectricity,jdbcType=DECIMAL},
       </if>
@@ -1099,6 +1225,12 @@
       <if test="reason != null">
         #{reason,jdbcType=VARCHAR},
       </if>
+      <if test="tradeDate != null">
+        #{tradeDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceType != null">
+        #{sourceType,jdbcType=VARCHAR},
+      </if>
       <if test="createBy != null">
         #{createBy,jdbcType=VARCHAR},
       </if>
@@ -1177,6 +1309,12 @@
       <if test="endSoc != null">
         end_soc = #{endSoc,jdbcType=VARCHAR},
       </if>
+      <if test="ammeterTotalStart != null">
+        ammeter_total_start = #{ammeterTotalStart,jdbcType=VARCHAR},
+      </if>
+      <if test="ammeterTotalEnd != null">
+        ammeter_total_end = #{ammeterTotalEnd,jdbcType=VARCHAR},
+      </if>
       <if test="totalUsedElectricity != null">
         total_used_electricity = #{totalUsedElectricity,jdbcType=DECIMAL},
       </if>
@@ -1195,6 +1333,12 @@
       <if test="reason != null">
         reason = #{reason,jdbcType=VARCHAR},
       </if>
+      <if test="tradeDate != null">
+        trade_date = #{tradeDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sourceType != null">
+        source_type = #{sourceType,jdbcType=VARCHAR},
+      </if>
       <if test="createBy != null">
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>