From 44b1fe9c919f833151445a30ba978beb041f8692 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:43:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 4 ++--
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 4 ++--
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 4 ++--
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 4 ++--
consum-base/src/main/java/com/consum/base/BaseController.java | 2 +-
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/BaseController.java b/consum-base/src/main/java/com/consum/base/BaseController.java
index be0d5ba..bdf12d3 100644
--- a/consum-base/src/main/java/com/consum/base/BaseController.java
+++ b/consum-base/src/main/java/com/consum/base/BaseController.java
@@ -63,7 +63,7 @@
byteArrayOutputStream.size(), 0, "-1");
String fileUrl = fileInfo.getUrl();
workbook.close();
- return fileUrl;
+ return "/file/" + fileUrl;
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 59bd8af..7fbe456 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -307,7 +307,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@GetMapping("/list/export")
- public String export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
List<InventoryExcelTemplate> exportList = lWhFormInventoryService.getExportList(id);
if (CollectionUtils.isEmpty(exportList)) {
@@ -329,7 +329,7 @@
map.put("monitorName", monitorName);
map.put("name", operatorName);
Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
- return downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ return ResponseValue.success(downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook));
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index ab16dde..4debc58 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -215,7 +215,7 @@
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
@ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
- public String export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -251,7 +251,7 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- return downLoadExcel("鍑哄簱鍗�", response, workbook);
+ return ResponseValue.success(downLoadExcel("鍑哄簱鍗�", response, workbook));
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index f0cc2f3..ce0020d 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -274,7 +274,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "閲囪喘鍗昳d", required = true, dataType = "Long", paramType = "query")})
@GetMapping("/list/export")
- public String export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
TemplateExportParams params = new TemplateExportParams("import/閲囪喘鍏ュ簱鍗�.xls");
params.setHeadingStartRow(2);
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -305,7 +305,7 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
- return downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ return ResponseValue.success(downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook));
}
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 4bb8dbd..5dd5043 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -155,7 +155,7 @@
@ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")})
@GetMapping("/list/export")
- public String export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
if (id == null) {
throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
}
@@ -186,7 +186,7 @@
map.put("totalAmount", totalAmount);
Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
- return downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets);
+ return ResponseValue.success(downLoadExcel("鎶ュ簾鐧昏鍗�", response, sheets));
}
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 09ebe84..cb9cf66 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -288,7 +288,7 @@
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
@ApiImplicitParam(name = "type", value = "瀵煎嚭绫诲瀷 1 鍏ュ簱 2 鍑哄簱", required = true, dataType = "Integer"),})
@GetMapping("/list/export")
- public String export(Long id, Integer type, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, Integer type, HttpServletResponse response) throws Exception {
TemplateExportParams params;
String fileName;
@@ -322,7 +322,7 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
- return downLoadExcel(fileName, response, workbook);
+ return ResponseValue.success(downLoadExcel(fileName, response, workbook));
}
--
Gitblit v1.9.1