From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
index e49c304..722b2a9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/PurchaseController.java
@@ -10,7 +10,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Purchase;
import com.vincent.rsf.server.manager.entity.PurchaseItem;
import com.vincent.rsf.server.manager.enums.POExceStatus;
@@ -18,6 +18,7 @@
import com.vincent.rsf.server.manager.service.PurchaseItemService;
import com.vincent.rsf.server.manager.service.PurchaseService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
@@ -25,7 +26,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -46,7 +47,8 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Purchase, BaseParam> pageParam = new PageParam<>(baseParam, Purchase.class);
- return R.ok().add(purchaseService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Purchase, BaseParam> page = purchaseService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:purchase:list')")
@@ -57,26 +59,27 @@
QueryWrapper<Purchase> wrapper = pageParam.buildWrapper(true);
wrapper.apply("anfme > qty");
wrapper.ne("exce_status", POExceStatus.PO_EXCE_STATUS_ALL_DONE.val);
- return R.ok().add(purchaseService.page(pageParam, wrapper));
+ PageParam<Purchase, BaseParam> page = purchaseService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:purchase:list')")
@PostMapping("/purchase/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(purchaseService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(purchaseService.list()));
}
@PreAuthorize("hasAuthority('manager:purchase:list')")
@PostMapping({"/purchase/many/{ids}", "/purchases/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(purchaseService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(purchaseService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:purchase:list')")
@GetMapping("/purchase/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(purchaseService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(purchaseService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:purchase:save')")
@@ -95,7 +98,7 @@
if (!purchaseService.save(purchase)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(purchase);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(purchase));
}
@PreAuthorize("hasAuthority('manager:purchase:update')")
@@ -107,7 +110,7 @@
if (!purchaseService.updateById(purchase)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(purchase);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(purchase));
}
@PreAuthorize("hasAuthority('manager:purchase:remove')")
@@ -116,7 +119,7 @@
public R remove(@PathVariable Long[] ids) {
List<Purchase> purchases = purchaseService.listByIds(Arrays.asList(ids));
Set<String> stringSet = purchases.stream().map(Purchase::getCode).collect(Collectors.toSet());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoCode, stringSet));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getPoCode, stringSet));
if (!orderItems.isEmpty()) {
return R.error("鍗曟嵁鏈夊凡鐢熸垚鐨勬敹璐у崟鏄庣粏锛屼笉鍙墽琛屽垹闄ゆ搷浣滐紒锛�");
}
@@ -126,7 +129,7 @@
if (!purchaseItemService.remove(new LambdaQueryWrapper<PurchaseItem>().in(PurchaseItem::getPurchaseId, Arrays.asList(ids)))) {
return R.error("鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
- return R.ok("鍒犻櫎鎴愬姛锛侊紒").add(ids);
+ return R.ok("鍒犻櫎鎴愬姛锛侊紒").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:purchase:list')")
@@ -140,13 +143,13 @@
purchaseService.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));
}
@PreAuthorize("hasAuthority('manager:purchase:list')")
@PostMapping("/purchase/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(purchaseService.list(), Purchase.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(purchaseService.list()), Purchase.class), response);
}
}
--
Gitblit v1.9.1