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/WkOrderItemController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index 00ab9b3..690725e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -5,6 +5,7 @@
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.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -15,10 +16,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.InOrderAndItem;
-import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.WkOrderItem;
-import com.vincent.rsf.server.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -26,6 +24,7 @@
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,8 +34,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -72,6 +71,7 @@
}
}
page.setRecords(records);
+ buildPageRowsUtils.userNameMap(page.getRecords());
return R.ok(page);
}
@@ -106,6 +106,7 @@
}
}
page.setRecords(records);
+ buildPageRowsUtils.userNameMap(page.getRecords());
return R.ok(page);
}
@@ -115,8 +116,7 @@
public R pageInFull(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
- QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
- // 娣诲姞type涓�'in'鐨勬潯浠讹紝娉ㄦ剰杩欓噷搴旇鎸囧畾琛ㄥ埆鍚�
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
wrapper.eq("mo.type", OrderType.ORDER_IN.type);
IPage<InOrderAndItem> page = asnOrderItemMapper.queryFullOrderWithPaging(pageParam, wrapper);
@@ -154,6 +154,20 @@
}
}
page.setRecords(records);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍑哄簱鍒楄〃")
+ @PostMapping("/asnOrderItemFull/out/page")
+ public R pageOutFull(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
+ wrapper.eq("mo.type", OrderType.ORDER_OUT.type);
+
+ IPage<OutOrderAndItem> page = asnOrderItemMapper.queryFullOutOrderWithPaging(pageParam, wrapper);
return R.ok(page);
}
--
Gitblit v1.9.1