From 75b2904fbaf4fab6a9fb3baf065d2c927cc7a7a2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 九月 2023 18:16:34 +0800
Subject: [PATCH] 基础数据-物料清单维护-导出

---
 inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index 516d62d..4f61f64 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -7,21 +7,20 @@
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.Task.SyncOrder;
+import com.yuanchu.mom.mapper.SaleMapper;
 import com.yuanchu.mom.mapper.SaleMaterialMapper;
 import com.yuanchu.mom.pojo.Sale;
-import com.yuanchu.mom.mapper.SaleMapper;
 import com.yuanchu.mom.pojo.SaleMaterial;
 import com.yuanchu.mom.pojo.dto.*;
 import com.yuanchu.mom.pojo.vo.SaleVo;
 import com.yuanchu.mom.service.SaleMaterialService;
 import com.yuanchu.mom.service.SaleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.utils.easyexcel.CustemHandler;
 import com.yuanchu.mom.utils.easyexcel.EasyExcelUtils;
-import com.yuanchu.mom.utils.easyexcel.LocalDateConverter;
+import com.yuanchu.mom.utils.easyexcel.converter.LocalDateConverter;
 import com.yuanchu.mom.utils.easyexcel.template.ExportSaleTemplate;
-import com.yuanchu.mom.vo.Result;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -272,16 +271,7 @@
             for (int i = 0; i < exportSaleTemplates.size(); i++) {
                 exportSaleTemplates.get(i).setId(i+1);
             }
-            String fileName = String.valueOf(new StringBuilder()
-                    .append("閿�鍞鍗昣")
-                    .append(DateUtil.today())
-                    .append(ExcelTypeEnum.XLS.getValue()));
-            fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
-            response.setContentType("application/octet-stream");
-            response.setHeader("Cache-Control", "no-cache");
-            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
-            EasyExcel.write(response.getOutputStream())
+            EasyExcel.write(EasyExcelUtils.getResponse(response,"閿�鍞鍗�").getOutputStream())
                     .head(ExportSaleTemplate.class)
                     .registerConverter(new LocalDateConverter())
                     .autoCloseStream(true)

--
Gitblit v1.9.3