From c05d4037b04f5182088fcf07835409a6eda83362 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 14:44:45 +0800
Subject: [PATCH] 下发执行功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..dd11eb1 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;
@@ -39,15 +40,24 @@
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);
+ return R.ok().add(deliveryItemService.page(pageParam, wrapper));
+ }
+
+ @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 ");
+ return R.ok().add(deliveryItemService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
--
Gitblit v1.9.1