核销文案

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/moment/QwMomentPlanDTO.java

@@ -51,6 +51,7 @@ public class QwMomentPlanDTO implements Serializable{
 	private Integer planClerkType;
 	/**总任务数*/
 	private Integer totalNum;
+	private Integer taskClerkNum ;
 	/**执行任务数*/
 	private Integer doneNum;
 	/**终止时间*/
@@ -76,6 +77,14 @@ public class QwMomentPlanDTO implements Serializable{
 	// 选择的导购id列表
 	private List<String> selectClerkIdList ;
 
+	public Integer getTaskClerkNum() {
+		return taskClerkNum;
+	}
+
+	public void setTaskClerkNum(Integer taskClerkNum) {
+		this.taskClerkNum = taskClerkNum;
+	}
+
 	public List<String> getSelectClerkIdList() {
 		return selectClerkIdList;
 	}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/moment/QwMomentPlanAttendMapper.java

@@ -21,7 +21,7 @@ public interface QwMomentPlanAttendMapper {
      */
     List<String> listExistClerkIds(@Param("planId") Long planId , @Param("list") List<String> clerkIdList) ;
 
-    List<QwMomentPlanAttendDTO> listClerk(@Param("planId")Long planId, @Param("doneFlag") int doneFlag);
+    List<QwMomentPlanAttendDTO> listClerk(@Param("planId")Long planId);
 
 
     /**
@@ -31,5 +31,4 @@ public interface QwMomentPlanAttendMapper {
      */
     void delClerks(@Param("planId") Long planId , @Param("list") List<String> clerkIdList) ;
 
-
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/moment/TabQwMomentPlanAttend.java

@@ -52,6 +52,8 @@ public class TabQwMomentPlanAttend implements Serializable{
 	private Date qwDataTime;
 	/**门店id*/
 	private String storeId;
+	// 0待下发 1已下发
+	private Integer statusFlag ;
 
 	public Long getAttendId() {
 		return attendId;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -70,7 +70,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
             if (createFlag) {
                 this.qwMomentPlanAttendService.saveClerk(enterpriseId, planId,dto.getSelectClerkIdList());
             } else {
-                List<String> oldList = this.qwMomentPlanAttendMapper.listClerk(planId,0).stream().map(o -> o.getClerkId()).collect(Collectors.toList());
+                List<String> oldList = this.qwMomentPlanAttendMapper.listClerk(planId).stream().map(o -> o.getClerkId()).collect(Collectors.toList());
                 List<String> newList = dto.getSelectClerkIdList();
                 List<String> addList = newList.stream().filter(o -> !oldList.contains(o)).distinct().collect(Collectors.toList());
                 List<String> delList = oldList.stream().filter(o -> !newList.contains(o)).distinct().collect(Collectors.toList());

haoban-manage3-service/src/main/resources/mapper/moment/qwMomentPlanAttendMapper.xml

@@ -20,6 +20,7 @@
       <result column="moment_id" javaType="String" jdbcType="VARCHAR" property="momentId"/>
       <result column="qw_data_time" javaType="java.util.Date" jdbcType="TIMESTAMP" property="qwDataTime"/>
       <result column="store_id" javaType="String" jdbcType="VARCHAR" property="storeId"/>
+      <result column="status_flag" property="statusFlag" />
   </resultMap>
   <sql id="Base_Column_List">
 	  attend_id,
@@ -39,7 +40,7 @@
 	  send_time,
 	  moment_id,
 	  qw_data_time,
-	  store_id
+	  store_id , status_flag
   </sql>
 
 
@@ -52,7 +53,7 @@
     </select>
 
 
-    <select id="listClerk" resultType="com.gic.marketing.pro.api.dto.clerktask.ClerkTaskPlanAttendDTO">
+    <select id="listClerk" resultType="com.gic.haoban.manage.api.dto.moment.QwMomentPlanAttendDTO">
         select clerk_id clerkId , clerk_code clerkCode , clerk_name clerkName
         from tab_haoban_qw_moment_plan_attend where plan_id = #{planId}
         <if test="doneFlag==1">
@@ -74,7 +75,6 @@
 
   <!-- ===================== 新增 ======================== -->
   <insert id="batchInsert">
-  <![CDATA[
   INSERT INTO tab_haoban_qw_moment_plan_attend(
 	  attend_id,
 	  plan_id,
@@ -91,7 +91,7 @@
 	  send_time,
 	  moment_id,
 	  qw_data_time,
-	  store_id
+	  store_id , status_flag
   )VALUES
           <foreach collection="list" item="item" separator=","  index="index">
        (
@@ -103,18 +103,17 @@
 	  #{item.clerkId,jdbcType=CHAR},
 	  #{item.clerkCode,jdbcType=VARCHAR},
 	  #{item.clerkName,jdbcType=VARCHAR},
-	  #{item.deleteFlag,jdbcType=INTEGER},
+	  0,
 	  #{item.commentCount,jdbcType=INTEGER},
 	  #{item.likeCount,jdbcType=INTEGER},
 	  #{item.taskStatus,jdbcType=INTEGER},
 	  #{item.sendTime,jdbcType=TIMESTAMP},
 	  #{item.momentId,jdbcType=VARCHAR},
 	  #{item.qwDataTime,jdbcType=TIMESTAMP},
-	  #{item.storeId,jdbcType=VARCHAR}
-
+	  #{item.storeId,jdbcType=VARCHAR} , #{item.statusFlag}
+              )
           </foreach>
-  )
-  ]]>
+
   </insert>
 
   <update id="update" parameterType="com.gic.haoban.manage.service.entity.moment.TabQwMomentPlanAttend">

haoban-manage3-service/src/test/java/MomentTest.java

@@ -38,6 +38,12 @@ public class MomentTest {
             dto.setExecType(1);
             dto.setExpireDays(10);
 
+            dto.setPlanClerkType(1);
+
+
+            List<String> clerkIds = Arrays.asList("a02065ae51594fb9832e4199d4e3a1b0","753a367d709d40a38b17ed25847d3b4b","b2ef17cce11f476b996d0b27ebadf7fb") ;
+
+            dto.setSelectClerkIdList(clerkIds);
 
 
             this.qwMomentApiService.save(dto) ;