From 44ac1c9a2a6ee6ac9f618f4a63510f8f94d1b1a9 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 25 三月 2026 15:43:51 +0800
Subject: [PATCH] #打印+导出

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java |   72 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index f468a2d..b022be8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -6,16 +6,20 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
-import com.vincent.rsf.server.common.utils.ExcelUtil;
 import com.vincent.rsf.server.common.annotation.OperationLog;
 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.common.service.ListExportHandler;
+import com.vincent.rsf.server.common.service.ListExportService;
+import com.vincent.rsf.server.common.utils.ExcelUtil;
 import com.vincent.rsf.server.common.utils.FieldsUtils;
 import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
 import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
 import com.vincent.rsf.server.system.controller.BaseController;
 import io.swagger.annotations.Api;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -26,9 +30,41 @@
 @Api(tags = "搴撳尯搴撳瓨鏄庣粏")
 @RestController
 public class WarehouseAreasItemController extends BaseController {
-
     @Autowired
     private WarehouseAreasItemService warehouseAreasItemService;
+
+    @Autowired
+    private ListExportService listExportService;
+
+    private final ListExportHandler<WarehouseAreasItem, BaseParam> warehouseAreasItemExportHandler = new ListExportHandler<>() {
+        @Override
+        public List<WarehouseAreasItem> listByIds(List<Long> ids) {
+            return warehouseAreasItemService.listByIds(ids);
+        }
+
+        @Override
+        public List<WarehouseAreasItem> listByFilter(Map<String, Object> sanitizedMap, BaseParam baseParam) {
+            PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
+            QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
+            FieldsUtils.setFieldsFilters(queryWrapper, pageParam, WarehouseAreasItem.class);
+            return warehouseAreasItemService.list(queryWrapper);
+        }
+
+        @Override
+        public void fillExportFields(List<WarehouseAreasItem> records) {
+            fillExtendFields(records);
+        }
+
+        @Override
+        public Map<String, Object> toExportRow(WarehouseAreasItem record, List<ExcelUtil.ExportColumn> columns) {
+            return buildExportRow(record, columns);
+        }
+
+        @Override
+        public String defaultReportTitle() {
+            return "鏀惰揣搴撳瓨鎶ヨ〃";
+        }
+    };
 
     @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
     @PostMapping("/warehouseAreasItem/page")
@@ -141,7 +177,37 @@
     @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
     @PostMapping("/warehouseAreasItem/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(warehouseAreasItemService.list(), WarehouseAreasItem.class), response);
+        listExportService.export(
+                map,
+                exportMap -> buildParam(exportMap, BaseParam.class),
+                warehouseAreasItemExportHandler,
+                response
+        );
+    }
+
+    private void fillExtendFields(List<WarehouseAreasItem> records) {
+        for (WarehouseAreasItem record : records) {
+            if (!Objects.isNull(record.getFieldsIndex())) {
+                Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+                record.setExtendFields(fields);
+            }
+        }
+    }
+    private Map<String, Object> buildExportRow(WarehouseAreasItem record, List<ExcelUtil.ExportColumn> columns) {
+        BeanWrapper beanWrapper = new BeanWrapperImpl(record);
+        Map<String, Object> row = new LinkedHashMap<>();
+        row.put("extendFields", record.getExtendFields());
+
+        for (ExcelUtil.ExportColumn column : columns) {
+            if (column.getSource().startsWith("extendFields.[")) {
+                continue;
+            }
+            if (beanWrapper.isReadableProperty(column.getSource())) {
+                row.put(column.getSource(), beanWrapper.getPropertyValue(column.getSource()));
+            }
+        }
+
+        return row;
     }
 
 }

--
Gitblit v1.9.1