From 54c250656c2e471ad48ecaa8ccce16ec9d7eb8bd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 03 十二月 2019 13:52:38 +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/UserInfoMapper.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
index be6b1d2..47c9ef8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/UserInfoMapper.java
@@ -17,7 +17,7 @@
int insertSelective(UserInfo record);
- UserInfo selectByPrimaryKey(Long id);
+ UserInfo selectByPrimaryKey(Long id);
/**
* 鏌ヨ鏈夋晥鐨�
@@ -198,7 +198,28 @@
List<UserInfo> listByClosed(@Param("appId") String appId, @Param("phone") String phone);
long countAvaiableUser();
-
+
+ /**
+ * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
+ *
+ * @param start
+ * @param count
+ * @return
+ */
+
+ List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count,
+ @Param("money") BigDecimal money, @Param("beganDate") String beganDate, @Param("endDate") String endDate);
+
+ /**
+ * 鏍规嵁type妫�绱�
+ * @param type
+ * @param start
+ * @param count
+ * @return
+ */
+ List<UserInfo> listByType(@Param("type")int type,@Param("start") long start, @Param("count")int count);
+
+ long countByType(int type);
/**
* 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
@@ -206,15 +227,5 @@
* @param count
* @return
*/
- List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count, @Param("money") BigDecimal money,
- @Param("beganDate") String beganDate, @Param("endDate") String endDate);
-
-
- /**
- * 鏌ヨ婊¤冻鑷姩鎻愮幇鐢ㄦ埛
- * @param start
- * @param count
- * @return
- */
- List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
+ List<UserInfo> getAutoExtractUserTo1212(@Param("start") int start, @Param("count") int count);
}
\ No newline at end of file
--
Gitblit v1.8.0