From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 18:48:23 +0800
Subject: [PATCH] 1、基于Timer实现定时执行的任务，并在满足条件下结束定时任务，为此实现抽象类TimerTaskJob类，并在UpgradeManager类中应用； 2、TreadJob类由TimerTaskJob替换，弃用TreadJob类。
---
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