From 5dd0071775a7252ed22e4c6bfd1c3ee7daeb012a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 六月 2020 09:36:26 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MatCodeController.java |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index a2c24a4..eb80c17 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -13,14 +13,16 @@
 import com.core.common.R;
 import com.zy.asrs.entity.MatCode;
 import com.zy.asrs.service.MatCodeService;
-import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
 import com.zy.common.utils.excel.matcode.MatCodeExcel;
+import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.*;
 
 @RestController
@@ -100,13 +102,32 @@
     // 瀵煎嚭
     @RequestMapping(value = "/matCode/export/auth")
     @ManagerAuth
-    public R export(@RequestBody JSONObject param){
-        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
-        EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
-        Map<String, Object> map = excludeTrash(param.getJSONObject("matCode"));
-        convert(map, wrapper);
-        List<MatCode> list = matCodeService.selectList(wrapper);
-        return R.ok(exportSupport(list, fields));
+    public void export(@RequestBody JSONObject param, HttpServletResponse response) throws Exception{
+//        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+//        EntityWrapper<MatCode> wrapper = new EntityWrapper<>();
+//        Map<String, Object> map = excludeTrash(param.getJSONObject("matCode"));
+//        convert(map, wrapper);
+//        List<MatCode> list = matCodeService.selectList(wrapper);
+
+
+        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());
+
+
+        List<MatCodeExcel> excels = new ArrayList<>();
+        for (MatCode matCode : list) {
+            MatCodeExcel excel = new MatCodeExcel();
+            excel.setMatNo(matCode.getMatNo());
+            excel.setBarcode(matCode.getBarcode());
+            excel.setMatName(matCode.getMatName());
+            excel.setStr1(matCode.getStr1());
+            excel.setStr2(matCode.getStr2());
+            excels.add(excel);
+        }
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        String fileName = URLEncoder.encode("娴嬭瘯", "UTF-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("妯℃澘").doWrite(excels);
     }
 
     // 瀵煎叆

--
Gitblit v1.9.1