From 7c011f84de74287c75610cce7add18e73db252fd Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 十一月 2024 09:49:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index db4b088..6e35693 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -9,6 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.OrderDetlService;
import com.zy.common.web.BaseController;
@@ -26,6 +27,13 @@
@Autowired
private OrderDetlService orderDetlService;
+ @PostMapping("/orderDetl/list/pda/auth")
+ public R getPdaOrderDetl(@RequestBody Map<String,Object> map) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ wrapper.eq("order_no", map.get("orderNo"));
+ return R.ok(orderDetlService.selectList(wrapper));
+ }
+
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -42,8 +50,20 @@
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/list/auth")
+ @ManagerAuth
+ public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
--
Gitblit v1.9.1