From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 624eece..96600d4 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
@@ -9,6 +9,7 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.ExtractAuditRecordMapper;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
import com.yeshi.fanli.service.inter.money.extract.ExtractAuditRecordService;
@@ -106,19 +107,19 @@
}
@Override
- public List<Map<String, Object>> countAuditTotal(Integer state, Integer type, String years, String startTime,
+ public List<ChartTDO> countAuditTotal(Integer state, Integer type, String years, String startTime,
String endTime) throws Exception {
return extractAuditRecordMapper.countAuditTotal(state, type, years, startTime, endTime);
}
@Override
- public List<Map<String, Object>> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
+ public List<ChartTDO> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
String endTime) throws Exception {
return extractAuditRecordMapper.countExtractMoney(state, type, years, startTime, endTime);
}
@Override
- public List<Map<String, Object>> countExtractApplyNumber(Integer state, Integer type, String years,
+ public List<ChartTDO> countExtractApplyNumber(Integer state, Integer type, String years,
String startTime, String endTime) throws Exception {
return extractAuditRecordMapper.countExtractApplyNumber(state, type, years, startTime, endTime);
}
--
Gitblit v1.8.0