From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 27 八月 2019 12:32:46 +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 | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 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..78632ca 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); /** * 棰嗗彇閲戝竵 @@ -109,7 +109,7 @@ * @param day * @return */ - public Integer countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day); + public int countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day); /** * 娣诲姞鑾峰彇璁板綍 @@ -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