修改SQL中多余的字段

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

@@ -66,9 +66,6 @@ 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);
@@ -81,9 +78,6 @@ 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,7 +713,8 @@
     </select>
 
     <select id="queryDeptAPHZReportDQ" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
-        SELECT d.主货架计划网点数 as planMsStoreCnt,
+        SELECT '合计：' as regionName
+            d.主货架计划网点数 as planMsStoreCnt,
         d.主货架执行网点数 as execMsStoreCnt,
         if(d.主货架计划网点数 is null, null,concat( round( coalesce(d.主货架执行网点数,0) / d.主货架计划网点数 *
         100,2) ,'%')) as msExecRate,
@@ -794,22 +795,19 @@
         <where>
             <include refid="deptDQQuery"/>
         </where>
-        ) d,(select region_name,
-        sum(display_sn60) 三米两秒挂条计划网点数,
+        ) d,(select sum(display_sn60) 三米两秒挂条计划网点数,
         sum(actual_display_qty60) 三米两秒挂条执行网点数
         from sales_ap_display_s
         <where>
             <include refid="deptDQQuery"/>
         </where>
-        ) s,(select region_name,
-        sum(gw_sn6) 批发挂网计划网点数,
+        ) s,(select sum(gw_sn6) 批发挂网计划网点数,
         sum(actual_gw6) 批发挂网执行网点数
         from sales_ap_display_j
         <where>
             <include refid="deptDQQuery"/>
         </where>
-        ) j,(select region_name,
-        sum(end_cap_sn) 端架计划网点数,
+        ) j,(select sum(end_cap_sn) 端架计划网点数,
         sum(if(actual_end_cap_executed is not null and actual_end_cap_executed = '执行', 1,
         0)) as 端架执行网点数,
         sum(floor_stack_sn) 地堆计划网点数,
@@ -822,16 +820,14 @@
         <where>
             <include refid="deptDQQuery"/>
         </where>
-        ) pd,(select region_name,
-        sum(actual_display_sn) 零食计划网点数,
+        ) pd,(select sum(actual_display_sn) 零食计划网点数,
         sum(if(actual_display_sn = 1, if(snack_display_executed = '执行', 1, 0),
         if(snack_display_executed = '执行', actual_end_cap_qty, 0))) 零食执行网点数
         from sales_ap_snacks_display
         <where>
             <include refid="deptDQQuery"/>
         </where>
-        ) sd,(select region_name,
-        sum(promotion_sn) 档期计划网点数,
+        ) sd,(select sum(promotion_sn) 档期计划网点数,
         sum(if(promotion_implementation_status = '是', 1, 0)) 档期开展网点数,
         sum(if(spec_execution_status = '执行', 1, 0)) 促销规格执行网点数,
         sum(if(flavor_execution_status = '执行', 1, 0)) 促销口味执行网点数,
@@ -1054,7 +1050,8 @@
     </select>
 
     <select id="queryDistAPHZReport" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
-        SELECT d.主货架计划网点数 as planMsStoreCnt,
+        SELECT '合计：' as dealerName,
+        d.主货架计划网点数 as planMsStoreCnt,
         d.主货架执行网点数 as execMsStoreCnt,
         if(d.主货架计划网点数 is null, null,concat( round( coalesce(d.主货架执行网点数,0) / d.主货架计划网点数 *
         100,2) ,'%')) as msExecRate,