Merge branch 'qa' into 'dxy'

src/main/java/com/sfa/operation/controller/sales/excel/ApExportExcelController.java

@@ -8,10 +8,7 @@ import com.sfa.operation.service.sales.export.IExportExcelService;
 import com.sfa.operation.strategy.IExportApExcelStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -33,9 +30,9 @@ public class ApExportExcelController {
      * @param salesApRequest 查询参数
      * @return 导出文件
      */
-    @PostMapping("/download")
-//    @SalesPermissionCheck(value = SalesPermissionCheck.CheckType.USER)
-    public R exportApDisplayExcel(@RequestBody SalesApRequest salesApRequest, HttpServletResponse response) {
+    @GetMapping("/download")
+    @SalesPermissionCheck(value = SalesPermissionCheck.CheckType.USER)
+    public R exportApDisplayExcel(SalesApRequest salesApRequest, HttpServletResponse response) {
         return exportApExcelService.exportApDisplayExcel(salesApRequest, response);
     }
 }

src/main/java/com/sfa/operation/controller/sales/query/APReportQueryController.java

@@ -40,4 +40,13 @@ public class APReportQueryController {
         return apDisplayQueryService.queryDeptAPReport(request);
     }
 
+    /**
+     * 店内执行-经销商维度
+     */
+    @GetMapping("/dist_cm")
+    @SalesPermissionCheck(value = SalesPermissionCheck.CheckType.USER)
+    public Object queryDistAPReport(SalesApRequest request) {
+        return apDisplayQueryService.queryDistAPReport(request);
+    }
+
 }

src/main/java/com/sfa/operation/domain/sales/dao/ISalesApDisplayDao.java

@@ -23,10 +23,10 @@ public interface ISalesApDisplayDao {
 
     Object queryDeptAPReport(SalesApWq build);
 
+    Object queryDistAPReport(SalesApWq build);
     List<SalesApDisplay> queryDataListByCondition(SalesApWq build);
 
     List<SalesApDisplay> queryByCondition(List<SalesApDisplayImportExcelDto> validDtoList);
 
     boolean batchUpdate( List<SalesApDisplay> updateEntityList);
-
 }

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

@@ -3,9 +3,7 @@ package com.sfa.operation.domain.sales.dao.impl;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sfa.common.core.enums.ECode;
 import com.sfa.common.core.exception.CheckedException;
 import com.sfa.common.core.utils.DateUtils;
@@ -27,7 +25,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 /**
  * @author : liqiulin
@@ -68,13 +65,25 @@ public class SalesApDisplayDaoImpl implements ISalesApDisplayDao  {
     public Object queryDeptAPReport(SalesApWq build) {
         List<Map<String, Object>> mapZ = salesapdisMapper.queryDeptAPReportZQ(build);
         List<Map<String, Object>> mapD = salesapdisMapper.queryDeptAPReportDQ(build);
+        List<Map<String, Object>> mapHZ = salesapdisMapper.queryDeptAPHZReportDQ(build);
         Map<String,Object> r = new HashMap<>();
         r.put("zq",mapZ);
         r.put("dq",mapD);
+        r.put("hz",mapHZ);
         return r;
 
     }
 
+    @Override
+    public Object queryDistAPReport(SalesApWq build) {
+        List<Map<String, Object>> mapDist = salesapdisMapper.queryDistAPReport(build);
+        List<Map<String, Object>> mapDistHz = salesapdisMapper.queryDistAPHZReport(build);
+        Map<String,Object> r = new HashMap<>();
+        r.put("dist",mapDist);
+        r.put("hz",mapDistHz);
+        return r;
+    }
+
     @Override
     public List<SalesApDisplay> queryDataListByCondition(SalesApWq build) {
         LambdaQueryWrapper<SalesApDisplay> queryWrapper = buildWq(build);
@@ -126,7 +135,6 @@ public class SalesApDisplayDaoImpl implements ISalesApDisplayDao  {
         return affectRows > 0;
     }
 
-
     private LambdaQueryWrapper<SalesApDisplay> buildWq(SalesApWq salesApWq) {
         LambdaQueryWrapper<SalesApDisplay> qw = new LambdaQueryWrapper<>();
         if (StringUtils.isNotBlank(salesApWq.getDealerCode())) {

src/main/java/com/sfa/operation/domain/sales/entity/SalesApDisplay.java

@@ -381,11 +381,10 @@ public class SalesApDisplay implements Serializable {
      * 更新时间
      */
     private Date updateTime;
-
     /**
-     * 备注 未执行原因
+     * 活动备注
      */
-     private String remark;
+    private String remark;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/sfa/operation/domain/sales/entity/SalesApDisplayJ.java

@@ -162,6 +162,10 @@ public class SalesApDisplayJ implements Serializable {
      * 更新时间
      */
     private Date updateTime;
+    /**
+     * 活动备注
+     */
+    private String remark;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/sfa/operation/domain/sales/entity/SalesApDisplayS.java

@@ -162,6 +162,10 @@ public class SalesApDisplayS implements Serializable {
      * 更新时间
      */
     private Date updateTime;
+    /**
+     * 活动备注
+     */
+    private String remark;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/sfa/operation/domain/sales/entity/SalesApPromotion.java

@@ -401,6 +401,10 @@ public class SalesApPromotion implements Serializable {
      * 更新时间
      */
     private Date updateTime;
+    /**
+     * 活动备注
+     */
+    private String remark;
     @TableField(exist = false)
     private Boolean isActualPromotionStartDate;
     @TableField(exist = false)

src/main/java/com/sfa/operation/domain/sales/entity/SalesApPromotionDisplay.java

@@ -299,6 +299,10 @@ public class SalesApPromotionDisplay implements Serializable {
     private String updateBy;
     private Date updateTime;
 
+    /**
+     * 活动备注
+     */
+    private String remark;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/sfa/operation/domain/sales/entity/SalesApSnacksDisplay.java

@@ -191,6 +191,10 @@ public class SalesApSnacksDisplay implements Serializable {
     private String updateBy;
     private Date updateTime;
 
+    /**
+     * 活动备注
+     */
+    private String remark;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/sfa/operation/domain/sales/mapper/SalesApDisplayMapper.java

@@ -24,6 +24,11 @@ public interface SalesApDisplayMapper extends BaseMapper<SalesApDisplay> {
 
     List<Map<String, Object>> queryDeptAPReportDQ(SalesApWq build);
 
+    List<Map<String,Object>> queryDistAPReport(SalesApWq build);
+
+    List<Map<String,Object>> queryDistAPHZReport(SalesApWq build);
+
+    List<Map<String, Object>> queryDeptAPHZReportDQ(SalesApWq build);
     int batchUpdate(@Param("list") List<SalesApDisplay> validEntities);
 }
 

src/main/java/com/sfa/operation/pojo/sales/request/SalesApRequest.java

@@ -185,6 +185,10 @@ public class SalesApRequest {
          * 挂条-是否执行
          */
         private String hangingStripExecuted;
+        /**
+         * 活动备注
+         */
+        private String remark;
 
     }
     @Data
@@ -282,6 +286,10 @@ public class SalesApRequest {
          * 海报是否执行
          */
         private String posterExecutionStatus;
+        /**
+         * 活动备注
+         */
+        private String remark;
     }
     @Data
     private static class SnackDisplay {
@@ -307,6 +315,10 @@ public class SalesApRequest {
          * 零食陈列是否执行
          */
         private String snackDisplayExecuted;
+        /**
+         * 活动备注
+         */
+        private String remark;
     }
     @Data
     private static class PromotionDisplay {
@@ -350,6 +362,10 @@ public class SalesApRequest {
          * 档期陈列是否执行
          */
         private String promotionDisplayExecuted;
+        /**
+         * 活动备注
+         */
+        private String remark;
     }
     @Data
     private static class DisplayS{
@@ -361,6 +377,10 @@ public class SalesApRequest {
          * 60g挂条陈列-是否执行
          */
         private String displayQtyExecuted60;
+        /**
+         * 活动备注
+         */
+        private String remark;
     }
     @Data
     private static class DisplayJ {
@@ -372,6 +392,10 @@ public class SalesApRequest {
          * 六小金刚批发挂网-是否执行（Y=是，N=否）
          */
         private String gwExecuted6;
+        /**
+         * 活动备注
+         */
+        private String remark;
     }
 }
 

src/main/java/com/sfa/operation/pojo/sales/response/SalesApDisplayDto.java

@@ -84,5 +84,9 @@ public class SalesApDisplayDto {
      * 挂条-是否执行
      */
     private String hangingStripExecuted;
+    /**
+     * 活动备注
+     */
+    private String remark;
 
 }

src/main/java/com/sfa/operation/pojo/sales/response/SalesApDisplayJDto.java

@@ -19,4 +19,8 @@ public class SalesApDisplayJDto {
      */
     private String gwExecuted6;
     private String updateBy;
+    /**
+     * 活动备注
+     */
+    private String remark;
 }

src/main/java/com/sfa/operation/pojo/sales/response/SalesApDisplaySDto.java

@@ -19,4 +19,8 @@ public class SalesApDisplaySDto {
      */
     private String displayQtyExecuted60;
     private String updateBy;
+    /**
+     * 活动备注
+     */
+    private String remark;
 }

src/main/java/com/sfa/operation/pojo/sales/response/SalesApPromotionDisplayDto.java

@@ -51,5 +51,9 @@ public class SalesApPromotionDisplayDto {
      */
     private String promotionDisplayExecuted;
     private String updateBy;
+    /**
+     * 活动备注
+     */
+    private String remark;
 }
 

src/main/java/com/sfa/operation/pojo/sales/response/SalesApPromotionDto.java

@@ -95,4 +95,8 @@ public class SalesApPromotionDto {
      */
     private String posterExecutionStatus;
     private String updateBy;
+    /**
+     * 活动备注
+     */
+    private String remark;
 }

src/main/java/com/sfa/operation/pojo/sales/response/SalesApSnacksDisplayDto.java

@@ -33,4 +33,8 @@ public class SalesApSnacksDisplayDto {
      */
     private String snackDisplayExecuted;
     private String updateBy;
+    /**
+     * 活动备注
+     */
+    private String remark;
 }

src/main/java/com/sfa/operation/service/sales/IApDisplayQueryService.java

@@ -28,7 +28,8 @@ public interface IApDisplayQueryService {
     Object queryStoreAPReport(SalesApRequest request);
 
     Object queryDeptAPReport(SalesApRequest request);
-    List<SalesApDisplay> queryDataListByCondition(SalesApRequest build);
 
+    Object queryDistAPReport(SalesApRequest request);
+    List<SalesApDisplay> queryDataListByCondition(SalesApRequest build);
     List<SalesApDisplay> queryByCondition(List<SalesApDisplayImportExcelDto> queryParam);
 }

src/main/java/com/sfa/operation/service/sales/impl/ApDisplayQueryServiceImpl.java

@@ -12,7 +12,6 @@ import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.sales.IApDisplayQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.List;
 
 /**
@@ -75,6 +74,11 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
         return salesApDisplayDao.queryDeptAPReport(build(request));
     }
 
+    @Override
+    public Object queryDistAPReport(SalesApRequest request) {
+        return salesApDisplayDao.queryDistAPReport(build(request));
+    }
+
     @Override
     public List<SalesApDisplay> queryDataListByCondition(SalesApRequest request) {
         return salesApDisplayDao.queryDataListByCondition(build(request));
@@ -89,12 +93,6 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
         SalesApWq salesApWq = new SalesApWq();
         BeanUtils.copyProperties(salesApRequest,salesApWq);
         salesApWq.setSalesMonth(salesApRequest.getSalesMonth() != null ? DateUtil.parse(salesApRequest.getSalesMonth() + "-01", DatePattern.NORM_DATE_PATTERN) : null);
-
-//        if (StringUtils.isNotBlank(salesApRequest.getDeptName())){
-//            List<String> deptNames = CollectionUtils.isEmpty(salesApWq.getDeptNames()) ? new ArrayList<>() : salesApWq.getDeptNames();
-//            deptNames.add(salesApRequest.getDeptName());
-//            salesApWq.setDeptNames(deptNames);
-//        }
         return salesApWq;
     }
 

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

@@ -530,7 +530,6 @@
         </if>
     </sql>
     <select id="queryDeptAPReportDQ" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
-
         SELECT ar.region_name as regionName,
         d.主货架计划网点数 as planMsStoreCnt,
         d.主货架执行网点数 as execMsStoreCnt,
@@ -713,6 +712,483 @@
         on ar.region_name = sp.region_name order by ar.region_name
     </select>
 
+    <select id="queryDeptAPHZReportDQ" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
+        SELECT '合计：' as regionName,
+            d.主货架计划网点数 as planMsStoreCnt,
+        d.主货架执行网点数 as execMsStoreCnt,
+        if(d.主货架计划网点数 is null, null,concat( round( coalesce(d.主货架执行网点数,0) / d.主货架计划网点数 *
+        100,2) ,'%')) as msExecRate,
+        d.常规端架计划网点数 as planRegEndcapStoreCnt,
+        d.常规端架执行网点数 as execRegEndcapStoreCnt,
+        if(d.常规端架计划网点数 is null, null,concat( round( coalesce(d.常规端架执行网点数,0) / d.常规端架计划网点数
+        * 100,2) ,'%')) as endcapExecRate,
+        d.常规地堆计划网点数 as planRegGsStoreCnt,
+        d.常规地堆执行网点数 as execRegGsStoreCnt,
+        if(d.常规地堆计划网点数 is null, null,concat( round( coalesce(d.常规地堆执行网点数,0) / d.常规地堆计划网点数
+        * 100,2) ,'%')) as gsExecRate,
+        d.多点陈列计划网点数 as planMpDispStoreCnt,
+        d.多点陈列执行网点数 as execMpDispStoreCnt,
+        if(d.多点陈列计划网点数 is null, null,concat( round( coalesce(d.多点陈列执行网点数,0) / d.多点陈列计划网点数
+        * 100,2) ,'%')) as mpDispExecRate,
+        d.挂条计划网点数 as planHsStoreCnt,
+        d.挂条执行网点数 as execHsStoreCnt,
+        if(d.挂条计划网点数 is null, null,concat( round( coalesce(d.挂条执行网点数,0) / d.挂条计划网点数 * 100,2)
+        ,'%')) as HsExecRate,
+        s.三米两秒挂条计划网点数 as planSLStoreCnt,
+        s.三米两秒挂条执行网点数 as execSLStoreCnt,
+        if(s.三米两秒挂条计划网点数 is null, null,concat( round( coalesce(s.三米两秒挂条执行网点数,0) /
+        s.三米两秒挂条计划网点数 * 100,2) ,'%')) as SLExecRate,
+        j.批发挂网计划网点数 as planSixJdStoreCnt,
+        j.批发挂网执行网点数 as execSixJdStoreCnt,
+        if(j.批发挂网计划网点数 is null, null,concat( round( coalesce(j.批发挂网执行网点数,0) / j.批发挂网计划网点数
+        * 100,2) ,'%')) as sixJdExecRate,
+        pd.端架计划网点数 as planEndcapStoreCnt,
+        pd.端架执行网点数 as execEndcapStoreCnt,
+        if(pd.端架计划网点数 is null, null,concat( round( coalesce(pd.端架执行网点数,0) / pd.端架计划网点数 * 100,2)
+        ,'%')) as endcapExecRatePromoPeriDisp,
+        pd.地堆计划网点数 as planGsStoreCnt,
+        pd.地堆执行网点数 as execGsStoreCnt,
+        if(pd.地堆计划网点数 is null, null,concat( round( coalesce(pd.地堆执行网点数,0) / pd.地堆计划网点数 * 100,2)
+        ,'%')) as gsExecRatePromoPeriDisp,
+        pd.其他陈列计划网点数 as planOtherDispStoreCnt,
+        pd.其他陈列执行网点数 as execOtherDispStoreCnt,
+        if(pd.其他陈列计划网点数 is null, null,concat( round( coalesce(pd.其他陈列执行网点数,0) / pd.其他陈列计划网点数
+        * 100,2) ,'%')) as otherDispExecRatePromoPeriDisp,
+        sd.零食计划网点数 as planSnackStoreCnt,
+        sd.零食执行网点数 as execSnackStoreCnt,
+        if(sd.零食计划网点数 is null, null,concat( round( coalesce(sd.零食执行网点数,0) / sd.零食计划网点数 * 100,2)
+        ,'%')) as snackExecRate,
+        sp.档期计划网点数 as planPromoPeriStoreCnt,
+        sp.档期开展网点数 as launchPromoPeriStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.档期开展网点数,0) / sp.档期计划网点数 * 100,2)
+        ,'%')) as launchRatePromoPeriExec,
+        sp.促销规格执行网点数 as execPsStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销规格执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as psExecRatePromoPeriExec,
+        sp.促销口味执行网点数 as execPfStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销口味执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as pfExecRatePromoPeriExec,
+        sp.促销价执行网点数 as execPpStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销价执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as ppExecRatePromoPeriExec,
+        sp.海报计划网点数 as planPosterStoreCnt,
+        sp.海报执行网点数 as execPosterStoreCnt,
+        if(sp.海报计划网点数 is null, null,concat( round( coalesce(sp.海报执行网点数,0) / sp.海报计划网点数 * 100,2)
+        ,'%')) as posterExecRate
+        FROM (select sum(main_shelf_type_sn) as 主货架计划网点数,
+        sum(if(actual_main_shelf_executed is not null and actual_main_shelf_executed = '执行', 1,
+        0)) as 主货架执行网点数,
+        sum(end_cap_qty_sn) as 常规端架计划网点数,
+        sum(if(actual_end_cap_executed is not null and actual_end_cap_executed = '执行', 1,
+        0)) as 常规端架执行网点数,
+        sum(floor_stack_area_sn) as 常规地堆计划网点数,
+        sum(if(actual_floor_stack_executed is not null and actual_floor_stack_executed = '执行', 1,
+        0)) as 常规地堆执行网点数,
+        sum(multi_point_display_sn) as 多点陈列计划网点数,
+        sum(if(actual_multi_display_executed is not null and actual_multi_display_executed = '执行',
+        1,
+        0)) as 多点陈列执行网点数,
+        sum(hanging_strip_sn) as 挂条计划网点数,
+        sum(if(hanging_strip_executed is not null and hanging_strip_executed = '执行', 1,
+        0)) as 挂条执行网点数
+        from sales_ap_display
+        <where>
+            <include refid="deptDQQuery"/>
+        </where>
+        ) d,(select sum(display_sn60) 三米两秒挂条计划网点数,
+        sum(actual_display_qty60) 三米两秒挂条执行网点数
+        from sales_ap_display_s
+        <where>
+            <include refid="deptDQQuery"/>
+        </where>
+        ) s,(select sum(gw_sn6) 批发挂网计划网点数,
+        sum(actual_gw6) 批发挂网执行网点数
+        from sales_ap_display_j
+        <where>
+            <include refid="deptDQQuery"/>
+        </where>
+        ) 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) 地堆计划网点数,
+        sum(if(actual_floor_stack_executed is not null and actual_floor_stack_executed = '执行', 1,
+        0)) as 地堆执行网点数,
+        sum(other_display_sn) 其他陈列计划网点数,
+        sum(if(actual_other_display_executed is not null and actual_other_display_executed = '执行',
+        1, 0)) as 其他陈列执行网点数
+        from sales_ap_promotion_display
+        <where>
+            <include refid="deptDQQuery"/>
+        </where>
+        ) 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 sum(promotion_sn) 档期计划网点数,
+        sum(if(promotion_implementation_status = '是', 1, 0)) 档期开展网点数,
+        sum(if(spec_execution_status = '执行', 1, 0)) 促销规格执行网点数,
+        sum(if(flavor_execution_status = '执行', 1, 0)) 促销口味执行网点数,
+        sum(if(promotion_price_execution_status = '执行', 1, 0)) 促销价执行网点数,
+        sum(poster_sn) 海报计划网点数,
+        sum(if(poster_sn is null, null, if(poster_execution_status = '执行', 1, 0))) 海报执行网点数
+        from sales_ap_promotion
+        <where>
+            <include refid="deptDQQuery"/>
+        </where>
+        ) sp
+    </select>
+
+    <sql id = "commonQueryDists">
+        <if test="salesMonth != null">
+            and sales_month = #{salesMonth}
+        </if>
+        <if test="dealerCodes != null">
+            and dealer_code in
+            <foreach collection="dealerCodes" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="deptNames != null">
+            and (region_name in
+            <foreach collection="deptNames" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            or
+            district_name in
+            <foreach collection="deptNames" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
+    </sql>
+
+    <select id="queryDistAPReport" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
+        SELECT ar.dealer_code as dealerCode,
+        ar.dealer_name as dealerName,
+        d.主货架计划网点数 as planMsStoreCnt,
+        d.主货架执行网点数 as execMsStoreCnt,
+        if(d.主货架计划网点数 is null, null,concat( round( coalesce(d.主货架执行网点数,0) / d.主货架计划网点数 *
+        100,2) ,'%')) as msExecRate,
+        d.常规端架计划网点数 as planRegEndcapStoreCnt,
+        d.常规端架执行网点数 as execRegEndcapStoreCnt,
+        if(d.常规端架计划网点数 is null, null,concat( round( coalesce(d.常规端架执行网点数,0) / d.常规端架计划网点数
+        * 100,2) ,'%')) as endcapExecRate,
+        d.常规地堆计划网点数 as planRegGsStoreCnt,
+        d.常规地堆执行网点数 as execRegGsStoreCnt,
+        if(d.常规地堆计划网点数 is null, null,concat( round( coalesce(d.常规地堆执行网点数,0) / d.常规地堆计划网点数
+        * 100,2) ,'%')) as gsExecRate,
+        d.多点陈列计划网点数 as planMpDispStoreCnt,
+        d.多点陈列执行网点数 as execMpDispStoreCnt,
+        if(d.多点陈列计划网点数 is null, null,concat( round( coalesce(d.多点陈列执行网点数,0) / d.多点陈列计划网点数
+        * 100,2) ,'%')) as mpDispExecRate,
+        d.挂条计划网点数 as planHsStoreCnt,
+        d.挂条执行网点数 as execHsStoreCnt,
+        if(d.挂条计划网点数 is null, null,concat( round( coalesce(d.挂条执行网点数,0) / d.挂条计划网点数 * 100,2)
+        ,'%')) as HsExecRate,
+        s.三米两秒挂条计划网点数 as planSLStoreCnt,
+        s.三米两秒挂条执行网点数 as execSLStoreCnt,
+        if(s.三米两秒挂条计划网点数 is null, null,concat( round( coalesce(s.三米两秒挂条执行网点数,0) /
+        s.三米两秒挂条计划网点数 * 100,2) ,'%')) as SLExecRate,
+        j.批发挂网计划网点数 as planSixJdStoreCnt,
+        j.批发挂网执行网点数 as execSixJdStoreCnt,
+        if(j.批发挂网计划网点数 is null, null,concat( round( coalesce(j.批发挂网执行网点数,0) / j.批发挂网计划网点数
+        * 100,2) ,'%')) as sixJdExecRate,
+        pd.端架计划网点数 as planEndcapStoreCnt,
+        pd.端架执行网点数 as execEndcapStoreCnt,
+        if(pd.端架计划网点数 is null, null,concat( round( coalesce(pd.端架执行网点数,0) / pd.端架计划网点数 * 100,2)
+        ,'%')) as endcapExecRatePromoPeriDisp,
+        pd.地堆计划网点数 as planGsStoreCnt,
+        pd.地堆执行网点数 as execGsStoreCnt,
+        if(pd.地堆计划网点数 is null, null,concat( round( coalesce(pd.地堆执行网点数,0) / pd.地堆计划网点数 * 100,2)
+        ,'%')) as gsExecRatePromoPeriDisp,
+        pd.其他陈列计划网点数 as planOtherDispStoreCnt,
+        pd.其他陈列执行网点数 as execOtherDispStoreCnt,
+        if(pd.其他陈列计划网点数 is null, null,concat( round( coalesce(pd.其他陈列执行网点数,0) / pd.其他陈列计划网点数
+        * 100,2) ,'%')) as otherDispExecRatePromoPeriDisp,
+        sd.零食计划网点数 as planSnackStoreCnt,
+        sd.零食执行网点数 as execSnackStoreCnt,
+        if(sd.零食计划网点数 is null, null,concat( round( coalesce(sd.零食执行网点数,0) / sd.零食计划网点数 * 100,2)
+        ,'%')) as snackExecRate,
+        sp.档期计划网点数 as planPromoPeriStoreCnt,
+        sp.档期开展网点数 as launchPromoPeriStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.档期开展网点数,0) / sp.档期计划网点数 * 100,2)
+        ,'%')) as launchRatePromoPeriExec,
+        sp.促销规格执行网点数 as execPsStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销规格执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as psExecRatePromoPeriExec,
+        sp.促销口味执行网点数 as execPfStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销口味执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as pfExecRatePromoPeriExec,
+        sp.促销价执行网点数 as execPpStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销价执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as ppExecRatePromoPeriExec,
+        sp.海报计划网点数 as planPosterStoreCnt,
+        sp.海报执行网点数 as execPosterStoreCnt,
+        if(sp.海报计划网点数 is null, null,concat( round( coalesce(sp.海报执行网点数,0) / sp.海报计划网点数 * 100,2)
+        ,'%')) as posterExecRate
+        FROM (
+        SELECT dealer_code, dealer_name
+        FROM sales_ap_display
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        UNION
+        SELECT dealer_code, dealer_name
+        FROM sales_ap_display_s
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        UNION
+        SELECT dealer_code, dealer_name
+        FROM sales_ap_display_j
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        UNION
+        SELECT dealer_code, dealer_name
+        FROM sales_ap_promotion_display
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        UNION
+        SELECT dealer_code, dealer_name
+        FROM sales_ap_snacks_display
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        UNION
+        SELECT dealer_code, dealer_name
+        FROM sales_ap_promotion
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        ) AS ar
+        LEFT JOIN (select dealer_code, dealer_name,
+        sum(main_shelf_type_sn) as 主货架计划网点数,
+        sum(if(actual_main_shelf_executed is not null and actual_main_shelf_executed = '执行', 1,
+        0)) as 主货架执行网点数,
+        sum(end_cap_qty_sn) as 常规端架计划网点数,
+        sum(if(actual_end_cap_executed is not null and actual_end_cap_executed = '执行', 1,
+        0)) as 常规端架执行网点数,
+        sum(floor_stack_area_sn) as 常规地堆计划网点数,
+        sum(if(actual_floor_stack_executed is not null and actual_floor_stack_executed = '执行', 1,
+        0)) as 常规地堆执行网点数,
+        sum(multi_point_display_sn) as 多点陈列计划网点数,
+        sum(if(actual_multi_display_executed is not null and actual_multi_display_executed = '执行',
+        1,
+        0)) as 多点陈列执行网点数,
+        sum(hanging_strip_sn) as 挂条计划网点数,
+        sum(if(hanging_strip_executed is not null and hanging_strip_executed = '执行', 1,
+        0)) as 挂条执行网点数
+        from sales_ap_display
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        group by dealer_code, dealer_name) d
+        ON ar.dealer_code = d.dealer_code AND ar.dealer_name = d.dealer_name
+        LEFT JOIN (select dealer_code, dealer_name,
+        sum(display_sn60) 三米两秒挂条计划网点数,
+        sum(actual_display_qty60) 三米两秒挂条执行网点数
+        from sales_ap_display_s
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        group by dealer_code, dealer_name) s
+        ON ar.dealer_code = s.dealer_code AND ar.dealer_name = s.dealer_name
+        LEFT JOIN (select dealer_code, dealer_name,
+        sum(gw_sn6) 批发挂网计划网点数,
+        sum(actual_gw6) 批发挂网执行网点数
+        from sales_ap_display_j
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        group by dealer_code, dealer_name) j
+        ON ar.dealer_code = j.dealer_code AND ar.dealer_name = j.dealer_name
+        left join (select dealer_code, dealer_name,
+        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) 地堆计划网点数,
+        sum(if(actual_floor_stack_executed is not null and actual_floor_stack_executed = '执行', 1,
+        0)) as 地堆执行网点数,
+        sum(other_display_sn) 其他陈列计划网点数,
+        sum(if(actual_other_display_executed is not null and actual_other_display_executed = '执行',
+        1, 0)) as 其他陈列执行网点数
+        from sales_ap_promotion_display
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        group by dealer_code, dealer_name) pd
+        on ar.dealer_code = pd.dealer_code and ar.dealer_name = pd.dealer_name
+        left join (select dealer_code, dealer_name,
+        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="commonQueryDists"/>
+        </where>
+        group by dealer_code, dealer_name) sd
+        on ar.dealer_code = sd.dealer_code and ar.dealer_name = sd.dealer_name
+        left join (select dealer_code, dealer_name,
+        sum(promotion_sn) 档期计划网点数,
+        sum(if(promotion_implementation_status = '是', 1, 0)) 档期开展网点数,
+        sum(if(spec_execution_status = '执行', 1, 0)) 促销规格执行网点数,
+        sum(if(flavor_execution_status = '执行', 1, 0)) 促销口味执行网点数,
+        sum(if(promotion_price_execution_status = '执行', 1, 0)) 促销价执行网点数,
+        sum(poster_sn) 海报计划网点数,
+        sum(if(poster_sn is null, null, if(poster_execution_status = '执行', 1, 0))) 海报执行网点数
+        from sales_ap_promotion
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        group by dealer_code, dealer_name) sp
+        on ar.dealer_code = sp.dealer_code and ar.dealer_name = sp.dealer_name order by ar.dealer_code
+    </select>
+
+    <select id="queryDistAPHZReport" parameterType="com.sfa.operation.domain.sales.wq.SalesApWq" resultType="java.util.Map">
+        SELECT '合计：' as dealerName,
+        d.主货架计划网点数 as planMsStoreCnt,
+        d.主货架执行网点数 as execMsStoreCnt,
+        if(d.主货架计划网点数 is null, null,concat( round( coalesce(d.主货架执行网点数,0) / d.主货架计划网点数 *
+        100,2) ,'%')) as msExecRate,
+        d.常规端架计划网点数 as planRegEndcapStoreCnt,
+        d.常规端架执行网点数 as execRegEndcapStoreCnt,
+        if(d.常规端架计划网点数 is null, null,concat( round( coalesce(d.常规端架执行网点数,0) / d.常规端架计划网点数
+        * 100,2) ,'%')) as endcapExecRate,
+        d.常规地堆计划网点数 as planRegGsStoreCnt,
+        d.常规地堆执行网点数 as execRegGsStoreCnt,
+        if(d.常规地堆计划网点数 is null, null,concat( round( coalesce(d.常规地堆执行网点数,0) / d.常规地堆计划网点数
+        * 100,2) ,'%')) as gsExecRate,
+        d.多点陈列计划网点数 as planMpDispStoreCnt,
+        d.多点陈列执行网点数 as execMpDispStoreCnt,
+        if(d.多点陈列计划网点数 is null, null,concat( round( coalesce(d.多点陈列执行网点数,0) / d.多点陈列计划网点数
+        * 100,2) ,'%')) as mpDispExecRate,
+        d.挂条计划网点数 as planHsStoreCnt,
+        d.挂条执行网点数 as execHsStoreCnt,
+        if(d.挂条计划网点数 is null, null,concat( round( coalesce(d.挂条执行网点数,0) / d.挂条计划网点数 * 100,2)
+        ,'%')) as HsExecRate,
+        s.三米两秒挂条计划网点数 as planSLStoreCnt,
+        s.三米两秒挂条执行网点数 as execSLStoreCnt,
+        if(s.三米两秒挂条计划网点数 is null, null,concat( round( coalesce(s.三米两秒挂条执行网点数,0) /
+        s.三米两秒挂条计划网点数 * 100,2) ,'%')) as SLExecRate,
+        j.批发挂网计划网点数 as planSixJdStoreCnt,
+        j.批发挂网执行网点数 as execSixJdStoreCnt,
+        if(j.批发挂网计划网点数 is null, null,concat( round( coalesce(j.批发挂网执行网点数,0) / j.批发挂网计划网点数
+        * 100,2) ,'%')) as sixJdExecRate,
+        pd.端架计划网点数 as planEndcapStoreCnt,
+        pd.端架执行网点数 as execEndcapStoreCnt,
+        if(pd.端架计划网点数 is null, null,concat( round( coalesce(pd.端架执行网点数,0) / pd.端架计划网点数 * 100,2)
+        ,'%')) as endcapExecRatePromoPeriDisp,
+        pd.地堆计划网点数 as planGsStoreCnt,
+        pd.地堆执行网点数 as execGsStoreCnt,
+        if(pd.地堆计划网点数 is null, null,concat( round( coalesce(pd.地堆执行网点数,0) / pd.地堆计划网点数 * 100,2)
+        ,'%')) as gsExecRatePromoPeriDisp,
+        pd.其他陈列计划网点数 as planOtherDispStoreCnt,
+        pd.其他陈列执行网点数 as execOtherDispStoreCnt,
+        if(pd.其他陈列计划网点数 is null, null,concat( round( coalesce(pd.其他陈列执行网点数,0) / pd.其他陈列计划网点数
+        * 100,2) ,'%')) as otherDispExecRatePromoPeriDisp,
+        sd.零食计划网点数 as planSnackStoreCnt,
+        sd.零食执行网点数 as execSnackStoreCnt,
+        if(sd.零食计划网点数 is null, null,concat( round( coalesce(sd.零食执行网点数,0) / sd.零食计划网点数 * 100,2)
+        ,'%')) as snackExecRate,
+        sp.档期计划网点数 as planPromoPeriStoreCnt,
+        sp.档期开展网点数 as launchPromoPeriStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.档期开展网点数,0) / sp.档期计划网点数 * 100,2)
+        ,'%')) as launchRatePromoPeriExec,
+        sp.促销规格执行网点数 as execPsStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销规格执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as psExecRatePromoPeriExec,
+        sp.促销口味执行网点数 as execPfStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销口味执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as pfExecRatePromoPeriExec,
+        sp.促销价执行网点数 as execPpStoreCnt,
+        if(sp.档期计划网点数 is null, null,concat( round( coalesce(sp.促销价执行网点数,0) / sp.档期计划网点数 *
+        100,2) ,'%')) as ppExecRatePromoPeriExec,
+        sp.海报计划网点数 as planPosterStoreCnt,
+        sp.海报执行网点数 as execPosterStoreCnt,
+        if(sp.海报计划网点数 is null, null,concat( round( coalesce(sp.海报执行网点数,0) / sp.海报计划网点数 * 100,2)
+        ,'%')) as posterExecRate
+        FROM (select
+        sum(main_shelf_type_sn) as 主货架计划网点数,
+        sum(if(actual_main_shelf_executed is not null and actual_main_shelf_executed = '执行', 1,
+        0)) as 主货架执行网点数,
+        sum(end_cap_qty_sn) as 常规端架计划网点数,
+        sum(if(actual_end_cap_executed is not null and actual_end_cap_executed = '执行', 1,
+        0)) as 常规端架执行网点数,
+        sum(floor_stack_area_sn) as 常规地堆计划网点数,
+        sum(if(actual_floor_stack_executed is not null and actual_floor_stack_executed = '执行', 1,
+        0)) as 常规地堆执行网点数,
+        sum(multi_point_display_sn) as 多点陈列计划网点数,
+        sum(if(actual_multi_display_executed is not null and actual_multi_display_executed = '执行',
+        1,
+        0)) as 多点陈列执行网点数,
+        sum(hanging_strip_sn) as 挂条计划网点数,
+        sum(if(hanging_strip_executed is not null and hanging_strip_executed = '执行', 1,
+        0)) as 挂条执行网点数
+        from sales_ap_display
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        ) d,
+        (select
+        sum(display_sn60) 三米两秒挂条计划网点数,
+        sum(actual_display_qty60) 三米两秒挂条执行网点数
+        from sales_ap_display_s
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        ) s,
+        (select
+        sum(gw_sn6) 批发挂网计划网点数,
+        sum(actual_gw6) 批发挂网执行网点数
+        from sales_ap_display_j
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        ) 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) 地堆计划网点数,
+        sum(if(actual_floor_stack_executed is not null and actual_floor_stack_executed = '执行', 1,
+        0)) as 地堆执行网点数,
+        sum(other_display_sn) 其他陈列计划网点数,
+        sum(if(actual_other_display_executed is not null and actual_other_display_executed = '执行',
+        1, 0)) as 其他陈列执行网点数
+        from sales_ap_promotion_display
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        ) 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="commonQueryDists"/>
+        </where>
+        ) 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)) 促销口味执行网点数,
+        sum(if(promotion_price_execution_status = '执行', 1, 0)) 促销价执行网点数,
+        sum(poster_sn) 海报计划网点数,
+        sum(if(poster_sn is null, null, if(poster_execution_status = '执行', 1, 0))) 海报执行网点数
+        from sales_ap_promotion
+        <where>
+            <include refid="commonQueryDists"/>
+        </where>
+        ) sp;
+    </select>
+
     <!-- 批量更新SQL -->
     <update id="batchUpdate">
         UPDATE sales_ap_display

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

@@ -143,6 +143,9 @@
                         <if test="posterExecutionStatus != null">
                                 poster_execution_status = #{posterExecutionStatus},
                         </if>
+                        <if test="remark != null">
+                                remark = #{remark},
+                        </if>
 
                 </set>
                 WHERE sap_id = #{sapId}