From ed67b465e427c26367b2696d4605c5bfc0fab4df Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Tue, 25 Apr 2023 10:12:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml | 2 +- .../njcn/event/service/majornetwork/Impl/ReportServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml index 712236cd6..aa88ddc0c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml @@ -101,7 +101,7 @@ FROM a.level, h.ip, ifnull(f.Flow,(select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlowMeal, - ifnull(g.Flag,0) reamFlowMeal + ifnull(g.Flow,0) reamFlowMeal FROM pq_line a inner join pq_device h on a.id = h.id diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 2ab84965f..2bd147cab 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -326,7 +326,6 @@ public class ReportServiceImpl implements ReportService { .le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime()))) ); List eventDetailList= BeanUtil.copyToList(eventDetails,EventDetail.class); - // stringBuilder.append(Param.WHERE); // lineIndexes.stream().forEach(line -> { // stringBuilder.append("line_id = '").append(line + "' ").append("or ");