From 9ead35b6e14cb1b5cc746bb2158af288be02a89e Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 13 Dec 2023 10:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/dailyreport/DailyReportMapper.xml     | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index 3f0a02127b..49cc402d24 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -104,17 +104,32 @@
     <select id="selectByBrand" resultType="com.yxt.anrui.reportcenter.api.dailyreport.BrandVo">
         SELECT dr.brandSid  linkSid,
                dr.brandName NAME,
-               (
-                   SELECT count(ddr.id)
-                   FROM daily_report ddr
-        left join anrui_base.base_model_config bmv on ddr.vehMConfigSid = bmv.sid
-        left join anrui_base.base_vehicle_model bm on bm.sid = ddr.vehModelSid
-                   WHERE ddr.brandSid = dr.brandSid
-                     AND DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{queryTime}
-                     and ddr.busOrgSid = #{sybOrgSid}
-        group by (bm.fuelTypeValue+bm.emissionStandardValue)
-               ) as         colspan
+               b.colspan
         FROM daily_report dr
+        left join
+        (
+        select
+        count(a.brandSid) as colspan,
+        a.brandSid
+        from
+        (SELECT
+        ddr.brandSid
+        FROM
+        daily_report ddr
+        left join
+        anrui_base.base_model_config bmv
+        on ddr.vehMConfigSid = bmv.sid
+        left join
+        anrui_base.base_vehicle_model bm
+        on bm.sid = ddr.vehModelSid
+        WHERE
+        DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{queryTime}
+        and ddr.busOrgSid = #{sybOrgSid}
+        group by
+        ddr.brandSid,
+        bm.fuelTypeValue,
+        bm.emissionStandardValue )a group by a.brandSid) b
+        on b.brandSid = dr.brandSid
         WHERE dr.busOrgSid = #{sybOrgSid}
           AND DATE_FORMAT(dr.createTime, '%Y-%m-%d') = #{queryTime}
         GROUP BY dr.brandSid
@@ -182,7 +197,7 @@
             #{item}
         </foreach>
         <!-- group by dr.busOrgSid, dr.brandSid, dr.vehModelSid, dr.vehMConfigSid-->
-        group by (bm.fuelTypeValue+bm.emissionStandardValue)
+        group by bm.fuelTypeValue,bm.emissionStandardValue
         order by dr.brandSid desc
     </select>