diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index 63310625..7e7991c6 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -553,16 +553,13 @@ public class DepotItemController { * @return */ @GetMapping(value = "/exportExcel") - public BaseResponseInfo exportExcel(@RequestParam("currentPage") Integer currentPage, + public void exportExcel(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize, @RequestParam("projectId") Integer projectId, @RequestParam("monthTime") String monthTime, @RequestParam("headIds") String headIds, @RequestParam("materialIds") String materialIds, - HttpServletRequest request, HttpServletResponse response)throws Exception { - BaseResponseInfo res = new BaseResponseInfo(); - Map map = new HashMap(); - String message = "成功"; + HttpServletRequest request, HttpServletResponse response) { try { List dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize); //存放数据json数组 @@ -604,16 +601,9 @@ public class DepotItemController { } File file = ExcelUtils.exportObjectsWithoutTitle(title, names, title, objects); ExportExecUtil.showExec(file, file.getName() + "-" + monthTime, response); - res.code = 200; } catch (Exception e) { e.printStackTrace(); - message = "导出失败"; - res.code = 500; } - /** - * 2019-01-15response已经返回,finally部分完全没必要 - * */ - return res; } /** diff --git a/src/main/java/com/jsh/erp/controller/SupplierController.java b/src/main/java/com/jsh/erp/controller/SupplierController.java index 91e01629..2b2ad3d4 100644 --- a/src/main/java/com/jsh/erp/controller/SupplierController.java +++ b/src/main/java/com/jsh/erp/controller/SupplierController.java @@ -292,15 +292,12 @@ public class SupplierController { * @return */ @GetMapping(value = "/exportExcel") - public BaseResponseInfo exportExcel(@RequestParam("supplier") String supplier, + public void exportExcel(@RequestParam("supplier") String supplier, @RequestParam("type") String type, @RequestParam("phonenum") String phonenum, @RequestParam("telephone") String telephone, @RequestParam("description") String description, - HttpServletRequest request, HttpServletResponse response)throws Exception { - BaseResponseInfo res = new BaseResponseInfo(); - Map map = new HashMap(); - String message = "成功"; + HttpServletRequest request, HttpServletResponse response) { try { List dataList = supplierService.findByAll(supplier, type, phonenum, telephone, description); String[] names = {"名称", "类型", "联系人", "电话", "电子邮箱", "预收款", "期初应收", "期初应付", "备注", "传真", "手机", "地址", "纳税人识别号", "开户行", "账号", "税率", "状态"}; @@ -331,16 +328,9 @@ public class SupplierController { } File file = ExcelUtils.exportObjectsWithoutTitle(title, names, title, objects); ExportExecUtil.showExec(file, file.getName(), response); - res.code = 200; } catch (Exception e) { e.printStackTrace(); - message = "导出失败"; - res.code = 500; - } finally { - map.put("message", message); - res.data = map; } - return res; } /**