From dcfc005ee387ac39de83bd4637f48ed0f8f6c9a9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 16:23:03 +0800
Subject: [PATCH] 1、修改文档“增加一个单位(orgTa)”名称; 2、config.properties配置改为ym的配置; 3、江海用测试系统调整,适应阿里云服务器环境。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 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 bd2267e..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,
@@ -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