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/mapping/user/UserSystemCouponCountMapper.xml | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml index 88524f3..0bf29f8 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponCountMapper.xml @@ -61,8 +61,12 @@ <association property="userSystemCoupon" column="ucr_user_coupon_id" resultMap="com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper.BaseResultMap"/> - </resultMap> + + <resultMap id="ChartMap" type="com.yeshi.fanli.dto.ChartTDO"> + <result column="showDate" property="showDate" jdbcType="VARCHAR" /> + <result column="showValue" property="showValue" jdbcType="VARCHAR" /> + </resultMap> <select id="listRebateCoupon" resultMap="BaseResultMap"> SELECT * FROM `yeshi_ec_user_system_coupon` uc @@ -268,7 +272,7 @@ </if> </select> - <select id="getRebateCouponUsedNumToCharts" resultType="java.util.HashMap"> + <select id="getRebateCouponUsedNumToCharts" resultMap="ChartMap"> SELECT IFNULL(COUNT(c.`usc_id`),0) AS showValue, <if test="dateType == 1"> DATE_FORMAT(c.`usc_use_time`,'%Y-%m-%d') AS 'showDate' @@ -305,7 +309,7 @@ </select> - <select id="getRebateCouponMoneyToCharts" resultType="java.util.HashMap"> + <select id="getRebateCouponMoneyToCharts" resultMap="ChartMap"> SELECT IFNULL(SUM(c.`hb_money`),0) AS showValue, <if test="dateType == 1"> DATE_FORMAT(c.`hb_get_time`,'%Y-%m-%d') AS 'showDate' @@ -340,7 +344,7 @@ ORDER BY c.`hb_get_time` </select> - <select id="getFreeCouponMoneyToCharts" resultType="java.util.HashMap"> + <select id="getFreeCouponMoneyToCharts" resultMap="ChartMap"> SELECT IFNULL(SUM(v2.`hb_money`),0) AS showValue, <if test="dateType == 1"> DATE_FORMAT(v2.`hb_get_time`,'%Y-%m-%d') AS 'showDate' -- Gitblit v1.8.0