From 1c072e4de1d9524dde90363f1939317155b8068f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 31 Jul 2025 18:00:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20table=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=8A=A5=E8=A1=A8=EF=BC=8C=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E9=A1=B5=E5=88=97=E5=A4=B4=E4=BC=9A=E9=94=99?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1477571949068288]table类型的报表，有多页的情况下点击第二页列头会错位 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1477571949068288 --- .../report/service/ReportServiceImpl.java | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java b/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java index 8fe625d..a86f632 100644 --- a/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java +++ b/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java @@ -123,15 +123,19 @@ public class ReportServiceImpl implements ReportService { private List> selectTableColumns(List showColumnList, List> tmpList) { /* 筛选表格显示列 */ - for (Map map : tmpList) { - map.entrySet().removeIf(stringObjectEntry -> !showColumnList.contains(stringObjectEntry.getKey())); - } +// for (Map map : tmpList) { +// map.entrySet().removeIf(stringObjectEntry -> !showColumnList.contains(stringObjectEntry.getKey())); +// } /* 排序 */ List> sqList = new ArrayList<>(); for (Map map : tmpList) { Map _map = new LinkedHashMap<>(); for (String s : showColumnList) { - _map.put(s, map.get(s)); + Object value = map.get(s); + if (value == null) { + value = "null"; + } + _map.put(s, value); } sqList.add(_map); } @@ -343,14 +347,26 @@ public class ReportServiceImpl implements ReportService { if (object == null) { continue; } + List propertyList = sqlInfo.getPropertyList(); if (object instanceof List) { List> resultList = new ArrayList<>(); List list = (List) object; for (Object obj : list) { if (obj instanceof Map) { + Map map = (Map) obj; Map hashMap = new LinkedHashMap<>(); - for (Map.Entry entity : ((Map) obj).entrySet()) { - hashMap.put((String) entity.getKey(), entity.getValue()); + if (CollectionUtils.isNotEmpty(propertyList)) { + for (String property : propertyList) { + Object value = map.get(property); + if (value == null) { + value = "null"; + } + hashMap.put(property, value); + } + } else { + for (Map.Entry entity : map.entrySet()) { + hashMap.put((String) entity.getKey(), entity.getValue()); + } } resultList.add(hashMap); } @@ -414,14 +430,31 @@ public class ReportServiceImpl implements ReportService { if (object == null) { return resultMap; } + List propertyList = new ArrayList<>(); + for (SqlInfo sqlInfo : sqlInfoList) { + if (Objects.equals(sqlInfo.getId(), id)) { + propertyList = sqlInfo.getPropertyList(); + } + } if (object instanceof List) { List> resultList = new ArrayList<>(); List list = (List) object; for (Object obj : list) { if (obj instanceof Map) { - Map hashMap = new HashMap<>(); - for (Map.Entry entity : ((Map) obj).entrySet()) { - hashMap.put((String) entity.getKey(), entity.getValue()); + Map map = (Map) obj; + Map hashMap = new LinkedHashMap<>(); + if (CollectionUtils.isNotEmpty(propertyList)) { + for (String property : propertyList) { + Object value = map.get(property); + if (value == null) { + value = "null"; + } + hashMap.put(property, value); + } + } else { + for (Map.Entry entity : map.entrySet()) { + hashMap.put((String) entity.getKey(), entity.getValue()); + } } resultList.add(hashMap); } -- Gitee From 4ad0103ab758fdcfcde5a2b71b83d74bc741f893 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 31 Jul 2025 18:04:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20table=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=8A=A5=E8=A1=A8=EF=BC=8C=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E9=A1=B5=E5=88=97=E5=A4=B4=E4=BC=9A=E9=94=99?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1477571949068288]table类型的报表，有多页的情况下点击第二页列头会错位 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1477571949068288 --- .../java/neatlogic/module/report/service/ReportServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java b/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java index a86f632..6cbbbf6 100644 --- a/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java +++ b/src/main/java/neatlogic/module/report/service/ReportServiceImpl.java @@ -434,6 +434,7 @@ public class ReportServiceImpl implements ReportService { for (SqlInfo sqlInfo : sqlInfoList) { if (Objects.equals(sqlInfo.getId(), id)) { propertyList = sqlInfo.getPropertyList(); + break; } } if (object instanceof List) { -- Gitee