常规陈列添加挂条

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

@@ -21,7 +21,12 @@ public class SalesApDisplay implements Serializable {
      */
     @TableId(type = IdType.AUTO)
     private Long sadId;
+
+    /**
+     * 陈列所属月份
+     */
     private Date salesMonth;
+
     /**
      * 销售大区
      */
@@ -193,10 +198,15 @@ public class SalesApDisplay implements Serializable {
     private Integer actualMainShelfQty;
 
     /**
-     * 实际主货架-是否执行
+     * 实际主货架-是否执行,有计划默认否
      */
     private String actualMainShelfExecuted;
 
+    /**
+     * 主货架目标网点数
+     */
+    private Integer mainShelfTypeSn;
+
     /**
      * 计划端架-数量
      */
@@ -218,10 +228,15 @@ public class SalesApDisplay implements Serializable {
     private Double actualEndCapQty;
 
     /**
-     * 实际端架-是否执行
+     * 实际端架-是否执行,有计划默认否
      */
     private String actualEndCapExecuted;
 
+    /**
+     * 端架目标网点数
+     */
+    private Integer endCapQtySn;
+
     /**
      * 计划地堆-平米数（㎡）
      */
@@ -263,10 +278,15 @@ public class SalesApDisplay implements Serializable {
     private String actualThemedFloorStack;
 
     /**
-     * 实际地堆是否执行
+     * 实际地堆是否执行,有计划默认否
      */
     private String actualFloorStackExecuted;
 
+    /**
+     * 地堆目标网点数
+     */
+    private Integer floorStackAreaSn;
+
     /**
      * 计划多点陈列-数量+形式
      */
@@ -283,10 +303,35 @@ public class SalesApDisplay implements Serializable {
     private String actualMultiDisplay;
 
     /**
-     * 实际多点陈列-是否执行
+     * 实际多点陈列-是否执行,有计划默认否
      */
     private String actualMultiDisplayExecuted;
 
+    /**
+     * 多点陈列目标网点数
+     */
+    private Integer multiPointDisplaySn;
+
+    /**
+     * 计划挂条-数量+形式
+     */
+    private String plannedHangingStripQuantityForm;
+
+    /**
+     * 实际挂条-数量+形式
+     */
+    private String actualHangingStripQuantityForm;
+
+    /**
+     * 挂条-是否执行
+     */
+    private String hangingStripExecuted;
+
+    /**
+     * 挂条目标网点数
+     */
+    private Integer hangingStripSn;
+
     /**
      * 合计费用-费用
      */
@@ -298,7 +343,7 @@ public class SalesApDisplay implements Serializable {
     private Double totalCostRate;
 
     /**
-     * 常规陈列是否执行
+     * 常规陈列是否执行,有计划默认否
      */
     private String regularDisplayExecuted;
 
@@ -316,8 +361,20 @@ public class SalesApDisplay implements Serializable {
      * 当月是否拜访
      */
     private String monthlyVisited;
+
+    /**
+     * 创建时间
+     */
     private Date createTime;
+
+    /**
+     * 更新者
+     */
     private String updateBy;
+
+    /**
+     * 更新时间
+     */
     private Date updateTime;
 
     @TableField(exist = false)

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

@@ -134,6 +134,17 @@ public class SalesApRequest {
          * 常规陈列是否执行
          */
         private String regularDisplayExecuted;
+
+        /**
+         * 实际挂条-数量+形式
+         */
+        private String actualHangingStripQuantityForm;
+
+        /**
+         * 挂条-是否执行
+         */
+        private String hangingStripExecuted;
+
     }
     @Data
     public static class Promotion{

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

@@ -75,4 +75,14 @@ public class SalesApDisplayDto {
     private String regularDisplayExecuted;
     private String updateBy;
 
+    /**
+     * 实际挂条-数量+形式
+     */
+    private String actualHangingStripQuantityForm;
+
+    /**
+     * 挂条-是否执行
+     */
+    private String hangingStripExecuted;
+
 }

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

@@ -6,6 +6,7 @@
 
     <resultMap id="SalesApDisplayBash" type="com.sfa.operation.domain.sales.entity.SalesApDisplay">
             <id property="sadId" column="sad_id" jdbcType="BIGINT"/>
+            <result property="salesMonth" column="sales_month" jdbcType="DATE"/>
             <result property="regionName" column="region_name" jdbcType="VARCHAR"/>
             <result property="districtName" column="district_name" jdbcType="VARCHAR"/>
             <result property="dealerProvince" column="dealer_province" jdbcType="VARCHAR"/>
@@ -41,11 +42,13 @@
             <result property="actualMainShelfType" column="actual_main_shelf_type" jdbcType="VARCHAR"/>
             <result property="actualMainShelfQty" column="actual_main_shelf_qty" jdbcType="INTEGER"/>
             <result property="actualMainShelfExecuted" column="actual_main_shelf_executed" jdbcType="VARCHAR"/>
+            <result property="mainShelfTypeSn" column="main_shelf_type_sn" jdbcType="INTEGER"/>
             <result property="plannedEndCapQty" column="planned_end_cap_qty" jdbcType="FLOAT"/>
             <result property="plannedEndCapTotalCost" column="planned_end_cap_total_cost" jdbcType="DECIMAL"/>
             <result property="plannedEndCapUnitCost" column="planned_end_cap_unit_cost" jdbcType="DECIMAL"/>
             <result property="actualEndCapQty" column="actual_end_cap_qty" jdbcType="FLOAT"/>
             <result property="actualEndCapExecuted" column="actual_end_cap_executed" jdbcType="VARCHAR"/>
+            <result property="endCapQtySn" column="end_cap_qty_sn" jdbcType="INTEGER"/>
             <result property="plannedFloorStackArea" column="planned_floor_stack_area" jdbcType="FLOAT"/>
             <result property="plannedFloorStackQty" column="planned_floor_stack_qty" jdbcType="INTEGER"/>
             <result property="plannedThemedFloorStack" column="planned_themed_floor_stack" jdbcType="VARCHAR"/>
@@ -55,16 +58,25 @@
             <result property="actualFloorStackQty" column="actual_floor_stack_qty" jdbcType="INTEGER"/>
             <result property="actualThemedFloorStack" column="actual_themed_floor_stack" jdbcType="VARCHAR"/>
             <result property="actualFloorStackExecuted" column="actual_floor_stack_executed" jdbcType="VARCHAR"/>
+            <result property="floorStackAreaSn" column="floor_stack_area_sn" jdbcType="INTEGER"/>
             <result property="plannedMultiDisplay" column="planned_multi_display" jdbcType="VARCHAR"/>
             <result property="plannedMultiDisplayTotalCost" column="planned_multi_display_total_cost" jdbcType="DECIMAL"/>
             <result property="actualMultiDisplay" column="actual_multi_display" jdbcType="VARCHAR"/>
             <result property="actualMultiDisplayExecuted" column="actual_multi_display_executed" jdbcType="VARCHAR"/>
+            <result property="multiPointDisplaySn" column="multi_point_display_sn" jdbcType="INTEGER"/>
+            <result property="plannedHangingStripQuantityForm" column="planned_hanging_strip_quantity_form" jdbcType="VARCHAR"/>
+            <result property="actualHangingStripQuantityForm" column="actual_hanging_strip_quantity_form" jdbcType="VARCHAR"/>
+            <result property="hangingStripExecuted" column="hanging_strip_executed" jdbcType="VARCHAR"/>
+            <result property="hangingStripSn" column="hanging_strip_sn" jdbcType="INTEGER"/>
             <result property="totalCost" column="total_cost" jdbcType="DECIMAL"/>
             <result property="totalCostRate" column="total_cost_rate" jdbcType="FLOAT"/>
             <result property="regularDisplayExecuted" column="regular_display_executed" jdbcType="VARCHAR"/>
             <result property="paidDisplay" column="paid_display" jdbcType="VARCHAR"/>
             <result property="monthlyVisitTarget" column="monthly_visit_target" jdbcType="VARCHAR"/>
             <result property="monthlyVisited" column="monthly_visited" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>