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/service/inter/money/extract/ExtractAuditRecordService.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractAuditRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractAuditRecordService.java
index cd09421..78fbc10 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractAuditRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/extract/ExtractAuditRecordService.java
@@ -1,8 +1,10 @@
package com.yeshi.fanli.service.inter.money.extract;
+import java.util.Date;
import java.util.List;
import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.entity.admin.count.CountUserInfo;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
public interface ExtractAuditRecordService {
@@ -112,44 +114,34 @@
public List<ExtractAuditRecord> getbyExtractId(Long extractId);
- /**
- * 缁熻瀹℃牳娆℃暟
- * @param state
- * @param type
- * @param years
- * @param startTime
- * @param endTime
- * @return
- */
- public List<ChartTDO>countAuditTotal(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception;
-
-
/**
* 缁熻鐢宠鎻愮殑鐜版�婚噾棰�
* @param state
- * @param type
- * @param years
* @param startTime
* @param endTime
* @return
*/
- public List<ChartTDO> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception;
-
+ public List<CountUserInfo> getApplyMoney(Date startTime, Date endTime) throws Exception;
+
+ public void initApplyMoneyCount();
+
/**
* 缁熻鐢宠鎻愮殑鐜版�绘鏁�
- * @param state
- * @param type
- * @param years
* @param startTime
* @param endTime
* @return
*/
- public List<ChartTDO> countExtractApplyNumber(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception;
-
+ List<CountUserInfo> geApplyNumber(Date startTime, Date endTime) throws Exception;
+
+ public void initApplyNumberCount();
+
+ public void initAuditCount();
+
+ public List<CountUserInfo> getAuditCount(Date startTime, Date endTime, Integer state) throws Exception;
+
+
+
}
--
Gitblit v1.8.0