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/MatPreparationController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
index a9f161f..12339da 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
@@ -29,6 +29,7 @@
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.manager.service.TaskService;
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 io.swagger.annotations.Api;
@@ -62,7 +63,8 @@
List<String> list = Arrays.asList(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type, OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type, OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type);
queryWrapper.eq("type", OrderType.ORDER_PRE.type);
queryWrapper.in("wk_type",list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -73,26 +75,27 @@
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
queryWrapper.in("type", list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@PostMapping("/preparation/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(outStockService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getType, OrderType.ORDER_OUT.type)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(outStockService.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getType, OrderType.ORDER_OUT.type))));
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@PostMapping({"/preparation/many/{ids}", "/asnOrders/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(outStockService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(outStockService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/preparation/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(outStockService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(outStockService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:outStock:save')")
@@ -113,7 +116,7 @@
if (!outStockService.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:outStock:update')")
@@ -132,7 +135,7 @@
if (!outStockService.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:outStock:remove')")
@@ -142,7 +145,7 @@
if (!outStockService.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:outStock:list')")
@@ -157,7 +160,7 @@
outStockService.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:outStock:update')")
@@ -224,7 +227,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