From a79be5c75d4409bd14a36b648c1a398b409cad65 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 08 一月 2019 16:48:39 +0800 Subject: [PATCH] Merge branch 'div1' --- fanli/src/main/java/com/yeshi/fanli/mapping/ExtractAuditRecordMapper.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractAuditRecordMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractAuditRecordMapper.xml index 5b89925..33888df 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractAuditRecordMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractAuditRecordMapper.xml @@ -246,7 +246,7 @@ <select id="countAuditTotal" resultType="java.util.HashMap"> - SELECT COALESCE(COUNT(tr.id),0) AS 'total', + SELECT COALESCE(COUNT(tr.id),0) AS 'showValue', <if test="type == 1"> FROM_UNIXTIME(tr.`auditTime`/1000,'%Y-%m-%d') AS 'showDate' </if> @@ -286,7 +286,7 @@ </select> <select id="countExtractMoney" resultType="java.util.HashMap"> - SELECT CAST(SUM(t.`money`)AS DECIMAL(19,2)) AS total, + SELECT CAST(SUM(t.`money`)AS DECIMAL(19,2)) AS showValue, <if test="type == 1"> FROM_UNIXTIME(t.`extractTime`/1000,'%Y-%m-%d') AS 'showDate' </if> @@ -323,7 +323,7 @@ </select> <select id="countExtractApplyNumber" resultType="java.util.HashMap"> - SELECT COUNT(t.id) AS total, + SELECT COUNT(t.id) AS showValue, <if test="type == 1"> FROM_UNIXTIME(t.`extractTime`/1000,'%Y-%m-%d') AS 'showDate' </if> -- Gitblit v1.8.0