From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
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