From 723f7f30bd818548cb3dc2a75d11e9666cca4f8a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 15:05:11 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
index 0b7ce24..11b80d5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/hongbao/HongBaoMapper.java
@@ -3,6 +3,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import org.apache.ibatis.annotations.Param;
@@ -264,4 +265,24 @@
long selectCountByTypeAndStateAndCreateTime(@Param("uid") Long uid, @Param("type") List<Integer> type,
@Param("state") List<Integer> state, @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
+
+ /**
+ * 鏍规嵁娓犻亾 缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
+ * @param channel
+ * @return
+ */
+ List<Map<String, Object>> count24HOderByChannel(@Param("channel")String channel,
+ @Param("type")Integer type, @Param("years") String years,
+ @Param("startTime")String startTime, @Param("endTime")String endTime);
+
+
+ /**
+ * 鏍规嵁娓犻亾 缁熻鍘嗗彶浜х敓鐨勮鍗曟暟閲�
+ * @param channel
+ * @return
+ */
+ List<Map<String, Object>> countHistoryOderByChannel(@Param("channel")String channel,
+ @Param("type")Integer type, @Param("years") String years,
+ @Param("startTime")String startTime, @Param("endTime")String endTime);
+
}
\ No newline at end of file
--
Gitblit v1.8.0