From ecef3df4890be54c1da2a8a4fc1c8c1f50f1c263 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:41:47 +0800
Subject: [PATCH] 式样代码管理

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml
index 310fac4..fe015ee 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml
@@ -468,7 +468,8 @@
       wo.intake_id AS intakeId,
       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,
@@ -477,7 +478,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,
@@ -497,6 +498,7 @@
       wo.water_meter_work_volt AS waterMeterWorkVolt
     FROM rm_work_report_last 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