From 9f1fb1553dc37fbd6a788c6f9654266563d0300c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 29 Dec 2022 14:35:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=97=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvWarehouseController.java | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java index fc7e8d5e..4cd90183 100644 --- a/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/inventory/InvWarehouseController.java @@ -76,10 +76,12 @@ public class InvWarehouseController { @GetMapping("spms/inv/warehouse/filter") public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); - List merge = merge(invWarehouseEntities, 0); - Map restMap = new HashMap<>(); - restMap.put("list", merge); - return ResultVOUtils.success(restMap); + PageInfo pageInfo = new PageInfo<>(invWarehouseEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(invWarehouseEntities); + return ResultVOUtils.success(pageSimpleResponse); + } @AuthRuleAnnotation("") @@ -185,19 +187,19 @@ public class InvWarehouseController { } - public List merge(List invWarehouseEntities, - Integer pid) { - List invWarehouseResponses = new ArrayList<>(); - for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { - InvWarehouseResponse invWarehouseResponse = new InvWarehouseResponse(); - BeanUtils.copyProperties(invWarehouseEntity, invWarehouseResponse); - if (pid.equals(invWarehouseEntity.getPid())) { - invWarehouseResponse.setChildren(merge(invWarehouseEntities, invWarehouseEntity.getId())); - invWarehouseResponses.add(invWarehouseResponse); - } - } - return invWarehouseResponses; - } +// public List merge(List invWarehouseEntities, +// Integer pid) { +// List invWarehouseResponses = new ArrayList<>(); +// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { +// InvWarehouseResponse invWarehouseResponse = new InvWarehouseResponse(); +// BeanUtils.copyProperties(invWarehouseEntity, invWarehouseResponse); +// if (pid.equals(invWarehouseEntity.getPid())) { +// invWarehouseResponse.setChildren(merge(invWarehouseEntities, invWarehouseEntity.getId())); +// invWarehouseResponses.add(invWarehouseResponse); +// } +// } +// return invWarehouseResponses; +// } @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/save1")