From b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 10:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java
index 1675640..4b5c5f9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.money.extract;
+import java.math.BigDecimal;
import java.util.List;
import javax.annotation.Resource;
@@ -8,7 +9,7 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.ExtractAuditRecordMapper;
-import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.dao.user.count.CountUserInfoDao;
import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;
@@ -19,6 +20,9 @@
@Resource
private ExtractAuditRecordMapper extractAuditRecordMapper;
+
+ @Resource
+ private CountUserInfoDao countUserInfoDao;
@Override
public List<ExtractAuditRecord> getList(int pageIndex, int pageSize, String key, String startTime, String endTime) {
@@ -105,22 +109,22 @@
return extractAuditRecordMapper.getbyExtractId(extractId);
}
+
@Override
- public List<ChartTDO> countAuditTotal(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception {
- return extractAuditRecordMapper.countAuditTotal(state, type, years, startTime, endTime);
+ public Long countAuditNumberByDay(int state, String preDay) {
+ return extractAuditRecordMapper.countAuditTotal(state, preDay);
}
-
+
+
@Override
- public List<ChartTDO> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception {
- return extractAuditRecordMapper.countExtractMoney(state, type, years, startTime, endTime);
+ public BigDecimal countApplyMoneyByDay(String preDay) {
+ return extractAuditRecordMapper.countApplyExtractMoney(preDay);
}
-
+
@Override
- public List<ChartTDO> countExtractApplyNumber(Integer state, Integer type, String years,
- String startTime, String endTime) throws Exception {
- return extractAuditRecordMapper.countExtractApplyNumber(state, type, years, startTime, endTime);
+ public Long countApplyNumberByDay(String preDay) {
+ return extractAuditRecordMapper.countApplyNumberByDay(preDay);
}
+
}
--
Gitblit v1.8.0