From 58a518f8bc23ed382f4da2a86b09024b063a620c Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 13 五月 2024 15:40:47 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
index d9c8074..fbb78f4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/DepFormScrappedController.java
@@ -146,7 +146,7 @@
@ApiOperation(value = "瀵煎嚭鎶ュ簾鍗�", notes = "瀵煎嚭鎶ュ簾鍗�")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "鎶ュ簾鍗昳d", dataType = "Long", paramType = "query")})
@GetMapping("/deptList/export")
- public void export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
if (id == null) {
throw new RuntimeException("鎶ュ簾鍗昳d涓虹┖");
}
@@ -174,12 +174,15 @@
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, map);
// 璁剧疆鍝嶅簲澶�
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("閮ㄩ棬鎶ュ簾鍗�.xlsx", "utf-8"));
- try (OutputStream outputStream = response.getOutputStream()) {
- workbook.write(outputStream);
- workbook.close();
- }
+// response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+// response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("閮ㄩ棬鎶ュ簾鍗�.xlsx", "utf-8"));
+// try (OutputStream outputStream = response.getOutputStream()) {
+// workbook.write(outputStream);
+// workbook.close();
+// }
+ String filePath = downLoadExcel("閲囪喘鍏ュ簱鍗�", workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
+
}
@GetMapping("/deptListByModel")
--
Gitblit v1.9.1