diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index 849a027c8..09827f18a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -1030,8 +1030,7 @@ public class TempController extends BaseController { */ @PostMapping("/exportFinanceCenter") public void exportFinanceCenter(HttpServletResponse response, @RequestBody MerchantOrderReportDTO dto) throws IOException { - MerchantOrderReportExportVO vo = tempService.exportFinanceCenter(dto); - List list = Collections.singletonList(vo); + List list = tempService.exportFinanceCenter(dto); ExcelUtil util = new ExcelUtil<>(MerchantOrderReportExportVO.class); util.exportExcel(response, list, "某运营商财务报表"); } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 0ca2b0f4d..82f250e6c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -1437,18 +1437,36 @@ public class TempService { * @param dto * @return */ - public MerchantOrderReportExportVO exportFinanceCenter(MerchantOrderReportDTO dto) { - MerchantOrderReportVO reportVO = settleOrderReportService.getMerchantOrderReportV2(dto); - MerchantOrderReportExportVO exportVO = new MerchantOrderReportExportVO(); + public List exportFinanceCenter(MerchantOrderReportDTO dto) { - if (reportVO != null) { - OrderReportDetail detail = reportVO.getMerchantOrderReport(); - if (detail != null) { - BeanUtils.copyProperties(detail, exportVO); + List list = new ArrayList<>(); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDate start = LocalDate.parse(dto.getStartTime(), formatter); + LocalDate end = LocalDate.parse(dto.getEndTime(), formatter); + + // 循环每一天 + for (LocalDate date = start; !date.isAfter(end); date = date.plusDays(1)) { + // 临时 DTO(复制原参数,但限定当天) + MerchantOrderReportDTO dayDto = new MerchantOrderReportDTO(); + dayDto.setMerchantId(dto.getMerchantId()); + dayDto.setPageNum(1); + dayDto.setPageSize(dto.getPageSize()); + dayDto.setStartTime(date.format(formatter)); + dayDto.setEndTime(date.format(formatter)); + + // 调用原服务方法 + MerchantOrderReportVO reportVO = settleOrderReportService.getMerchantOrderReportV2(dayDto); + + if (reportVO != null && reportVO.getMerchantOrderReport() != null) { + MerchantOrderReportExportVO exportVO = new MerchantOrderReportExportVO(); + BeanUtils.copyProperties(reportVO.getMerchantOrderReport(), exportVO); + exportVO.setTradeTime(date.format(formatter)); // 👈 可选:加一个日期字段方便看是哪天的数据 + list.add(exportVO); } } - return exportVO; + return list; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportExportVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportExportVO.java index 45a3723b8..f7fe749eb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportExportVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantOrderReportExportVO.java @@ -16,7 +16,7 @@ import java.util.Date; public class MerchantOrderReportExportVO { @Excel(name = "日期") - private Date tradeTime; + private String tradeTime; // 用电度数 @Excel(name = "用电度数")