From da36dbefcd945cc85d170c5c2e78682d13497f97 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 17:46:24 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java
index a76a003..a4788d9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java
@@ -118,4 +118,24 @@
 	 */
 	public IntegralTaskRecord addRecord(IntegralTaskRecord record) throws IntegralTaskRecordException;
 
+	/**
+	 * 鏍规嵁绫诲瀷涓庢椂闂存绱�
+	 * @param cid
+	 * @param minTime
+	 * @param maxTime
+	 * @param page
+	 * @param count
+	 * @return
+	 */
+	public List<IntegralTaskRecord> listByCidAndUidAndCreateTime(Long cid,Long uid, Date minTime, Date maxTime, int page, int count);
+
+	/**
+	 * 鏍规嵁绫诲瀷涓庢椂闂存绱�
+	 * @param cid
+	 * @param minTime
+	 * @param maxTime
+	 * @return
+	 */
+	public long countByCidAndUidAndCreateTime(Long cid,Long uid, Date minTime, Date maxTime);
+
 }

--
Gitblit v1.8.0