From 437ceb214daff5a57253a59a2d8065a088173514 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 09:42:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamDividentsDebtMapper.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamDividentsDebtMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamDividentsDebtMapper.java
index 830d9b8..dc53840 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamDividentsDebtMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/TeamDividentsDebtMapper.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.dao.mybatis.money;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
@@ -20,8 +21,9 @@
 	 * @param pageSize
 	 * @return
 	 */
-	List<TeamDividentsDebt> listByLeftMoneyAndUid(@Param("minMoney") BigDecimal minMoney,
-			@Param("maxMoney") BigDecimal maxMoney, @Param("uid") Long uid, @Param("start") long start,
+	List<TeamDividentsDebt> listByLeftMoneyAndUidAndMaxEstimatePayTime(@Param("minMoney") BigDecimal minMoney,
+			@Param("maxMoney") BigDecimal maxMoney, @Param("uid") Long uid,
+			@Param("maxEstimatePayTime") Date maxEstimatePayTime, @Param("start") long start,
 			@Param("count") int count);
 
 	/**
@@ -32,8 +34,9 @@
 	 * @param uid
 	 * @return
 	 */
-	long countByLeftMoneyAndUid(@Param("minMoney") BigDecimal minMoney, @Param("maxMoney") BigDecimal maxMoney,
-			@Param("uid") Long uid);
+	long countByLeftMoneyAndUidAndMaxEstimatePayTime(@Param("minMoney") BigDecimal minMoney,
+			@Param("maxMoney") BigDecimal maxMoney, @Param("uid") Long uid,
+			@Param("maxEstimatePayTime") Date maxEstimatePayTime);
 
 	TeamDividentsDebt selectByPrimaryKeyForUpdate(Long id);
 
@@ -43,7 +46,6 @@
 	 * @param uid
 	 * @return
 	 */
-	BigDecimal sumLeftMoneyByUid(Long uid);
-	
+	BigDecimal sumLeftMoneyByUid(@Param("uid") Long uid, @Param("maxEstimatePayTime") Date maxEstimatePayTime);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0