From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractAuditRecordMapper.java | 25 +++++--------------------
1 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractAuditRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractAuditRecordMapper.java
index 22ebe8e..7174b2d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractAuditRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractAuditRecordMapper.java
@@ -1,7 +1,7 @@
package com.yeshi.fanli.dao.mybatis;
+import java.math.BigDecimal;
import java.util.List;
-import java.util.Map;
import org.apache.ibatis.annotations.Param;
@@ -141,37 +141,22 @@
/**
* 缁熻瀹℃牳娆℃暟
* @param state
- * @param type
- * @param years
- * @param startTime
- * @param endTime
* @return
*/
- List<Map<String, Object>> countAuditTotal(@Param("state")Integer state, @Param("type")Integer type,
- @Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
+ Long countAuditTotal(@Param("state")Integer state, @Param("preDay") String preDay);
/**
* 缁熻鐢宠鎻愮殑鐜版�婚噾棰�
* @param state
- * @param type
- * @param years
- * @param startTime
- * @param endTime
* @return
*/
- List<Map<String, Object>> countExtractMoney(@Param("state")Integer state, @Param("type")Integer type,
- @Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
+ BigDecimal countApplyExtractMoney(@Param("preDay") String preDay);
/**
* 缁熻鐢宠鎻愮殑鐜版�绘鏁�
- * @param state
- * @param type
- * @param years
- * @param startTime
- * @param endTime
+ * @param preDay
* @return
*/
- List<Map<String, Object>> countExtractApplyNumber(@Param("state")Integer state, @Param("type")Integer type,
- @Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
+ Long countApplyNumberByDay(@Param("preDay") String preDay);
}
--
Gitblit v1.8.0