diff --git a/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/ShouldBeCompletedQuery.java b/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/ShouldBeCompletedQuery.java index aac325a..9f236c0 100644 --- a/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/ShouldBeCompletedQuery.java +++ b/fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/ShouldBeCompletedQuery.java @@ -1,8 +1,9 @@ package cn.fw.valhalla.sdk.param; import lombok.Data; +import org.springframework.util.CollectionUtils; -import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotBlank; import java.time.YearMonth; import java.time.ZoneId; import java.util.Arrays; @@ -21,15 +22,16 @@ import java.util.stream.Collectors; */ @Data public class ShouldBeCompletedQuery { + private final static String SEPARATOR = ","; /** * 跟进人员id */ private Long userId; /** - * 门店id + * 门店ids */ - @NotEmpty(message = "门店不能为空") - private Long[] shopId; + @NotBlank(message = "门店不能为空") + private String shopIds; /** * 跟进开始时间 [时间戳 默认为本月月初] */ @@ -58,14 +60,30 @@ public class ShouldBeCompletedQuery { } public List getShopId() { - return Arrays.stream(shopId).collect(Collectors.toList()); + return Arrays.stream(shopIds.split(SEPARATOR)).map(Long::valueOf).collect(Collectors.toList()); } + /** + * 设置门店 + * + * @param shopId 门店id数组 + */ public void setShopId(final Long... shopId) { - this.shopId = shopId; + if (shopId == null || shopId.length == 0) { + return; + } + this.shopIds = Arrays.stream(shopId).map(String::valueOf).collect(Collectors.joining(",")); } + /** + * 设置门店 + * + * @param shopIdList 门店id集合 + */ public void setShopId(final List shopIdList) { - this.shopId = shopIdList.toArray(new Long[0]); + if (CollectionUtils.isEmpty(shopIdList)) { + return; + } + this.shopIds = shopIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); } }