From 383b8f39d81e89c3d29cb1a59d6b124dc26bcc57 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 16 Mar 2018 13:39:07 +0800
Subject: [PATCH] 优化

---
 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 1518f85..0a73e54 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -147,6 +147,10 @@
 		Map<String, List<Object>> resultMap = new HashMap<String, List<Object>>();
 		List<Map<String, Object>> list = JSON.parseObject((String)parameters.get("items"), new TypeReference<List<Map<String, Object>>>() {});
 		parameters.remove("items");
+		Map<String, Object> timeType = JSON.parseObject((String)parameters.get("timeType"), new TypeReference<Map<String, Object>>() {});
+		parameters.remove("timeType");
+		parameters.putAll(timeType);
+		
 		ExecutorService threadPool = Executors.newCachedThreadPool();
 		CompletionService<Map<String, List<Object>>> cs = new ExecutorCompletionService<Map<String, List<Object>>>(threadPool);
 

--
Gitblit v1.8.0