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/dao/mybatis/HongBaoV2CountMapper.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index 098300b..e384926 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -35,5 +35,33 @@
 			@Param("state") Integer state, @Param("year") String year, 
 			@Param("startTime")String startTime, @Param("endTime")String endTime);
 	
+	
+	/**
+	 * 缁熻鎬讳釜鏁�
+	 * @param channel 娓犻亾
+	 * @param type 
+	 * @param state
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Map<String, Object>> countHongBaoType(@Param("dateType")Integer dateType, 
+			@Param("type") Integer type, @Param("year") String year, 
+			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	
+	/**
+	 * 缁熻鎬讳釜鏁�
+	 * @param channel 娓犻亾
+	 * @param type 
+	 * @param state
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Map<String, Object>> countHongBaoTotalNum(@Param("dateType")Integer dateType, @Param("year") String year,
+			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	
 
 }
\ No newline at end of file

--
Gitblit v1.8.0