From f0a7fa09eeef7fd9dc97173b5ef8e319d17c7f28 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 17:44:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
index c2abaff..bf16cbb 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
@@ -10,15 +10,14 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.service.OrderDetlPakoutService;
+import com.zy.asrs.service.impl.OrderDetlPakoutServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("order/pakout")
@@ -26,6 +25,8 @@
@Autowired
private OrderDetlPakoutService orderDetlService;
+ @Autowired
+ private OrderDetlPakoutServiceImpl orderDetlPakoutService;
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -142,15 +143,30 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
- EntityWrapper<OrderDetlPakout> 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);
+ try{
+ String itemName = null;
+ Date modiTimeStart = null, modiTimeEnd = null;
+ for (Map.Entry<String, Object> entry : param.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (Cools.isEmpty(val)) {
+ continue;
+ }
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ modiTimeStart = DateUtils.convert(dates[0]);
+ modiTimeEnd = DateUtils.convert(dates[1]);
+ } else if (entry.getKey().equals("item_name")) {
+ itemName = val;
+ }
+ }
+ List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlPakoutService.selectOrderPakoutDetailVoList(itemName,modiTimeStart,modiTimeEnd, curr, limit);
+ Page<OrderPakoutDetailVo> page = new Page<OrderPakoutDetailVo>(curr, limit).setRecords(OrderPakoutDetailVoList);
+ page.setTotal(orderDetlPakoutService.selectOrderPakoutDetailVoListTotal(itemName,modiTimeStart,modiTimeEnd));
+ return R.ok(page);
+
+ } catch (Exception e) {
+ return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage());
}
-// wrapper.eq("status", 1);
- Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
- return R.ok(orderDetlPage);
}
--
Gitblit v1.9.1