店内执行：看板SQL group by聚合问题错误

src/main/java/com/sfa/operation/domain/sales/dao/impl/SalesApDisplayDaoImpl.java

@@ -66,6 +66,9 @@ public class SalesApDisplayDaoImpl implements ISalesApDisplayDao  {
         List<Map<String, Object>> mapZ = salesapdisMapper.queryDeptAPReportZQ(build);
         List<Map<String, Object>> mapD = salesapdisMapper.queryDeptAPReportDQ(build);
         List<Map<String, Object>> mapHZ = salesapdisMapper.queryDeptAPHZReportDQ(build);
+        if (!CollectionUtils.isEmpty(mapHZ) && !CollectionUtils.isEmpty(mapHZ.get(0))) {
+            mapHZ.get(0).put("regionName", "合计：");
+        }
         Map<String,Object> r = new HashMap<>();
         r.put("zq",mapZ);
         r.put("dq",mapD);
@@ -78,6 +81,9 @@ public class SalesApDisplayDaoImpl implements ISalesApDisplayDao  {
     public Object queryDistAPReport(SalesApWq build) {
         List<Map<String, Object>> mapDist = salesapdisMapper.queryDistAPReport(build);
         List<Map<String, Object>> mapDistHz = salesapdisMapper.queryDistAPHZReport(build);
+        if (!CollectionUtils.isEmpty(mapDistHz) && !CollectionUtils.isEmpty(mapDistHz.get(0))) {
+            mapDistHz.get(0).put("dealerName", "合计：");
+        }
         Map<String,Object> r = new HashMap<>();
         r.put("dist",mapDist);
         r.put("hz",mapDistHz);

src/main/resources/mapper/sales/SalesApDisplayMapper.xml

@@ -713,8 +713,7 @@
     </select>
 
     <select id="queryDeptAPHZReportDQ" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
-        SELECT '合计：' as regionName,
-        d.主货架计划网点数 as planMsStoreCnt,
+        SELECT d.主货架计划网点数 as planMsStoreCnt,
         d.主货架执行网点数 as execMsStoreCnt,
         if(d.主货架计划网点数 is null, null,concat( round( coalesce(d.主货架执行网点数,0) / d.主货架计划网点数 *
         100,2) ,'%')) as msExecRate,
@@ -1055,9 +1054,7 @@
     </select>
 
     <select id="queryDistAPHZReport" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
-        SELECT '' as dealerCode,
-        '合计：' as dealerName,
-        d.主货架计划网点数 as planMsStoreCnt,
+        SELECT d.主货架计划网点数 as planMsStoreCnt,
         d.主货架执行网点数 as execMsStoreCnt,
         if(d.主货架计划网点数 is null, null,concat( round( coalesce(d.主货架执行网点数,0) / d.主货架计划网点数 *
         100,2) ,'%')) as msExecRate,