From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java
index 1380e92..c0235d9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java
@@ -6,6 +6,7 @@
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.LostOrder;
public interface LostOrderMapper extends BaseMapper<LostOrder> {
@@ -50,7 +51,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countLostNum(@Param("dateType") Integer dateType, @Param("resultCode") Integer resultCode,
+ List<ChartTDO> countLostNum(@Param("dateType") Integer dateType, @Param("resultCode") Integer resultCode,
@Param("year") String year, @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
@@ -63,7 +64,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countAppealMoney(@Param("dateType") Integer dateType, @Param("year") String year,
+ List<ChartTDO> countAppealMoney(@Param("dateType") Integer dateType, @Param("year") String year,
@Param("startTime") String startTime, @Param("endTime") String endTime);
/**
--
Gitblit v1.8.0