零食陈列添加是否执行字段；AP计划填报时，记录修改人姓名

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

@@ -142,7 +142,10 @@ public class SalesApSnacksDisplay implements Serializable {
      * 实际-陈列形式
      */
     private String actualDisplay;
-
+    /**
+     * 陈列形式是否执行
+     */
+    private String displayExecuted;
     /**
      * 计划-端架数量（组）
      */
@@ -152,7 +155,14 @@ public class SalesApSnacksDisplay implements Serializable {
      * 实际-端架数量（组）
      */
     private Double actualEndCapQty;
-
+    /**
+     * 端架数量是否执行
+     */
+    private String endCapQtyExecuted;
+    /**
+     * 零食陈列是否执行
+     */
+    private String snackDisplayExecuted;
     /**
      * 计划-陈列费用
      */

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

@@ -37,6 +37,9 @@ public class SalesApRequest {
     private Long sapId;
     private Promotion promotion;
 
+    /**
+     * 档期陈列表ID
+     */
     private Long sapdId;
     private PromotionDisplay promotionDisplay;
 
@@ -203,11 +206,23 @@ public class SalesApRequest {
          * 实际-陈列形式
          */
         private String actualDisplay;
+        /**
+         * 陈列形式是否执行
+         */
+        private String displayExecuted;
 
         /**
          * 实际-端架数量（组）
          */
         private Double actualEndCapQty;
+        /**
+         * 端架数量是否执行
+         */
+        private String endCapQtyExecuted;
+        /**
+         * 零食陈列是否执行
+         */
+        private String snackDisplayExecuted;
     }
     @Data
     private class PromotionDisplay {

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

@@ -73,5 +73,6 @@ public class SalesApDisplayDto {
      * 常规陈列是否执行
      */
     private String regularDisplayExecuted;
+    private String updateBy;
 
 }

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

@@ -50,5 +50,6 @@ public class SalesApPromotionDisplayDto {
      * 档期陈列是否执行
      */
     private String promotionDisplayExecuted;
+    private String updateBy;
 }
 

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

@@ -82,4 +82,5 @@ public class SalesApPromotionDto {
      * 海报是否执行
      */
     private String posterExecutionStatus;
+    private String updateBy;
 }

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

@@ -15,9 +15,22 @@ public class SalesApSnacksDisplayDto {
      * 实际-陈列形式
      */
     private String actualDisplay;
+    /**
+     * 陈列形式是否执行
+     */
+    private String displayExecuted;
 
     /**
      * 实际-端架数量（组）
      */
     private Double actualEndCapQty;
+    /**
+     * 端架数量是否执行
+     */
+    private String endCapQtyExecuted;
+    /**
+     * 零食陈列是否执行
+     */
+    private String snackDisplayExecuted;
+    private String updateBy;
 }

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

 package com.sfa.operation.service.sales.impl;
 
+import com.sfa.common.security.utils.SecurityUtils;
 import com.sfa.operation.domain.sales.dao.ISalesApDisplayDao;
 import com.sfa.operation.domain.sales.dao.ISalesApPromotionDisplayDao;
 import com.sfa.operation.domain.sales.dao.ISalesApSnacksDisplayDao;
@@ -30,6 +31,7 @@ public class ApDisplayCoreServiceImpl implements IApDisplayCoreService {
         SalesApDisplayDto salesApDisplayDto = new SalesApDisplayDto();
         BeanUtils.copyProperties(request.getDisplay(), salesApDisplayDto);
         salesApDisplayDto.setSadId(request.getSadId());
+        salesApDisplayDto.setUpdateBy(SecurityUtils.getNickName());
         salesApDisplayDao.updateDetail(salesApDisplayDto);
     }
 
@@ -38,6 +40,7 @@ public class ApDisplayCoreServiceImpl implements IApDisplayCoreService {
         SalesApSnacksDisplayDto sdDto = new SalesApSnacksDisplayDto();
         BeanUtils.copyProperties(request.getSnackDisplay(), sdDto);
         sdDto.setSasdId(request.getSasdId());
+        sdDto.setUpdateBy(SecurityUtils.getNickName());
         salesApSnacksDisplayDao.updateDetail(sdDto);
     }
 
@@ -46,6 +49,7 @@ public class ApDisplayCoreServiceImpl implements IApDisplayCoreService {
         SalesApPromotionDisplayDto pdDto = new SalesApPromotionDisplayDto();
         BeanUtils.copyProperties(request.getPromotionDisplay(), pdDto);
         pdDto.setSapdId(request.getSapdId());
+        pdDto.setUpdateBy(SecurityUtils.getNickName());
         salesApPromotionDisplayDao.updateDetail(pdDto);
     }
 }

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

 package com.sfa.operation.service.sales.impl;
 
 import cn.hutool.core.date.DatePattern;
+import com.sfa.common.security.utils.SecurityUtils;
 import com.sfa.operation.domain.sales.dao.ISalesApPromotionDao;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.pojo.sales.response.SalesApPromotionDto;
@@ -49,6 +50,7 @@ public class ApPromotionCoreServiceImpl implements IApPromotionCoreService {
             }else {
                 dto.setIsActualPromotionEndDate(true);
             }
+            dto.setUpdateBy(SecurityUtils.getNickName());
             salesApPromotionDao.updateById(dto);
         } catch (ParseException e) {
             e.printStackTrace();