Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwAcceptCarriageService.java

@@ -1,6 +1,7 @@
 package com.sckw.report.service;
 
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.CollectionUtils;
@@ -96,7 +97,8 @@ public class KwAcceptCarriageService {
 
         Query query1 = new Query(criteria);
         //in查询
-        if (CollectionUtils.isNotEmpty(query.getIds())) {
+        List<String> stringList = StringUtils.splitStrToList(query.getIds(), StringConstant.COMMA, String.class);
+        if (CollectionUtils.isNotEmpty(stringList)) {
             query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
         }
         // 12. 总记录数
@@ -142,7 +144,8 @@ public class KwAcceptCarriageService {
             criteria.andOperator(Criteria.where("createTime").gte(param.getStartDateTime()), Criteria.where("createTime")
                     .lte(param.getEndDateTime()));
         }
-        if (CollectionUtils.isNotEmpty(param.getIds())) {
+        List<String> stringList = StringUtils.splitStrToList(param.getIds(), StringConstant.COMMA, String.class);
+        if (CollectionUtils.isNotEmpty(stringList)) {
             criteria = Criteria.where("lOrderId").in(param.getIds());
         }
         //多条件模糊查询
@@ -282,7 +285,8 @@ public class KwAcceptCarriageService {
             criteria.and("carrierEntId").is(LoginUserHolder.getEntId());
         }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
-        if (CollectionUtils.isEmpty(query.getIds())) {
+        List<String> stringList = StringUtils.splitStrToList(query.getIds(), StringConstant.COMMA, String.class);
+        if (CollectionUtils.isEmpty(stringList)) {
             if (StringUtils.isNotBlank(query.getLoadAddress())) {
                 criteria.and("loadDetailAddress").is(query.getLoadAddress());
             }
@@ -313,12 +317,12 @@ public class KwAcceptCarriageService {
                 criteria.orOperator(c1, c2, c3, c4, c5);
             }
             query1.addCriteria(criteria);
-            if (CollectionUtils.isNotEmpty(query.getIds())) {
+            if (CollectionUtils.isNotEmpty(stringList)) {
                 query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
             }
         }else {
             query1.addCriteria(criteria);
-            if (CollectionUtils.isNotEmpty(query.getIds())) {
+            if (CollectionUtils.isNotEmpty(stringList)) {
                 query1.addCriteria(Criteria.where("lOrderId").in(query.getIds()));
             }
         }

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/ConsignOrderQuery.java

@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author lfdc
@@ -15,7 +14,10 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class ConsignOrderQuery extends PageRequest implements Serializable {
-    private List<Long> ids;
+    /**
+     * 数据id-主要用于订单导出
+     */
+    private String ids;
     /**
      * 计费方式
      */