From 0bc05044d6f193b37dfb99c11c87ecd13d711442 Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Wed, 1 Mar 2023 15:28:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E5=90=8E?= =?UTF-8?q?=E5=85=A8=E9=87=8F=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1023873 --user=宋昌昌 【测试跟踪】github#22273，缺陷管理导出，高级搜索进行筛选后导出，导出的是全部用例而不是筛选后的用例 https://www.tapd.cn/55049933/s/1344521 --- .../io/metersphere/request/issues/IssueExportRequest.java | 5 +++++ .../src/main/java/io/metersphere/service/IssuesService.java | 2 ++ test-track/frontend/src/business/issue/IssueList.vue | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test-track/backend/src/main/java/io/metersphere/request/issues/IssueExportRequest.java b/test-track/backend/src/main/java/io/metersphere/request/issues/IssueExportRequest.java index 7cc747962a..c7ab5c4392 100644 --- a/test-track/backend/src/main/java/io/metersphere/request/issues/IssueExportRequest.java +++ b/test-track/backend/src/main/java/io/metersphere/request/issues/IssueExportRequest.java @@ -22,6 +22,11 @@ public class IssueExportRequest { private List orders; private Map> exportFields; + /** + * 高级搜索 + */ + private Map combine; + @Getter @Setter public static class IssueExportHeader { diff --git a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java index 03aa33f25c..77942ec27e 100644 --- a/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java +++ b/test-track/backend/src/main/java/io/metersphere/service/IssuesService.java @@ -1604,6 +1604,8 @@ public class IssuesService { request.setWorkspaceId(exportRequest.getWorkspaceId()); request.setSelectAll(exportRequest.getIsSelectAll()); request.setExportIds(exportRequest.getExportIds()); + // 高级搜索条件 + request.setCombine(exportRequest.getCombine()); // 列表排序 request.setOrders(exportRequest.getOrders()); request.setOrders(ServiceUtils.getDefaultOrderByField(request.getOrders(), "create_time")); diff --git a/test-track/frontend/src/business/issue/IssueList.vue b/test-track/frontend/src/business/issue/IssueList.vue index 0c04d2eee3..4efe15e595 100644 --- a/test-track/frontend/src/business/issue/IssueList.vue +++ b/test-track/frontend/src/business/issue/IssueList.vue @@ -545,7 +545,8 @@ export default { "isSelectAll": this.page.condition.selectAll, "exportIds": this.$refs.table.selectIds, "exportFields": data, - "orders": getLastTableSortField(this.tableHeaderKey) + "orders": getLastTableSortField(this.tableHeaderKey), + "combine": this.page.condition.combine } this.$fileDownloadPost("/issues/export", param); },