From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRevenueMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRevenueMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRevenueMapper.xml
index d5a5bd9..4410ba6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRevenueMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRevenueMapper.xml
@@ -127,9 +127,9 @@
cw.type = 2 AND cw.businessType = #{type} AND cw.code = #{code}
</select>
<select id="getDataStatisticsIncomeOrCommission" resultType="com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp">
- SELECT date_format(r.createTime, '%Y-%m') AS monthTime,SUM(r.amount) AS amount,d.name AS userName
+ SELECT date_format(r.createTime, '%Y-%m') AS monthTime,SUM(r.amount) AS amount,d.userName
FROM t_revenue r
- LEFT JOIN t_driver d ON r.userId = d.id
+ LEFT JOIN (SELECT id,name AS userName from t_driver) d ON r.userId = d.id
LEFT JOIN t_order o ON r.orderId = o.id
<where>
<if test="agentId != null">
@@ -169,9 +169,9 @@
ORDER BY amount DESC
</select>
<select id="getDataStatisticsIncomeOrCommissionByIds" resultType="com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp">
- SELECT date_format(r.createTime, '%Y-%m') AS monthTime,SUM(r.amount) AS amount,d.name AS userName
+ SELECT date_format(r.createTime, '%Y-%m') AS monthTime,SUM(r.amount) AS amount,d.userName
FROM t_revenue r
- LEFT JOIN t_driver d ON r.userId = d.id
+ LEFT JOIN (SELECT id,name AS userName from t_driver) d ON r.userId = d.id
LEFT JOIN t_order o ON r.orderId = o.id
<where>
<if test="ids != null and ids.size() > 0">
--
Gitblit v1.7.1