lyhzzz 1 年之前
父节点
当前提交
0430d71a26

+ 1 - 2
src/main/java/com/cdf/controller/back/ExcelController.java

@@ -30,11 +30,10 @@ public class ExcelController extends BaseLogController{
      * type  0 外框设置 ,1 瀑布流, 2,精选推荐设置 ,3 品牌推荐设置
      * type  0 外框设置 ,1 瀑布流, 2,精选推荐设置 ,3 品牌推荐设置
      */
      */
     @GetMapping("/downTemplate")
     @GetMapping("/downTemplate")
-    public ResultData downInTemplate(@RequestParam(required = false,defaultValue = "0") Integer type,
+    public void downInTemplate(@RequestParam(required = false,defaultValue = "0") Integer type,
                                      @RequestParam(required = false) String sceneNum,
                                      @RequestParam(required = false) String sceneNum,
                                      HttpServletRequest req,HttpServletResponse resp)  {
                                      HttpServletRequest req,HttpServletResponse resp)  {
         hotsService.downTemplate(type,sceneNum,req,resp);
         hotsService.downTemplate(type,sceneNum,req,resp);
-        return ResultData.ok();
     }
     }
 
 
     @PostMapping("/checkFile")
     @PostMapping("/checkFile")

+ 1 - 0
src/main/java/com/cdf/service/impl/ExcelService.java

@@ -127,6 +127,7 @@ public class ExcelService {
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
         response.setHeader("Content-disposition", "attachment;filename=" + fileName);
         WriteSheet writeSheet = EasyExcel.writerSheet(name).build();
         WriteSheet writeSheet = EasyExcel.writerSheet(name).build();
         excelWriter.write(result, writeSheet);
         excelWriter.write(result, writeSheet);
+        excelWriter.finish();
     }
     }
 
 
     public void checkFile(UploadHotsParam param) {
     public void checkFile(UploadHotsParam param) {