From 3a2e4039f8b25952e0a6f4b4941103f8e0a85afd Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 25 Nov 2024 18:20:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=8E=BB=E9=87=8D=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1297667194322944]视图矩阵去重逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1297667194322944 --- .../matrix/MatrixColumnDataSearchForSelectApi.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java index 538134eb..3118a624 100644 --- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java +++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java @@ -80,6 +80,7 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase @Param(name = "hiddenFieldList", desc = "隐藏属性uuid列表", type = ApiParamType.JSONARRAY), @Param(name = "currentPage", desc = "当前页", type = ApiParamType.INTEGER), @Param(name = "pageSize", desc = "显示条目数", type = ApiParamType.INTEGER), + @Param(name = "needPage", desc = "是否需要分页", type = ApiParamType.BOOLEAN), @Param(name = "defaultValue", desc = "精确匹配回显数据参数", type = ApiParamType.JSONARRAY), @Param(name = "filterList", desc = "过滤条件集合", type = ApiParamType.JSONARRAY), @@ -132,6 +133,7 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase "}") @Override public Object myDoService(JSONObject jsonObj) throws Exception { + Boolean needPage = jsonObj.getBoolean("needPage"); jsonObj.remove("needPage"); MatrixDataVo dataVo = jsonObj.toJavaObject(MatrixDataVo.class); if (StringUtils.isBlank(dataVo.getMatrixUuid()) && StringUtils.isBlank(dataVo.getMatrixLabel())) { @@ -277,6 +279,7 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase } dataVo.setKeywordColumn(attrUuid); } + dataVo.setDistinct(true); JSONArray defaultValue = dataVo.getDefaultValue(); if (CollectionUtils.isNotEmpty(defaultValue)) { List defaultValueFilterList = new ArrayList<>(); @@ -301,7 +304,6 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase } dataVo.setDefaultValueFilterList(defaultValueFilterList); dataVo.setDefaultValue(null); - resultList = matrixDataSourceHandler.searchTableDataNew(dataVo); deduplicateData(null, valueField, textField, resultList); } else { @@ -309,6 +311,11 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase int startNum = dataVo.getStartNum(); int currentPageBackup = dataVo.getCurrentPage(); int pageSize = dataVo.getPageSize(); + if (Objects.equals(needPage, false)) { + dataVo.setNeedPage(needPage); + dataVo.getPageSize(); + pageSize = Integer.MAX_VALUE; + } int currentPage = 0; while (resultList.size() < pageSize) { currentPage++; @@ -328,6 +335,9 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase break; } } + if (Objects.equals(needPage, false)) { + dataVo.setPageCount(1); + } dataVo.setCurrentPage(currentPageBackup); } JSONArray dataList = new JSONArray(); -- Gitee From 522d687dd782a737ad82385e9d97e491b6bae467 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 25 Nov 2024 18:22:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E7=9F=A9=E9=98=B5=E5=8E=BB=E9=87=8D=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1297667194322944]视图矩阵去重逻辑优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1297667194322944 --- .../tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java index 3118a624..0b6fc9d0 100644 --- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java +++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForSelectApi.java @@ -304,6 +304,7 @@ public class MatrixColumnDataSearchForSelectApi extends PrivateApiComponentBase } dataVo.setDefaultValueFilterList(defaultValueFilterList); dataVo.setDefaultValue(null); + resultList = matrixDataSourceHandler.searchTableDataNew(dataVo); deduplicateData(null, valueField, textField, resultList); } else { -- Gitee