From a4243dfda33ff4d6e5bf02a91e3e64015af8ce65 Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Thu, 20 Jun 2024 16:51:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=80=BB=E7=BB=93=E8=AE=A1=E5=88=92=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=8F=82=E6=95=B0=E5=80=BC=E9=94=99=E8=AF=AF&&?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=9D=83=E9=99=90=E4=BD=8D=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1042681 --user=宋昌昌 【项目管理】项目与权限-用户组-测试计划-计划-「关联」修改为「关联/取消关联」 https://www.tapd.cn/55049933/s/1532968 --- .../framework/sdk/src/main/resources/i18n/commons.properties | 1 + .../sdk/src/main/resources/i18n/commons_en_US.properties | 1 + .../sdk/src/main/resources/i18n/commons_zh_CN.properties | 1 + .../sdk/src/main/resources/i18n/commons_zh_TW.properties | 1 + .../java/io/metersphere/plan/service/TestPlanReportService.java | 2 +- backend/services/test-plan/src/main/resources/permission.json | 2 +- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/framework/sdk/src/main/resources/i18n/commons.properties b/backend/framework/sdk/src/main/resources/i18n/commons.properties index 95afce463f..f46f42c01f 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons.properties @@ -461,6 +461,7 @@ permission.export=导出 permission.execute=执行 permission.debug=调试 permission.association=关联 +permission.association_and_disassociation=关联/取消关联 permission.api_definition.delete_and_recover=删除/恢复 permission.service_integration.reset=重置 diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties index 1f5bf277a6..8fdeec801b 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties @@ -470,6 +470,7 @@ permission.export=Export permission.execute=Execute permission.debug=Debug permission.association=Associate +permission.association_and_disassociation=Associate/Disassociate file_name_illegal_error=File name is illegal plugin_enable_error=Plugin is not enabled plugin_permission_error=No access to this plugin diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties index 5d0850ea26..0dd6f7e123 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties @@ -469,6 +469,7 @@ permission.export=导出 permission.execute=执行 permission.debug=调试 permission.association=关联 +permission.association_and_disassociation=关联/取消关联 file_name_illegal_error=文件名不合法 plugin_enable_error=插件未启用 plugin_permission_error=没有该插件的访问权限 diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties index 7d081ff0ef..d0752ebfdb 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties @@ -467,6 +467,7 @@ permission.export=導出 permission.execute=執行 permission.debug=調試 permission.association=關聯 +permission.association_and_disassociation=關聯/取消關聯 file_name_illegal_error=文件名不合法 plugin_enable_error=插件未啟用 plugin_permission_error=沒有該插件的訪問權限 diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java index 69c503b336..965ead73fe 100644 --- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java +++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java @@ -521,7 +521,7 @@ public class TestPlanReportService { // 计划组报告, 需要统计计划的执行数据 planReportDetail.setPlanCount(reportSummary.getPlanCount().intValue()); TestPlanReportExample reportExample = new TestPlanReportExample(); - reportExample.createCriteria().andParentIdEqualTo(reportId); + reportExample.createCriteria().andParentIdEqualTo(reportId).andIntegratedEqualTo(false); List testPlanReports = testPlanReportMapper.selectByExample(reportExample); long planPassCount = testPlanReports.stream().filter(report -> StringUtils.equals(ExecStatus.SUCCESS.name(), report.getResultStatus())).count(); planReportDetail.setPassCountOfPlan((int) planPassCount); diff --git a/backend/services/test-plan/src/main/resources/permission.json b/backend/services/test-plan/src/main/resources/permission.json index f2a17c8709..30c91fa8ce 100644 --- a/backend/services/test-plan/src/main/resources/permission.json +++ b/backend/services/test-plan/src/main/resources/permission.json @@ -22,7 +22,7 @@ }, { "id": "PROJECT_TEST_PLAN:READ+ASSOCIATION", - "name": "permission.association" + "name": "permission.association_and_disassociation" }, { "id": "PROJECT_TEST_PLAN:READ+EXECUTE"