From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java
index 76a3fce..0612c2c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractMapper.java
@@ -92,7 +92,28 @@
 	 * @return
 	 */
 	int countTodayComplete();
-	
+
 	double countTodayMoney(@Param("uid") Long uid);
 
+	/**
+	 * 鑾峰彇琛ュ伩閲戦
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	BigDecimal computeCompensateByUid(Long uid);
+
+	/**
+	 * 缁熻浠婃棩鐢宠鎻愮幇鐨勯噾棰濓紙鏍规嵁鐢ㄦ埛ID锛�
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	/**
+	 * 缁熻褰撴棩鎻愮幇
+	 * @param uid
+	 * @param day
+	 * @return
+	 */
+	BigDecimal sumToadyApplyByUid(@Param("uid") Long uid, @Param("day") String day);
 }
\ No newline at end of file

--
Gitblit v1.8.0