From 20cec70cdcca8c2419a17e0304d12d5360af6065 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 25 九月 2024 14:48:27 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index 6307bfe..0e7df22 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -21,6 +22,7 @@
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
+import com.zy.asrs.wms.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -56,21 +58,34 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
// QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<Order> wrapper = new QueryWrapper<>();
ArrayList<Long> types = new ArrayList<>();
for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 1))) {
types.add(orderType.getId());
}
- wrapper.in(Order::getOrderType, types);
+ wrapper.in("order_type", types);
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
- wrapper1.or().like(Order::getOrderNo, condition);
- wrapper1.or().like(Order::getMemo, condition);
+ wrapper1.or().like("order_no", condition);
+ wrapper1.or().like("memo", condition);
});
}
+
+ Object paramObj = map.get("_param");
+ if(paramObj != null) {
+ Map param = (Map) paramObj;
+ for (Object value : param.entrySet()) {
+ Map.Entry entry = (Map.Entry) value;
+ String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
+ if (entry.getValue() != null) {
+ wrapper.like(paramKey, entry.getValue());
+ }
+ }
+ }
+
return R.ok().add(orderService.page(pageParam, wrapper));
}
@@ -81,25 +96,38 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
// QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
- LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+ QueryWrapper<Order> wrapper = new QueryWrapper<>();
ArrayList<Long> types = new ArrayList<>();
for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 2))) {
types.add(orderType.getId());
}
- wrapper.in(Order::getOrderType, types);
+ wrapper.in("order_type", types);
if (map.containsKey("orderOut")) {
- wrapper.isNull(Order::getWaveId);
+ wrapper.isNull("wave_id");
}
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
- wrapper1.or().like(Order::getOrderNo, condition);
- wrapper1.or().like(Order::getMemo, condition);
+ wrapper1.or().like("order_no", condition);
+ wrapper1.or().like("memo", condition);
});
}
+
+ Object paramObj = map.get("_param");
+ if(paramObj != null) {
+ Map param = (Map) paramObj;
+ for (Object value : param.entrySet()) {
+ Map.Entry entry = (Map.Entry) value;
+ String paramKey = Utils.toSymbolCase(entry.getKey().toString(), '_');
+ if (entry.getValue() != null) {
+ wrapper.like(paramKey, entry.getValue());
+ }
+ }
+ }
+
return R.ok().add(orderService.page(pageParam, wrapper));
}
--
Gitblit v1.9.1