核销文案

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.moment;
 
 import java.io.Serializable ;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -72,8 +73,16 @@ public class QwMomentPlanDTO implements Serializable{
 	private String qwJobid;
 	/**完成率*/
 	private Integer execRate;
+	// 选择的导购id列表
+	private List<String> selectClerkIdList ;
 
+	public List<String> getSelectClerkIdList() {
+		return selectClerkIdList;
+	}
 
+	public void setSelectClerkIdList(List<String> selectClerkIdList) {
+		this.selectClerkIdList = selectClerkIdList;
+	}
 
 	public Long getPlanId() {
 		return planId;

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

@@ -16,6 +16,6 @@ public interface QwMomentPlanAttendService {
      * @param enterpriseId
      * @param planId
      */
-    void saveClerk(String enterpriseId, List<String> clerkIdList , Long planId) ;
+    void saveClerk(String enterpriseId, Long planId , List<String> clerkIdList) ;
 
 }

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

@@ -35,8 +35,8 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
         return null;
     }
 
-
-    public void saveClerk(String enterpriseId,Long planId , List<String> clerkIdList) {
+    @Override
+    public void saveClerk(String enterpriseId, Long planId , List<String> clerkIdList) {
         List<String> existClerkIdList = this.qwMomentPlanAttendMapper.listExistClerkIds(planId,clerkIdList) ;
         if(CollectionUtils.isNotEmpty(existClerkIdList)) {
             clerkIdList = clerkIdList.stream().filter(o->!existClerkIdList.contains(o)).collect(Collectors.toList());

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

@@ -50,10 +50,12 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         if(plan.getPublishType()==1) {
             plan.setPublishTime(now);
         }
+        boolean createFlag = false ;
         plan.setBeginDate(plan.getPublishTime());
         Date endTime = DateUtil.addDay(plan.getBeginDate(), plan.getExpireDays());
         plan.setEndDate(endTime);
         if(null == planId) {
+            createFlag = true ;
             planId = UniqueIdUtils.uniqueLong();
             dto.setPlanId(planId);
             plan.setPlanId(planId);
@@ -66,13 +68,13 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         // 参与导购
         if(dto.getPlanClerkType()==1) {
             if (createFlag) {
-                this.qwMomentPlanAttendService.saveClerk(enterpriseId, dto.getSelectClerkIdList(), planId);
+                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> 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());
-                this.qwMomentPlanAttendService.saveClerk(enterpriseId, addList, planId);
+                this.qwMomentPlanAttendService.saveClerk(enterpriseId, planId , addList);
                 if (CollectionUtils.isNotEmpty(delList)) {
                     this.qwMomentPlanAttendMapper.delClerks(planId, delList);
                 }