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/WkOrderController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
index d22eb63..5bf0e45 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
@@ -26,6 +26,7 @@
import com.vincent.rsf.server.manager.service.impl.PurchaseServiceImpl;
import com.vincent.rsf.server.system.constant.DictTypeCode;
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.entity.DictData;
import com.vincent.rsf.server.system.service.impl.DictDataServiceImpl;
@@ -63,7 +64,9 @@
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
queryWrapper.in("type", asList);
- return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
+// pageParam.setSearchCount(false);
+ PageParam<WkOrder, BaseParam> page = asnOrderService.page(pageParam, queryWrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@ApiOperation("鑾峰彇棣栭〉琛ㄥご鏁版嵁")
@@ -77,27 +80,27 @@
@PostMapping("/asnOrder/stock/trand")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
public R getStockTrand() {
- return R.ok().add(asnOrderService.getStockTrand());
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.getStockTrand()));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrder/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(asnOrderService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.list()));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping({"/asnOrder/many/{ids}", "/asnOrders/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(asnOrderService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/asnOrder/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(asnOrderService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -106,10 +109,10 @@
public R getWrkType(@PathVariable("id") String value) {
// WkOrder byId = asnOrderService.getById(id);
// if (Cools.isEmpty(byId)) {
-// return R.ok().add(new DictData());
+// return R.ok().add(buildPageRowsUtils.rowsMap(new DictData()));
// }
DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, value));
- return R.ok().add(dictData);
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictData));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -118,10 +121,10 @@
public R getOrderType(@PathVariable("id") String value) {
// WkOrder byId = asnOrderService.getById(id);
// if (Cools.isEmpty(byId)) {
-// return R.ok().add(new DictData());
+// return R.ok().add(buildPageRowsUtils.rowsMap(new DictData()));
// }
DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE).eq(DictData::getValue, value));
- return R.ok().add(dictData);
+ return R.ok().add(buildPageRowsUtils.rowsMap(dictData));
}
@@ -139,7 +142,7 @@
if (!asnOrderService.save(wkOrder)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(wkOrder);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(wkOrder));
}
@PreAuthorize("hasAuthority('manager:asnOrder:update')")
@@ -153,7 +156,7 @@
if (!asnOrderService.updateById(wkOrder)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(wkOrder);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(wkOrder));
}
@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@@ -179,7 +182,7 @@
asnOrderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@@ -220,7 +223,7 @@
orderTemplates.add(template);
}
}
- ExcelUtil.build(ExcelUtil.create(orderTemplates, AsnOrderTemplate.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(orderTemplates), AsnOrderTemplate.class), response);
}
/**
--
Gitblit v1.9.1