From 06c4e59fa35c1b9e74da9cf3d081e78c13d17e20 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期一, 14 七月 2025 06:36:36 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
index 6b8f66c..a341b8b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
@@ -1,9 +1,12 @@
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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
import com.zy.asrs.wms.common.annotation.CacheData;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -18,10 +21,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -34,9 +34,17 @@
@PostMapping("/orderDetlLog/page")
@CacheData(tableName = {"man_order_detl_log"})
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
- return R.ok().add(orderDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
+ if (!Objects.isNull(map.get("orderType"))) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetl, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetl.class);
+ QueryWrapper<OrderDetl> queryWrapper = pageParam.buildWrapper(true);
+ IPage<OrderDetl> detls = orderDetlLogService.pageByType(pageParam, queryWrapper);
+ return R.ok().add(detls);
+ } else {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
+ return R.ok().add(orderDetlLogService.page(pageParam, pageParam.buildWrapper(true)));
+ }
}
@PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
@@ -49,7 +57,7 @@
@PreAuthorize("hasAuthority('asrs:orderDetl:list')")
@GetMapping("/orderDetlLog/orderId/{orderId}")
@CacheData(tableName = {"man_order_detl_log"})
- public R list(@PathVariable("orderId") Long orderId) {
+ public R list(@PathVariable("orderId") String orderId) {
return R.ok().add(orderDetlLogService.getOrderDetlByOrderId(orderId));
}
--
Gitblit v1.9.1