From 051418249e04a6fe50ec91b75cc542daa89a1c07 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 17 Oct 2024 22:55:16 +0800 Subject: [PATCH] fix --- .../iformall/controller/market/WxEnergyController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 174871d4b..7e52eb26f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -487,15 +487,16 @@ public class WxEnergyController extends BaseController { @ApiOperation("科目抄表计算记录导入") @PostMapping(value = "/importFeesShop", consumes = "multipart/*") - public void importFeesShop(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { + public ResultData importFeesShop(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { try { //得到当前用户ID MallUserInfo user = getUser(); //request.getParameter("timeId"); wxEnergyService.importFeesShop(mFile, user, request, response); + return new ResultData(); } catch (Exception e) { logger.error("importFeesShop error.",e); - throw new MallinkException(Result.ERROR,e.getMessage()); + return new ResultData(Result.ERROR,e.getMessage()); } } @@ -718,15 +719,16 @@ public class WxEnergyController extends BaseController { @ApiOperation("科目抄表计算记录导入") @PostMapping(value = "/importReading", consumes = "multipart/*") - public void importReading(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { + public ResultData importReading(@RequestParam("file") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { try { //得到当前用户ID MallUserInfo user = getUser(); //request.getParameter("timeId"); wxEnergyService.importReading(mFile, user, request, response); + return new ResultData(); } catch (Exception e) { logger.error("importReading error.",e); - throw new MallinkException(Result.ERROR,e.getMessage()); + return new ResultData(Result.ERROR,e.getMessage()); } }