From b1dc9988b9587add132a01faa6bc09e162fe1491 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 七月 2024 21:39:38 +0800
Subject: [PATCH] 1、开关阀报中增加农户关联； 2、工作报中增加农户关联； 3、取水口损失流量完善； 4、实现取水日取水量统计。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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
index a1486ea..87c4af8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
@@ -5,6 +5,8 @@
<!--@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" />
@@ -38,7 +40,8 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, controller_id, intake_id, rtu_addr, dt, rtu_dt, order_no, ic_card_addr, ic_card_no,
+ 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,
@@ -58,7 +61,8 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory">
<!--@mbg.generated-->
- insert into rm_work_report_history (id, controller_id, intake_id,
+ 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,
@@ -69,7 +73,8 @@
a_current, b_current, c_current,
battery_volt, water_meter_trans_volt, water_meter_work_volt
)
- values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT},
+ 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},
@@ -87,6 +92,12 @@
<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,
@@ -182,6 +193,12 @@
<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},
@@ -279,6 +296,12 @@
<!--@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>
@@ -375,7 +398,9 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory">
<!--@mbg.generated-->
update rm_work_report_history
- set controller_id = #{controllerId,jdbcType=BIGINT},
+ 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},
--
Gitblit v1.8.0