From 51ba2a9f70863036c720156cd8b9e0c2be08139b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 24 三月 2026 18:37:48 +0800
Subject: [PATCH] Revert "#打印+导出"
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseAreasItemServiceImpl.java | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseAreasItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseAreasItemServiceImpl.java
index 7e6c220..3f9a887 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseAreasItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseAreasItemServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
@@ -21,7 +20,12 @@
@Override
public List<WarehouseAreasItem> getList() {
List<WarehouseAreasItem> areasItems = this.list();
- fillExtendFields(areasItems);
+ for (WarehouseAreasItem areasItem : areasItems) {
+ if (Objects.isNull(areasItem.getFieldsIndex())) {
+ continue;
+ }
+ areasItem.setExtendFields(FieldsUtils.getFields(areasItem.getFieldsIndex()));
+ }
return areasItems;
}
@@ -29,32 +33,5 @@
public IPage<WarehouseAreasItem> pageByItemId(PageParam<WarehouseAreasItem, BaseParam> pageParam, QueryWrapper<WarehouseAreasItem> queryWrapper) {
IPage<WarehouseAreasItem> itemIPage = this.baseMapper.pageByItemId(pageParam, queryWrapper);
return itemIPage;
- }
-
- @Override
- public List<WarehouseAreasItem> listForOutput(QueryWrapper<WarehouseAreasItem> queryWrapper) {
- List<WarehouseAreasItem> records = this.list(queryWrapper);
- fillExtendFields(records);
- return records;
- }
-
- @Override
- public IPage<WarehouseAreasItem> pageForOutput(Page<WarehouseAreasItem> page, QueryWrapper<WarehouseAreasItem> queryWrapper) {
- IPage<WarehouseAreasItem> outputPage = this.page(page, queryWrapper);
- fillExtendFields(outputPage.getRecords());
- return outputPage;
- }
-
- @Override
- public void fillExtendFields(List<WarehouseAreasItem> records) {
- if (records == null || records.isEmpty()) {
- return;
- }
- for (WarehouseAreasItem record : records) {
- if (Objects.isNull(record.getFieldsIndex())) {
- continue;
- }
- record.setExtendFields(FieldsUtils.getFields(record.getFieldsIndex()));
- }
}
}
--
Gitblit v1.9.1