From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
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