From 164454c61e83423b911133e7b8976c5681e353d2 Mon Sep 17 00:00:00 2001 From: chenlong Date: Mon, 11 Mar 2024 17:53:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=BE=85=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StockOutDetailController.java | 13 ++- .../report/mapper/StockOutDetailMapper.java | 5 ++ .../report/mapper/StockOutDetailMapper.xml | 20 +++++ .../report/service/StockOutDetailService.java | 4 +- .../impl/StockOutDetailServiceImp.java | 90 +++++++++++++++++-- 5 files changed, 120 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/StockOutDetailController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/StockOutDetailController.java index cea6f79a1..e4c7c9442 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/StockOutDetailController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/StockOutDetailController.java @@ -29,11 +29,20 @@ public class StockOutDetailController extends BladeController { * @param size 每页数据量 */ @GetMapping("/report") - public R>> report( + public R> report( @RequestParam Map query, @RequestParam Integer current, @RequestParam Integer size){ - List> data = test.report(current, size, query); + Map data = test.report(current, size, query); return data(data); } + + /** + * 报表数据导出 + * @param query 所有请求参数 + */ + @GetMapping("/export") + public void export(@RequestParam Map query) { + test.reportExport(query); + } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.java index b585848a4..ba4849ee5 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.java @@ -1,6 +1,8 @@ package com.logpm.report.mapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.cursor.Cursor; import java.util.List; import java.util.Map; @@ -13,5 +15,8 @@ public interface StockOutDetailMapper { List> getList(Map where); + @Options(fetchSize = Integer.MIN_VALUE) + Cursor> getListCursor(Map where); + Integer getCount(Map where); } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.xml index 0a281a4d2..f1b80a818 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/StockOutDetailMapper.xml @@ -29,6 +29,26 @@ LIMIT #{offset}, #{size} +