From 9619e60e3075a432d692f3cd8b76787568c53aad Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 15:56:58 +0800
Subject: [PATCH] 1、完善代码；2、禁止输出SpringBoot启动时Banner。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 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 e23deda..da947b9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml
@@ -462,6 +462,8 @@
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,
@@ -470,7 +472,7 @@
wo.water_press AS waterPress,
wo.water_instant AS waterInstant,
wo.water_total AS waterTotal,
- wo.ele_total AS ele_total,
+ wo.ele_total AS eleTotal,
wo.money_remain AS moneyRemain,
wo.water_remain AS waterRemain,
wo.this_ele AS thisEle,
@@ -490,6 +492,7 @@
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}
--
Gitblit v1.8.0