From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 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 1297352..ed90faf 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
@@ -21,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;
@@ -47,7 +48,8 @@
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
         QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
-        return R.ok().add(deliveryItemService.page(pageParam, wrapper));
+        PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, wrapper);
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@@ -57,7 +59,8 @@
         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));
+        PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, wrapper);
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
 
@@ -78,7 +81,8 @@
         } else {
             return R.ok();
         }
-        return R.ok().add(deliveryItemService.page(pageParam, queryWrapper));
+        PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, queryWrapper);
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
 
@@ -86,19 +90,19 @@
     @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
     @PostMapping("/deliveryItem/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(deliveryItemService.list());
+        return R.ok().add(buildPageRowsUtils.rowsMap(deliveryItemService.list()));
     }
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
     @PostMapping({"/deliveryItem/many/{ids}", "/deliveryItems/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(deliveryItemService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(deliveryItemService.listByIds(Arrays.asList(ids))));
     }
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
     @GetMapping("/deliveryItem/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(deliveryItemService.getById(id));
+        return R.ok().add(buildPageRowsUtils.rowsMap(deliveryItemService.getById(id)));
     }
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:save')")
@@ -116,7 +120,7 @@
         if (!deliveryItemService.save(deliveryItem)) {
             return R.error("Save Fail");
         }
-        return R.ok("Save Success").add(deliveryItem);
+        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(deliveryItem));
     }
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:update')")
@@ -128,7 +132,7 @@
         if (!deliveryItemService.updateById(deliveryItem)) {
             return R.error("Update Fail");
         }
-        return R.ok("Update Success").add(deliveryItem);
+        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(deliveryItem));
     }
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:remove')")
@@ -138,7 +142,7 @@
         if (!deliveryItemService.removeByIds(Arrays.asList(ids))) {
             return R.error("Delete Fail");
         }
-        return R.ok("Delete Success").add(ids);
+        return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
     }
 
     @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@@ -152,6 +156,6 @@
         deliveryItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                 item -> vos.add(new KeyValVo(item.getId(), item.getId()))
         );
-        return R.ok().add(vos);
+        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
     }
 }

--
Gitblit v1.9.1