From f27309d45c7ef46b0aea98107b67d0c5b46d4217 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 10:00:26 +0800
Subject: [PATCH] fix: remove broken duplicate page return
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
index eb7d9a1..1db8047 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
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.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -20,6 +21,7 @@
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.DeliveryItemService;
import com.vincent.rsf.server.manager.service.impl.DeliveryServiceImpl;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@@ -29,7 +31,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -39,18 +41,56 @@
private DeliveryItemService deliveryItemService;
@Autowired
private CompanysService companysService;
- @Autowired
- private DeliveryServiceImpl deliveryService;
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@PostMapping("/deliveryItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
- return R.ok().add(deliveryItemService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
+ PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
+ @PostMapping("/deliveryItem/filters/page")
+ public R filter(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
+ QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
+ wrapper.apply("anfme > work_qty + qty ");
+ PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, wrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+ @PostMapping("/deliveryItem/edit/page")
+ public R byPoIdspage(@RequestBody Map<String, Object> map) {
+ List<Long> poDetlIds = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("ids")), Long.class);
+ map.remove("ids");
+ }
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
+ QueryWrapper<DeliveryItem> queryWrapper = pageParam.buildWrapper(true);
+ if (!poDetlIds.isEmpty()) {
+ queryWrapper.in("id", poDetlIds);
+ } else {
+ return R.ok();
+ }
+ PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, queryWrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
+ }
+
+
+
+ @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@PostMapping("/deliveryItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(deliveryItemService.list());
--
Gitblit v1.9.1