From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 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