From a79be5c75d4409bd14a36b648c1a398b409cad65 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 08 一月 2019 16:48:39 +0800 Subject: [PATCH] Merge branch 'div1' --- fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java index 4195a23..7010e19 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java @@ -15,7 +15,7 @@ * @param endTime 缁撴潫鏃堕棿 * @return */ - List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year, + public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year, String startTime, String endTime) throws Exception; /** @@ -28,7 +28,20 @@ * @param endTime 缁撴潫鏃堕棿 * @return */ - List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, String year, + public List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, String year, String startTime, String endTime) throws Exception; + + /** + * 鍒嗙被鍨嬭鍗曟暟涓庢瘮渚� + * @param dateType + * @param type + * @param year + * @param startTime + * @param endTime + * @return + * @throws Exception + */ + public List<Map<String, Object>> getProportionByType(Integer dateType, Integer type, String year, String startTime, + String endTime) throws Exception; } -- Gitblit v1.8.0