From e70728524e32162b940ded71617a08aaa30a7faf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 12:24:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralTaskRecordService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 f4b4b76..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
@@ -72,7 +72,7 @@
 	 * @param cid
 	 * @return
 	 */
-	public List<Date> getSignDays(long uid, Long cid);
+	public List<IntegralTaskRecord> getSignDaysRecord(long uid, Long cid);
 
 	/**
 	 * 棰嗗彇閲戝竵
@@ -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