From 325009946e7c987c4b087509ffef5087f8b3d09a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 14 一月 2019 11:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java | 41 ++++-------------------------------------
1 files changed, 4 insertions(+), 37 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
index 41ba07e..5c4daea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -1234,50 +1234,17 @@
@Override
- public List<Object> count24HOderByChannel(String channel, Integer type, String years,
+ public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years,
String startTime, String endTime) throws Exception{
- List<Map<String, Object>> list = hongBaoMapper.count24HOderByChannel(channel, type, years,
- startTime, endTime);
-
- if (list == null || list.size() == 0) {
- return null;
- }
-
- switch (type){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, list);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(list);
- case 3:
- return yearFactory(list);
- default:
- return null;
- }
-
+ return hongBaoMapper.count24HOderByChannel(channel, type, years, startTime, endTime);
}
@Override
- public List<Object> countHistoryOderByChannel(String channel, Integer type, String years,
+ public List<Map<String, Object>> countHistoryOderByChannel(String channel, Integer type, String years,
String startTime, String endTime) throws Exception{
- List<Map<String, Object>> list = hongBaoMapper.countHistoryOderByChannel(channel, type, years,
+ return hongBaoMapper.countHistoryOderByChannel(channel, type, years,
startTime, endTime);
-
- if (list == null || list.size() == 0) {
- return null;
- }
-
- switch (type){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, list);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(list);
- case 3:
- return yearFactory(list);
- default:
- return null;
- }
-
}
--
Gitblit v1.8.0