From f2cbb7dbd70cac6f07f24d600f3021f1d074274a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Jul 2024 15:14:03 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/market/WxEnergyController.java | 3 +++ .../java/com/iformall/service/impl/WxEnergyServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 ce2fe6793..e5ccadf0e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -279,6 +279,9 @@ public class WxEnergyController extends BaseController { if (null == wrc) { return new ResultData(Result.ERROR,"id错误"); } + if (null == wrc.getImportSuccess() || wrc.getImportSuccess().intValue() != EnumYesOrNo.YES.getCode().intValue()) { + return new ResultData(Result.ERROR,"导入未完全成功,不能计算!"); + } Integer number = wxEnergyService.calcuteReading(wrc, getUser()); return new ResultData(number); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 4ee6710f3..f04b0007d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -545,7 +545,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { execlList.add(r.generateExcelData(buildingMap, floorMap, time, fees, record)); } } - excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "科目抄表.xlsx","sheet1", response); + excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "科目抄表_"+time.getName()+"_"+fees.getName()+".xlsx","sheet1", response); } private File handlerImportFile(MultipartFile mFile,String fileNamePre) {