From 638392144f32a2346f513c671c4a3bf88a954479 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 四月 2024 23:29:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OrderDetlController.java |   79 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 73d9897..ce90a9e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -9,8 +9,12 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Order;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.DocTypeService;
 import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +29,12 @@
 
     @Autowired
     private OrderDetlService orderDetlService;
+
+    @Autowired
+    private DocTypeService docTypeService;
+
+    @Autowired
+    private OrderService orderService;
 
     @RequestMapping(value = "/orderDetl/{id}/auth")
     @ManagerAuth
@@ -57,6 +67,62 @@
         return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
     }
 
+    @RequestMapping(value = "/orderDetl/pakout/list/authV2")
+    @ManagerAuth
+    public R pakoutList2(@RequestParam(defaultValue = "1")Integer curr,
+                        @RequestParam(defaultValue = "10")Integer limit,
+                         @RequestParam(required = false)String orderByField,
+                         @RequestParam(required = false)String orderByType,
+                        @RequestParam Map<String, Object> param){
+        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+            wrapper.orderBy("create_time", false);
+        }
+        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+        List<Long> docIds = new ArrayList<>();
+        for (DocType pakin : pakins) {
+            docIds.add(pakin.getDocId());
+        }
+        EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
+        List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
+        List<String> orderNos = new ArrayList<>();
+        for (Order order : orders) {
+            orderNos.add(order.getOrderNo());
+        }
+        wrapper.in("order_no",orderNos);
+        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+    @RequestMapping(value = "/orderDetl/pakout/list/authV3")
+    @ManagerAuth
+    public R pakoutList3(@RequestParam(defaultValue = "1")Integer curr,
+                         @RequestParam(defaultValue = "10")Integer limit,
+                         @RequestParam(required = false)String orderByField,
+                         @RequestParam(required = false)String orderByType,
+                         @RequestParam Map<String, Object> param){
+        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convertLike(param, wrapper);
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+            wrapper.orderBy("create_time", false);
+        }
+        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+        List<Long> docIds = new ArrayList<>();
+        for (DocType pakin : pakins) {
+            docIds.add(pakin.getDocId());
+        }
+        EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
+        List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
+        List<String> orderNos = new ArrayList<>();
+        for (Order order : orders) {
+            orderNos.add(order.getOrderNo());
+        }
+        wrapper.in("order_no",orderNos);
+        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
             String val = String.valueOf(entry.getValue());
@@ -70,6 +136,19 @@
         }
     }
 
+    private <T> void convertLike(Map<String, Object> map, EntityWrapper<T> wrapper){
+        for (Map.Entry<String, Object> entry : map.entrySet()){
+            String val = String.valueOf(entry.getValue());
+            if (val.contains(RANGE_TIME_LINK)){
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+            } else {
+                wrapper.like(entry.getKey(), val);
+            }
+        }
+    }
+
     @RequestMapping(value = "/orderDetl/add/auth")
     @ManagerAuth
     public R add(OrderDetl orderDetl) {

--
Gitblit v1.9.1