ids由集合改为字符串

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/BatchDeleteParam.java

@@ -1,15 +1,10 @@
 package com.sckw.order.model.vo.req;
 
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.List;
-
 /**
  * @desc: 批量删除请求参数
  * @author: yzc
@@ -20,8 +15,8 @@ import java.util.List;
 @ToString
 public class BatchDeleteParam {
 
-    @NotEmpty(message = "订单id集合不能为空")
-    private List<Long> ids;
+    @NotBlank(message = "订单ids不能为空")
+    private String ids;
 
     /**
      * 订单类型（1采购订单、2销售订单）

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -793,7 +793,7 @@ public class KwoTradeOrderService {
      * @return: void
      */
     public void batchDelete(BatchDeleteParam param) {
-        List<Long> ids = param.getIds();
+        List<Long> ids = StringUtils.splitStrToList(param.getIds(), ",", Long.class);
         LambdaQueryWrapper<KwoTradeOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(KwoTradeOrder::getId, ids).ne(KwoTradeOrder::getStatus, 0).eq(KwoTradeOrder::getDelFlag, Global.NO);
         List<KwoTradeOrder> list = kwoTradeOrderMapper.selectList(wrapper);

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -208,7 +208,7 @@ public class KwoTransportDemandService {
         wrapper.eq(KwoTransportDemand::getEntId, LoginUserHolder.getEntId()).eq(KwoTransportDemand::getDelFlag, Global.NO);
         if (StringUtils.isNotBlank(param.getIds())) {
             List<Long> ids = StringUtils.splitStrToList(param.getIds(), ",", Long.class);
-            wrapper.in(KwoTransportDemand::getId, ids);
+            wrapper.in(KwoTransportDemand::getId, ids).orderByDesc(KwoTransportDemand::getCreateTime);
             return wrapper;
         }
         if (Objects.nonNull(param.getEndCreateTime())) {
@@ -237,7 +237,7 @@ public class KwoTransportDemandService {
                 case 3 -> wrapper.eq(KwoTransportDemand::getUnloadAreaCode, unloadCode);
             }
         }
-        return wrapper;
+        return wrapper.orderByDesc(KwoTransportDemand::getCreateTime);
     }
 
     /**
@@ -406,6 +406,7 @@ public class KwoTransportDemandService {
                 wrapper.like(KwoTransportDemand::getName, param.getKeywords());
             }
         }
+        wrapper.orderByDesc(KwoTransportDemand::getCreateTime);
         Page<KwoTransportDemand> kwpGoodsPage = kwoTransportDemandMapper.selectPage(page, wrapper);
         List<KwoTransportDemand> list = kwpGoodsPage.getRecords();
         if (CollectionUtils.isEmpty(list)) {

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -2,6 +2,7 @@ package com.sckw.product.controller;
 
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.product.model.GoodsListExport;
@@ -141,8 +142,9 @@ public class KwpGoodsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/batchTakeOffShelves")
-    public HttpResult batchTakeOffShelves(@RequestParam List<Long> ids) {
-        kwpGoodsService.batchTakeOffShelves(ids);
+    public HttpResult batchTakeOffShelves(@RequestParam String ids) {
+        List<Long> goodIds = StringUtils.splitStrToList(ids, ",", Long.class);
+        kwpGoodsService.batchTakeOffShelves(goodIds);
         return HttpResult.ok("批量下架成功");
     }
 
@@ -154,8 +156,9 @@ public class KwpGoodsController {
      * @return: com.sckw.core.web.response.HttpResult
      */
     @GetMapping("/batchDelete")
-    public HttpResult batchDelete(@RequestParam List<Long> ids) {
-        kwpGoodsService.batchDelete(ids);
+    public HttpResult batchDelete(@RequestParam String ids) {
+        List<Long> goodIds = StringUtils.splitStrToList(ids, ",", Long.class);
+        kwpGoodsService.batchDelete(goodIds);
         return HttpResult.ok("批量删除成功");
     }
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/ExportGoodsListParam.java

@@ -4,8 +4,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.List;
-
 /**
  * @desc: 导出商品列表请求参数
  * @author: yzc
@@ -19,7 +17,7 @@ public class ExportGoodsListParam extends GoodsListParam {
     /**
      * 商品ids
      */
-    private List<Long> ids;
+    private String ids;
 
 
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/SelectGoodsListParam.java

@@ -7,7 +7,6 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @desc: 分页查询商品列表请求参数
@@ -54,5 +53,5 @@ public class SelectGoodsListParam extends PageRequest {
     /**
      * 商品ids
      */
-    private List<Long> ids;
+    private String ids;
 }

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -466,8 +466,9 @@ public class KwpGoodsService {
      */
     private IPage<KwpGoods> getGoodsLists(SelectGoodsListParam params, Boolean isPage) {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
-        if (CollectionUtils.isNotEmpty(params.getIds())) {
-            wrapper.in(KwpGoods::getId, params.getIds());
+        if (StringUtils.isNotBlank(params.getIds())) {
+            List<Long> ids = StringUtils.splitStrToList(params.getIds(), ",", Long.class);
+            wrapper.in(KwpGoods::getId, ids);
         } else {
             if (Objects.nonNull(params.getEndCreateTime())) {
                 wrapper.le(KwpGoods::getCreateTime, DateUtil.offsetDay(params.getEndCreateTime(), 1));
@@ -662,6 +663,7 @@ public class KwpGoodsService {
                 wrapper.like(KwpGoods::getName, params.getKeywords());
             }
         }
+        wrapper.orderByDesc(KwpGoods::getCreateTime);
         Page<KwpGoods> kwpGoodsPage = kwpGoodsMapper.selectPage(page, wrapper);
         List<KwpGoods> list = kwpGoodsPage.getRecords();
         if (CollectionUtils.isEmpty(list)) {

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

@@ -233,10 +233,11 @@ public class KwOrderService {
 
     public List<TradeOrderListExport> export(TradeOrderListExportParam params) {
         Query query = new Query();
-        if (CollectionUtils.isNotEmpty(params.getIds())) {
+        if (StringUtils.isNotBlank(params.getIds())) {
+            List<Long> ids = StringUtils.splitStrToList(params.getIds(), ",", Long.class);
             Long entId = LoginUserHolder.getEntId();
             Criteria criteria = new Criteria();
-            criteria.and("tOrderId").in(params.getIds()).and("delFlag").is(0);
+            criteria.and("tOrderId").in(ids).and("delFlag").is(0);
             if (Objects.equals(params.getOrderType(), 1)) {
                 //采购订单
                 criteria.and("procureTopEntId").is(entId);

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

@@ -4,8 +4,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import java.util.List;
-
 /**
  * @desc: 订单列表导出请求参数
  * @author: yzc
@@ -17,7 +15,7 @@ import java.util.List;
 public class TradeOrderListExportParam extends TradeOrderListStatisticParam {
 
     /**
-     * 订单id集合
+     * 订单ids
      */
-    private List<Long> ids;
+    private String ids;
 }