From 6e5ff559023efd2d24fdca2adcb7268d06420e46 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 24 三月 2026 15:38:34 +0800
Subject: [PATCH] #打印+导出
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 15 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 2635d05..94d2207 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -10,8 +11,10 @@
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.domain.report.ReportQueryRequest;
+import com.vincent.rsf.server.common.domain.report.ReportQueryResponse;
+import com.vincent.rsf.server.common.support.report.ListReportSupport;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.system.controller.BaseController;
@@ -20,7 +23,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api(tags = "搴撳尯搴撳瓨鏄庣粏")
@@ -33,19 +36,21 @@
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@PostMapping("/warehouseAreasItem/page")
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<WarehouseAreasItem, BaseParam> pageParam = new PageParam<>(baseParam, WarehouseAreasItem.class);
- QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
- /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<WarehouseAreasItem, BaseParam> pageParam = buildPageParam(map, true);
+ QueryWrapper<WarehouseAreasItem> queryWrapper = buildFilterQueryWrapper(pageParam);
PageParam<WarehouseAreasItem, BaseParam> page = warehouseAreasItemService.page(pageParam, queryWrapper);
- List<WarehouseAreasItem> records = page.getRecords();
- for (WarehouseAreasItem record : records) {
- if (!Objects.isNull(record.getFieldsIndex())) {
- Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
- record.setExtendFields(fields);
- }
- }
- page.setRecords(records);
+ warehouseAreasItemService.fillExtendFields(page.getRecords());
+ return R.ok().add(page);
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
+ @PostMapping("/warehouseAreasItem/ispts/page")
+ public R getIsptPage(@RequestBody Map<String, Object> map) {
+ PageParam<WarehouseAreasItem, BaseParam> pageParam = buildPageParam(map, true);
+ QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
+ IPage<WarehouseAreasItem> page = warehouseAreasItemService.pageByItemId(pageParam, queryWrapper);
+ warehouseAreasItemService.fillExtendFields(page.getRecords());
return R.ok().add(page);
}
@@ -119,7 +124,69 @@
@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);
+ ReportQueryRequest request = ReportQueryRequest.fromMap(map);
+ List<WarehouseAreasItem> records = createListReportSupport().queryRecords(request);
+ List<ExcelUtil.ColumnMeta> columns = ListReportSupport.toExcelColumns(request.getColumns());
+ ExcelUtil.ReportMeta reportMeta = ListReportSupport.toExcelReportMeta(request.getReportMeta());
+ if (columns.isEmpty()) {
+ ExcelUtil.build(ExcelUtil.create(records, WarehouseAreasItem.class), response);
+ return;
+ }
+ ExcelUtil.build(ExcelUtil.create(records, columns, reportMeta), response);
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
+ @PostMapping("/warehouseAreasItem/print/query")
+ public R printQuery(@RequestBody Map<String, Object> map) {
+ ReportQueryResponse<WarehouseAreasItem> result = createListReportSupport()
+ .queryPage(ReportQueryRequest.fromMap(map));
+ return R.ok().add(result);
+ }
+
+ private PageParam<WarehouseAreasItem, BaseParam> buildPageParam(Map<String, Object> map, boolean includeFilters) {
+ return buildPageParam(ReportQueryRequest.fromMap(map), includeFilters);
+ }
+
+ private PageParam<WarehouseAreasItem, BaseParam> buildPageParam(ReportQueryRequest request, boolean includeFilters) {
+ BaseParam baseParam = buildParam(request.toPageParamMap(includeFilters), BaseParam.class);
+ return new PageParam<>(baseParam, WarehouseAreasItem.class);
+ }
+
+ private QueryWrapper<WarehouseAreasItem> buildFilterQueryWrapper(PageParam<WarehouseAreasItem, BaseParam> pageParam) {
+ QueryWrapper<WarehouseAreasItem> queryWrapper = pageParam.buildWrapper(true);
+ FieldsUtils.setFieldsFilters(queryWrapper, pageParam, WarehouseAreasItem.class);
+ return queryWrapper;
+ }
+
+ private QueryWrapper<WarehouseAreasItem> buildOutputQueryWrapper(ReportQueryRequest request) {
+ List<Long> ids = request.getIds();
+ PageParam<WarehouseAreasItem, BaseParam> pageParam = buildPageParam(request, ids.isEmpty());
+ QueryWrapper<WarehouseAreasItem> queryWrapper = ids.isEmpty()
+ ? buildFilterQueryWrapper(pageParam)
+ : new QueryWrapper<>();
+
+ if (!ids.isEmpty()) {
+ queryWrapper.in("id", ids);
+ }
+ ListReportSupport.applyOrderBy(queryWrapper, pageParam.getWhere().getOrderBy());
+ return queryWrapper;
+ }
+
+ private ListReportSupport<WarehouseAreasItem> createListReportSupport() {
+ return new ListReportSupport<>(
+ this::buildOutputQueryWrapper,
+ new ListReportSupport.RecordLoader<>() {
+ @Override
+ public List<WarehouseAreasItem> list(QueryWrapper<WarehouseAreasItem> queryWrapper) {
+ return warehouseAreasItemService.listForOutput(queryWrapper);
+ }
+
+ @Override
+ public IPage<WarehouseAreasItem> page(Page<WarehouseAreasItem> page, QueryWrapper<WarehouseAreasItem> queryWrapper) {
+ return warehouseAreasItemService.pageForOutput(page, queryWrapper);
+ }
+ }
+ );
}
}
--
Gitblit v1.9.1