From 453e3471e94b91169beec1e258a06a132d927011 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 02 十二月 2024 15:01:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/controller/XlsReportController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/yssh/controller/XlsReportController.java b/src/main/java/com/yssh/controller/XlsReportController.java
index 538e150..bcef9f4 100644
--- a/src/main/java/com/yssh/controller/XlsReportController.java
+++ b/src/main/java/com/yssh/controller/XlsReportController.java
@@ -29,7 +29,7 @@
@Resource
XlsReportService xlsReportService;
- private static List<String> TYPES = new ArrayList<>(Arrays.asList("day", "week", "month"));
+ private static final List<String> TYPES = new ArrayList<>(Arrays.asList("day", "week", "month"));
@ApiOperationSupport(order = 1)
@GetMapping("/selectByPage")
@@ -53,9 +53,10 @@
pageIndex = null == pageIndex || pageIndex < 1 ? 1 : pageIndex;
Integer offset = pageSize * (pageIndex - 1);
- List<XlsReport> list = xlsReportMapper.selectReportByPage(type, strStart, strEnd, pageSize, offset);
+ Integer count = xlsReportMapper.selectReportCount(type, strStart, strEnd, pageSize, offset);
+ List<XlsReport> list = 0 == count ? null : xlsReportMapper.selectReportByPage(type, strStart, strEnd, pageSize, offset);
- return Result.OK(list);
+ return Result.OK(count, list);
}
@ApiOperationSupport(order = 2)
--
Gitblit v1.9.3