大饼慢病

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -169,7 +169,7 @@ public class IcResiUserController {
     }
 
     @RequestMapping(value = "/exportExcel")
-    public void exportExcel(@RequestHeader String customerId, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws IOException {
+    public void exportExcel(@RequestHeader String customerId, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
         pageFormDTO.setCustomerId(customerId);
         pageFormDTO.setPageFlag(false);
         CustomerFormResultDTO resiFormItems = getResiFormItems(pageFormDTO.getCustomerId());
@@ -250,12 +250,7 @@ public class IcResiUserController {
 
         Workbook workbook = ExcelExportUtil.exportExcel(sheetMap, params);
         workbook.setActiveSheet(0);
-
+        workbook.write(getOutputStream("居民基本信息.xlsx",response));
-        String fileName = "居民基本信息.xlsx";
-        response.setHeader("content-Type", "application/vnd.ms-excel");
-        response.setCharacterEncoding("UTF-8");
-        response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8"));
-        workbook.write(response.getOutputStream());
     }
 
     @RequestMapping(value = "/exportExcel2")
@@ -398,7 +393,7 @@ public class IcResiUserController {
         fileName = URLEncoder.encode(fileName, "UTF-8");
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf8");
-        response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xls");
+        response.setHeader("Content-Disposition", "attachment;filename=" +  fileName);
         response.addHeader("Access-Control-Expose-Headers", "Content-disposition");
 
         return response.getOutputStream();