feature(*): 新增查询续保成交的数据

- 升级sdk参数

feature(*): 新增查询续保成交的数据
- 升级sdk参数
张志伟
1 parent 95df3085
Showing 3 changed files with 25 additions and 5 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/BeCompletedQuery.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/ShouldBeCompletedQuery.java
@@ -205,7 +205,10 @@
                 and t1.type = #{condition.type}
             </if>
             <if test="condition.shopId !=null">
-                and t1.follow_shop = #{condition.shopId}
+                and t1.follow_shop in
+                <foreach collection="condition.shopId" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
             </if>
             <if test="condition.userId !=null">
                 and t1.follow_user = #{condition.userId}
@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
  
+import java.util.List;
+
  
 /**
  * 应成交查询参数
@@ -25,7 +27,7 @@ public class BeCompletedQuery {
     /**
      * 门店id
      */
-    private Long shopId;
+    private List<Long> shopId;
     /**
      * 跟进开始时间
      */
@@ -2,10 +2,13 @@ package cn.fw.valhalla.sdk.param;
  
 import lombok.Data;
  
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.time.YearMonth;
 import java.time.ZoneId;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
  
 /**
  * 应成交台数查询
@@ -25,8 +28,8 @@ public class ShouldBeCompletedQuery {
     /**
      * 门店id
      */
-    @NotNull(message = "门店不能为空")
-    private Long shopId;
+    @NotEmpty(message = "门店不能为空")
+    private Long[] shopId;
     /**
      * 跟进开始时间 [时间戳 默认为本月月初]
      */
@@ -53,4 +56,16 @@ public class ShouldBeCompletedQuery {
         String timeStr = String.valueOf(endTime);
         return timeStr.length() >= 10 ? timeStr.substring(0, 10) : timeStr;
     }
+
+    public List<Long> getShopId() {
+        return Arrays.stream(shopId).collect(Collectors.toList());
+    }
+
+    public void setShopId(final Long... shopId) {
+        this.shopId = shopId;
+    }
+
+    public void setShopId(final List<Long> shopIdList) {
+        this.shopId = shopIdList.toArray(new Long[0]);
+    }
 }