勤策APP-CP-稽查-表单，新增参数：

src/main/java/com/wangxiaolu/promotion/controller/activity/examine/ExaPlanCoreController.java

 package com.wangxiaolu.promotion.controller.activity.examine;
 
-import com.alibaba.fastjson.JSONObject;
-import com.wangxiaolu.promotion.enums.plan.PlanStatus;
 import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto;
 import com.wangxiaolu.promotion.pojo.activity.examine.vo.ExaPlanVo;
 import com.wangxiaolu.promotion.result.basedata.R;

src/main/java/com/wangxiaolu/promotion/domain/examine/mapper/entity/ActivityExamineDO.java

@@ -121,11 +121,31 @@ public class ActivityExamineDO implements Serializable {
      */
     private String temHs;
 
+    /**
+     * 当话术未达标时，有一个话术未达标原因的备注输入框
+     */
+    private String temHsRemark;
+
     /**
      * 物料：齐全/缺少
      */
     private String temWl;
 
+    /**
+     * 试吃品是否齐全：齐全/缺少
+     */
+    private String temWlScp;
+
+    /**
+     * 是否有试吃台：有/无
+     */
+    private String temWlSct;
+
+    /**
+     * 是否有试吃托盘：有/无
+     */
+    private String temWlSctp;
+
     /**
      * 着装：达标/未达标
      */
@@ -156,6 +176,11 @@ public class ActivityExamineDO implements Serializable {
      */
     private String posPhotos;
 
+    /**
+     * 促销员的工资
+     */
+    private BigDecimal temSalary;
+
     /**
      * 
      */
@@ -176,6 +201,11 @@ public class ActivityExamineDO implements Serializable {
      */
     private String modifyBy;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/wangxiaolu/promotion/pojo/activity/examine/dto/ActivityExamineDto.java

@@ -119,10 +119,29 @@ public class ActivityExamineDto {
      */
     private String temHs;
 
+    /**
+     * 当话术未达标时，有一个话术未达标原因的备注输入框
+     */
+    private String temHsRemark;
+
     /**
      * 物料：齐全/缺少
      */
     private String temWl;
+    /**
+     * 试吃品是否齐全：齐全/缺少
+     */
+    private String temWlScp;
+
+    /**
+     * 是否有试吃台：有/无
+     */
+    private String temWlSct;
+
+    /**
+     * 是否有试吃托盘：有/无
+     */
+    private String temWlSctp;
 
     /**
      * 着装：达标/未达标
@@ -148,6 +167,10 @@ public class ActivityExamineDto {
      * POS金额
      */
     private BigDecimal posRmb;
+    /**
+     * 促销员的工资
+     */
+    private BigDecimal temSalary;
 
     /**
      * pos照片
@@ -173,4 +196,9 @@ public class ActivityExamineDto {
      * 修改人
      */
     private String modifyBy;
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

src/main/java/com/wangxiaolu/promotion/pojo/activity/examine/vo/ExaPlanVo.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @author : liqiulin
@@ -122,10 +121,29 @@ public class ExaPlanVo {
      */
     private String temHs;
 
+    /**
+     * 当话术未达标时，有一个话术未达标原因的备注输入框
+     */
+    private String temHsRemark;
+
     /**
      * 物料：齐全/缺少
      */
     private String temWl;
+    /**
+     * 试吃品是否齐全：齐全/缺少
+     */
+    private String temWlScp;
+
+    /**
+     * 是否有试吃台：有/无
+     */
+    private String temWlSct;
+
+    /**
+     * 是否有试吃托盘：有/无
+     */
+    private String temWlSctp;
 
     /**
      * 着装：达标/未达标
@@ -156,6 +174,14 @@ public class ExaPlanVo {
      * pos照片
      */
     private JSONArray posPhotos;
+    /**
+     * 促销员的工资
+     */
+    private BigDecimal temSalary;
+    /**
+     * 备注
+     */
+    private String remark;
     /**
      * 操作人
      */

src/main/resources/mapper/examine/ActivityExamineMapper.xml

@@ -11,8 +11,6 @@
             <result property="employeeNo" column="employee_no" jdbcType="VARCHAR"/>
             <result property="planId" column="plan_id" jdbcType="BIGINT"/>
             <result property="planStatus" column="plan_status" jdbcType="VARCHAR"/>
-            <result property="reportedIds" column="reported_ids" jdbcType="VARCHAR"/>
-            <result property="clockIds" column="clock_ids" jdbcType="VARCHAR"/>
             <result property="deptQcOrgName" column="dept_qc_org_name" jdbcType="VARCHAR"/>
             <result property="manageName" column="manage_name" jdbcType="VARCHAR"/>
             <result property="city" column="city" jdbcType="VARCHAR"/>
@@ -38,6 +36,12 @@
             <result property="modifyTime" column="modify_time" jdbcType="TIMESTAMP"/>
             <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
             <result property="modifyBy" column="modify_by" jdbcType="VARCHAR"/>
+            <result property="temHsRemark" column="tem_hs_remark" jdbcType="VARCHAR"/>
+            <result property="temWlScp" column="tem_wl_scp" jdbcType="VARCHAR"/>
+            <result property="temWlSct" column="tem_wl_sct" jdbcType="VARCHAR"/>
+            <result property="temWlSctp" column="tem_wl_sctp" jdbcType="VARCHAR"/>
+            <result property="temSalary" column="tem_salary" jdbcType="DECIMAL"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -50,7 +54,7 @@
         tem_hs,tem_wl,tem_zz,
         tem_work_photos,store_tc_photo,store_zhj_photo,
         pos_rmb,pos_photos,create_time,
-        modify_time,create_by,modify_by
+        modify_time,create_by,modify_by,tem_hs_remark,tem_hs_remark,tem_wl_scp,tem_wl_sct,tem_wl_sctp,tem_salary,remark
     </sql>
 
     <select id="selectByPlanId" resultMap="BaseResultMap">