From 1f65fd011582ac6587d60475315d2ee6662d9d5b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Sep 2023 09:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
index a2e6b2a..6b03256 100644
--- a/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/MonitorPointController.java
@@ -213,7 +213,7 @@
@RequestParam @ApiParam(value = "reportType",name = "type") int reportType,
@RequestParam @ApiParam(value = "endTime",name = "������������") String endTime*/
List<MonitoringStationDTO> resList = monitorPointService.listMonitoringStationDTO(params,Integer.parseInt(params.get("reportType").toString()),params.get("startTime").toString(),params.get("endTime").toString());
- List<MonitoringStationDTOResult> list = new ArrayList<>();
+ /*List<MonitoringStationDTOResult> list = new ArrayList<>();
for(MonitoringStationDTO m : resList){
MonitoringStationDTOResult result = new MonitoringStationDTOResult();
result.setName(m.getName());
@@ -235,7 +235,7 @@
result.setCO(m.getCO().compareTo(BigDecimal.ZERO)==0?"-":m.getCO().toString());
result.setCONum(m.getCONum()==0?"-":String.valueOf(m.getCONum()));
list.add(result);
- }
- return ResultMessage.ok(list);
+ }*/
+ return ResultMessage.ok(resList);
}
}
--
Gitblit v1.8.0