From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 04 十一月 2019 09:55:55 +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/inter/money/extract/ExtractAuditRecordService.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 3107999..cd09421 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,8 @@ package com.yeshi.fanli.service.inter.money.extract; import java.util.List; -import java.util.Map; +import com.yeshi.fanli.dto.ChartTDO; import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord; public interface ExtractAuditRecordService { @@ -121,7 +121,7 @@ * @param endTime * @return */ - 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; @@ -135,7 +135,7 @@ * @param endTime * @return */ - 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; /** @@ -147,7 +147,7 @@ * @param endTime * @return */ - public List<Map<String, Object>> countExtractApplyNumber(Integer state, Integer type, String years, String startTime, + public List<ChartTDO> countExtractApplyNumber(Integer state, Integer type, String years, String startTime, String endTime) throws Exception; -- Gitblit v1.8.0