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/UserInfoMapper.xml | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml index c6fda79..2c67d24 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml @@ -82,6 +82,11 @@ <result column="uie_gold_coin" property="goldCoin" jdbcType="INTEGER" /> </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> + <sql id="Base_Column_List">id,identifycode,login_type,wx_open_id,wx_union_id,nick_name,tbName,tbPic,wxName,wxPic,portrait,createtime,last_logintime,loginip,tuiguang_code,appid,my_hongBao,pay_password,sid,rank,phone,state,state_desc </sql> <!-- 涓嶈兘鏌ヨ缂撳瓨 --> @@ -548,7 +553,7 @@ </select> - <select id="countNewUserByDate" resultType="java.util.HashMap"> + <select id="countNewUserByDate" resultMap="ChartMap"> SELECT COUNT(DISTINCT h.`id`) AS showValue, <if test="type == 1"> FROM_UNIXTIME(h.`createtime`/1000,'%Y-%m-%d') AS @@ -594,7 +599,7 @@ ORDER BY h.`createtime` </select> - <select id="getTodayHasOrder" resultType="java.util.HashMap"> + <select id="getTodayHasOrder" resultMap="ChartMap"> SELECT COALESCE(COUNT(DISTINCT u.`id`),0) AS 'showValue', <if test="type == 1"> FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS @@ -648,7 +653,7 @@ - <select id="getWeekHasOrder" resultType="java.util.HashMap"> + <select id="getWeekHasOrder" resultMap="ChartMap"> SELECT COUNT(DISTINCT hb.uid) AS showValue,FROM_UNIXTIME(u.`createtime`/1000,'%Y-%m-%d') AS 'showDate' FROM (SELECT COUNT(v2.`hb_id`) AS num,v2.hb_uid AS uid -- Gitblit v1.8.0