From 74be2e325a3bc4dbe95e9825c18574e1102877c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 15:08:54 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java
index 35f1c1f..2301f61 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Set;
+import javax.annotation.Nullable;
+
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
@@ -61,6 +63,18 @@
List<IntegralTaskRecord> listDaySignRecord(@Param("uid") Long uid, @Param("cid") Long cid);
/**
+ * 杩�7澶╃鍒版儏鍐�
+ *
+ * @param uid
+ * @param cid
+ * @param sortState
+ * 1鍊掑簭-鍒涘缓鏃堕棿
+ * @return
+ */
+ List<IntegralTaskRecord> listSignRecordByDateTime(@Param("uid") Long uid, @Param("cid") Long cid,
+ @Param("dateTime") String dateTime);
+
+ /**
* 鏈鍙栭噾甯�
*
* @param count
@@ -84,10 +98,9 @@
* @param minTime
* @param maxTime
*/
- int countGetCountByTaskIdAndDay(@Param("taskId") Long taskId,@Param("uid")Long uid, @Param("minTime") Date minTime,
- @Param("maxTime") Date maxTime);
-
-
+ int countGetCountByTaskIdAndDay(@Param("taskId") Long taskId, @Param("uid") Long uid,
+ @Param("minTime") Date minTime, @Param("maxTime") Date maxTime);
+
/**
* 缁熻浠婃棩绗嚑娆″畬鎴愮殑浠诲姟
*
@@ -96,4 +109,20 @@
* @return
*/
int countByTaskIdTodayNum(@Param("uid") Long uid, @Param("tid") Long tid, @Param("date") String date);
+
+ /**
+ * 鏍规嵁绫诲瀷涓庡垱寤烘椂闂存绱�
+ *
+ * @param cid
+ * @param minTime
+ * @param maxTime
+ * @param start
+ * @param count
+ * @return
+ */
+ List<IntegralTaskRecord> listByCidAndUidAndCreateTime(@Param("cid") Long cid,@Param("uid") Long uid, @Param("minTime") Date minTime,
+ @Param("maxTime") Date maxTime, @Param("start") long start, @Param("count") int count);
+
+ long countByCidAndUidAndCreateTime(@Param("cid") Long cid,@Param("uid") Long uid, @Param("minTime") Date minTime,
+ @Param("maxTime") Date maxTime);
}
--
Gitblit v1.8.0