From 9aafec73f2a5df0ccee2712505c63d44d91336c6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 四月 2025 14:40:09 +0800
Subject: [PATCH] 1、端口、IP、标签配置.docx文档修改:民勤配置项变化; 2、农户取水年度统计逻辑变化; 3、灌溉计划迟延时间可配置。

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