From 2ee155e0e9ddc92a68349851f3bf6e7221ad8cf3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 31 Jul 2019 15:30:54 +0800
Subject: [PATCH] 修改排放量sql语句，新增选择公司和设备的条件
---
src/main/java/com/moral/controller/ReportController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index 30a2188..d191744 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -112,4 +112,15 @@
return new ResultBean<List<Map<String, Object>>>(result);
}
+
+ @GetMapping("overproof")
+ public ResultBean<Map> getOverproofData(HttpServletRequest request, JwtAuthenticationToken token) throws Exception {
+ Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
+ UserContext userContext = token.getPrincipal();
+ Integer orgId = userContext.getOrganizationId();
+ parameters.put("orgId", orgId);
+ //List<Map<String, Object>> result = null;
+ Map result = historyDailyService.getOverproofData(parameters);
+ return new ResultBean<Map>(result);
+ }
}
--
Gitblit v1.8.0