From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractAuditRecordMapper.java |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 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 21aafe7..0b8530d 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,5 +1,6 @@
 package com.yeshi.fanli.dao.mybatis;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
@@ -141,37 +142,22 @@
 	/**
 	 * 缁熻瀹℃牳娆℃暟 
 	 * @param state
-	 * @param type
-	 * @param years
-	 * @param startTime
-	 * @param endTime
 	 * @return
 	 */
-	List<ChartTDO> countAuditTotal(@Param("state")Integer state, @Param("type")Integer type,
-		@Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
+	int countAuditTotal(@Param("state")Integer state, @Param("preDay") String preDay);
 	
 	/**
 	 * 缁熻鐢宠鎻愮殑鐜版�婚噾棰�
 	 * @param state
-	 * @param type
-	 * @param years
-	 * @param startTime
-	 * @param endTime
 	 * @return
 	 */
-	List<ChartTDO> 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<ChartTDO> countExtractApplyNumber(@Param("state")Integer state, @Param("type")Integer type,
-		@Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
+	int countApplyNumberByDay(@Param("preDay") String preDay);
 	
 }

--
Gitblit v1.8.0