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

Merge pull request #8670 from dataease/pr@dev@fix_table_info

Browse Source 
fix(视图): 修复明细表分页模式下预览数据只有1条的bug #8577
This commit is contained in:
Junjun 2024-03-25 10:54:34 +08:00 committed by GitHub
commit 4a3da71142
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -731,7 +731,11 @@ public class ChartViewService {
}
if (chartExtRequest.getPageSize() == null) {
String pageSize = (String) mapSize.get("tablePageSize");
if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue()));
} else {
chartExtRequest.setPageSize(Long.parseLong(pageSize));
}
}
} else {
if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
@ -1856,7 +1860,7 @@ public class ChartViewService {
}
Date date = simpleDateFormat.parse(cTime);
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);
lastTime = simpleDateFormat.format(calendar.getTime());
}