Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

问题单修复

Browse Source
This commit is contained in:
zhuxinyu
2023-04-25 10:12:04 +08:00
parent 21cd4033d9
commit ed67b465e4
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
View File

@@ -101,7 +101,7 @@ FROM
a.level, a.level,
h.ip, h.ip,
ifnull(f.Flow,(select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlowMeal, 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 FROM
pq_line a pq_line a
inner join pq_device h on a.id = h.id inner join pq_device h on a.id = h.id

1
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -326,7 +326,6 @@ public class ReportServiceImpl implements ReportService {
.le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime()))) .le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime())))
); );
List<EventDetail> eventDetailList= BeanUtil.copyToList(eventDetails,EventDetail.class); List<EventDetail> eventDetailList= BeanUtil.copyToList(eventDetails,EventDetail.class);
// stringBuilder.append(Param.WHERE); // stringBuilder.append(Param.WHERE);
// lineIndexes.stream().forEach(line -> { // lineIndexes.stream().forEach(line -> {
// stringBuilder.append("line_id = '").append(line + "' ").append("or "); // stringBuilder.append("line_id = '").append(line + "' ").append("or ");