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/dao/mybatis/ExtractAuditRecordMapper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 22ebe8e..21aafe7 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,10 +1,10 @@
package com.yeshi.fanli.dao.mybatis;
import java.util.List;
-import java.util.Map;
import org.apache.ibatis.annotations.Param;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
public interface ExtractAuditRecordMapper {
@@ -147,7 +147,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countAuditTotal(@Param("state")Integer state, @Param("type")Integer type,
+ List<ChartTDO> countAuditTotal(@Param("state")Integer state, @Param("type")Integer type,
@Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
/**
@@ -159,7 +159,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countExtractMoney(@Param("state")Integer state, @Param("type")Integer type,
+ List<ChartTDO> countExtractMoney(@Param("state")Integer state, @Param("type")Integer type,
@Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
/**
@@ -171,7 +171,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countExtractApplyNumber(@Param("state")Integer state, @Param("type")Integer type,
+ List<ChartTDO> countExtractApplyNumber(@Param("state")Integer state, @Param("type")Integer type,
@Param("years")String years, @Param("startTime")String startTime, @Param("endTime")String endTime);
}
--
Gitblit v1.8.0