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,9 +381,8 @@ public class SalesApDisplay implements Serializable {
      * 更新时间
      */
     private Date updateTime;
-
     /**
-     * 备注 未执行原因
+     * 活动备注
      */
     private String remark;
 

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/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}