From b8e8696b61f4a896b16269157e7b85aa7b590009 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 三月 2024 17:13:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml
index f334e3e..2b2a419 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAutoReportLastMapper.xml
@@ -8,8 +8,8 @@
<result column="controllerId" jdbcType="BIGINT" property="controllerid" />
<result column="intakeId" jdbcType="BIGINT" property="intakeid" />
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
- <result column="dt" jdbcType="DATE" property="dt" />
- <result column="rtuDt" jdbcType="DATE" property="rtudt" />
+ <result column="dt" jdbcType="TIMESTAMP" property="dt" />
+ <result column="rtuDt" jdbcType="TIMESTAMP" property="rtudt" />
<result column="instantAmount" jdbcType="DOUBLE" property="instantamount" />
<result column="totalAmount" jdbcType="DOUBLE" property="totalamount" />
<result column="lossAmount" jdbcType="DOUBLE" property="lossamount" />
@@ -52,7 +52,7 @@
batteryVolt, sunVolt, signalValue
)
values (#{id,jdbcType=BIGINT}, #{controllerid,jdbcType=BIGINT}, #{intakeid,jdbcType=BIGINT},
- #{rtuaddr,jdbcType=VARCHAR}, #{dt,jdbcType=DATE}, #{rtudt,jdbcType=DATE}, #{instantamount,jdbcType=DOUBLE},
+ #{rtuaddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtudt,jdbcType=TIMESTAMP}, #{instantamount,jdbcType=DOUBLE},
#{totalamount,jdbcType=DOUBLE}, #{lossamount,jdbcType=DOUBLE}, #{waterpress,jdbcType=DOUBLE},
#{batteryvolt,jdbcType=DOUBLE}, #{sunvolt,jdbcType=DOUBLE}, #{signalvalue,jdbcType=INTEGER}
)
@@ -115,10 +115,10 @@
#{rtuaddr,jdbcType=VARCHAR},
</if>
<if test="dt != null">
- #{dt,jdbcType=DATE},
+ #{dt,jdbcType=TIMESTAMP},
</if>
<if test="rtudt != null">
- #{rtudt,jdbcType=DATE},
+ #{rtudt,jdbcType=TIMESTAMP},
</if>
<if test="instantamount != null">
#{instantamount,jdbcType=DOUBLE},
@@ -157,10 +157,10 @@
rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
</if>
<if test="dt != null">
- dt = #{dt,jdbcType=DATE},
+ dt = #{dt,jdbcType=TIMESTAMP},
</if>
<if test="rtudt != null">
- rtuDt = #{rtudt,jdbcType=DATE},
+ rtuDt = #{rtudt,jdbcType=TIMESTAMP},
</if>
<if test="instantamount != null">
instantAmount = #{instantamount,jdbcType=DOUBLE},
@@ -192,8 +192,8 @@
set controllerId = #{controllerid,jdbcType=BIGINT},
intakeId = #{intakeid,jdbcType=BIGINT},
rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
- dt = #{dt,jdbcType=DATE},
- rtuDt = #{rtudt,jdbcType=DATE},
+ dt = #{dt,jdbcType=TIMESTAMP},
+ rtuDt = #{rtudt,jdbcType=TIMESTAMP},
instantAmount = #{instantamount,jdbcType=DOUBLE},
totalAmount = #{totalamount,jdbcType=DOUBLE},
lossAmount = #{lossamount,jdbcType=DOUBLE},
--
Gitblit v1.8.0