dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(视图): 修复明细表分页模式下预览数据只有1条的bug #8577

Browse Source
This commit is contained in:
junjun 2024-03-25 10:52:38 +08:00
parent 2a80b431eb
commit fdf11997d1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -731,7 +731,11 @@ public class ChartViewService {
} }
if (chartExtRequest.getPageSize() == null) { if (chartExtRequest.getPageSize() == null) {
String pageSize = (String) mapSize.get("tablePageSize"); String pageSize = (String) mapSize.get("tablePageSize");
chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue())); if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue()));
} else {
chartExtRequest.setPageSize(Long.parseLong(pageSize));
}
} }
} else { } else {
if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) { if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
@ -1856,7 +1860,7 @@ public class ChartViewService {
} }
Date date = simpleDateFormat.parse(cTime); Date date = simpleDateFormat.parse(cTime);
calendar.setTime(date); calendar.setTime(date);
calendar.add(Calendar.DAY_OF_YEAR,6);// 加6天用一周最后一天计算周，可避免跨年的问题 calendar.add(Calendar.DAY_OF_YEAR, 6);// 加6天用一周最后一天计算周，可避免跨年的问题
calendar.add(Calendar.WEEK_OF_YEAR, -1); calendar.add(Calendar.WEEK_OF_YEAR, -1);
lastTime = simpleDateFormat.format(calendar.getTime()); lastTime = simpleDateFormat.format(calendar.getTime());
} }