From 7972683f56368cd8ce7ef8bb7f1d087416f4a3e7 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 13:23:35 +0800
Subject: [PATCH] 容器管理-编辑可入库区 选中数据排序 选择文字排序 兼容修改后的其他调用方法
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
index e352697..1ba4d16 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
@@ -32,18 +32,6 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<BasContainer, BaseParam> pageParam = new PageParam<>(baseParam, BasContainer.class);
PageParam<BasContainer, BaseParam> page = basContainerService.page(pageParam, pageParam.buildWrapper(true));
- for (BasContainer container : page.getRecords()) {
- if (!Cools.isEmpty(container.getAreas())) {
- String content = container.getAreas().substring(1, container.getAreas().length() - 1);
- String[] parts = content.split(",");
- Long[] longArray = new Long[parts.length];
- for (int i = 0; i < parts.length; i++) {
- longArray[i] = Long.parseLong(parts[i].trim());
- }
- container.setAreaIds(longArray);
- }
-
- }
return R.ok().add(page);
}
@@ -63,13 +51,10 @@
@GetMapping("/basContainer/{id}")
public R get(@PathVariable("id") Long id) {
BasContainer basContainer = basContainerService.getById(id);
- String content = basContainer.getAreas().substring(1, basContainer.getAreas().length() - 1);
- String[] parts = content.split(",");
- Long[] longArray = new Long[parts.length];
- for (int i = 0; i < parts.length; i++) {
- longArray[i] = Long.parseLong(parts[i].trim());
+ // 纭繚杩斿洖鐨刟reas鎸塻ort瀛楁鎺掑簭
+ if (basContainer != null) {
+ basContainer.sortAreas();
}
- basContainer.setAreaIds(longArray);
return R.ok().add(basContainer);
}
@@ -81,12 +66,13 @@
basContainer.setCreateTime(new Date());
basContainer.setUpdateBy(getLoginUserId());
basContainer.setUpdateTime(new Date());
+
+ // 纭繚areas鎸塻ort瀛楁鎺掑簭
+ basContainer.sortAreas();
+
BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getContainerType, basContainer.getContainerType()));
if (null != container) {
return R.error("璇ョ被鍨嬪凡琚垵濮嬪寲");
- }
- if (null !=basContainer.getAreaIds()){
- basContainer.setAreas(Arrays.toString(basContainer.getAreaIds()));
}
if (!basContainerService.save(basContainer)) {
return R.error("Save Fail");
@@ -100,9 +86,10 @@
public R update(@RequestBody BasContainer basContainer) {
basContainer.setUpdateBy(getLoginUserId());
basContainer.setUpdateTime(new Date());
- if (null !=basContainer.getAreaIds()){
- basContainer.setAreas(Arrays.toString(basContainer.getAreaIds()));
- }
+
+ // 纭繚areas鎸塻ort瀛楁鎺掑簭
+ basContainer.sortAreas();
+
if (!basContainerService.updateById(basContainer)) {
return R.error("Update Fail");
}
--
Gitblit v1.9.1