test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(测试计划): 一键总结计划通过参数值错误&&计划权限位名称错误 

--bug=1042681 --user=宋昌昌 【项目管理】项目与权限-用户组-测试计划-计划-「关联」修改为「关联/取消关联」 https://www.tapd.cn/55049933/s/1532968
This commit is contained in:
song-cc-rock 2024-06-20 16:51:31 +08:00 committed by Craftsman
parent 9dfdf2fe12
commit a4243dfda3
6 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/framework/sdk/src/main/resources/i18n/commons.properties
View File

@ -461,6 +461,7 @@ permission.export=导出
permission.execute=执行 permission.execute=执行
permission.debug=调试 permission.debug=调试
permission.association=关联 permission.association=关联
permission.association_and_disassociation=关联/取消关联
permission.api_definition.delete_and_recover=删除/恢复 permission.api_definition.delete_and_recover=删除/恢复
permission.service_integration.reset=重置 permission.service_integration.reset=重置

1
backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties
View File

@ -470,6 +470,7 @@ permission.export=Export
permission.execute=Execute permission.execute=Execute
permission.debug=Debug permission.debug=Debug
permission.association=Associate permission.association=Associate
permission.association_and_disassociation=Associate/Disassociate
file_name_illegal_error=File name is illegal file_name_illegal_error=File name is illegal
plugin_enable_error=Plugin is not enabled plugin_enable_error=Plugin is not enabled
plugin_permission_error=No access to this plugin plugin_permission_error=No access to this plugin

1
backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties
View File

@ -469,6 +469,7 @@ permission.export=导出
permission.execute=执行 permission.execute=执行
permission.debug=调试 permission.debug=调试
permission.association=关联 permission.association=关联
permission.association_and_disassociation=关联/取消关联
file_name_illegal_error=文件名不合法 file_name_illegal_error=文件名不合法
plugin_enable_error=插件未启用 plugin_enable_error=插件未启用
plugin_permission_error=没有该插件的访问权限 plugin_permission_error=没有该插件的访问权限

1
backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties
View File

@ -467,6 +467,7 @@ permission.export=導出
permission.execute=執行 permission.execute=執行
permission.debug=調試 permission.debug=調試
permission.association=關聯 permission.association=關聯
permission.association_and_disassociation=關聯/取消關聯
file_name_illegal_error=文件名不合法 file_name_illegal_error=文件名不合法
plugin_enable_error=插件未啟用 plugin_enable_error=插件未啟用
plugin_permission_error=沒有該插件的訪問權限 plugin_permission_error=沒有該插件的訪問權限

2
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
View File

@ -521,7 +521,7 @@ public class TestPlanReportService {
// 计划组报告, 需要统计计划的执行数据 // 计划组报告, 需要统计计划的执行数据
planReportDetail.setPlanCount(reportSummary.getPlanCount().intValue()); planReportDetail.setPlanCount(reportSummary.getPlanCount().intValue());
TestPlanReportExample reportExample = new TestPlanReportExample(); TestPlanReportExample reportExample = new TestPlanReportExample();
reportExample.createCriteria().andParentIdEqualTo(reportId); reportExample.createCriteria().andParentIdEqualTo(reportId).andIntegratedEqualTo(false);
List<TestPlanReport> testPlanReports = testPlanReportMapper.selectByExample(reportExample); List<TestPlanReport> testPlanReports = testPlanReportMapper.selectByExample(reportExample);
long planPassCount = testPlanReports.stream().filter(report -> StringUtils.equals(ExecStatus.SUCCESS.name(), report.getResultStatus())).count(); long planPassCount = testPlanReports.stream().filter(report -> StringUtils.equals(ExecStatus.SUCCESS.name(), report.getResultStatus())).count();
planReportDetail.setPassCountOfPlan((int) planPassCount); planReportDetail.setPassCountOfPlan((int) planPassCount);

2
backend/services/test-plan/src/main/resources/permission.json
View File

@ -22,7 +22,7 @@
}, },
{ {
"id": "PROJECT_TEST_PLAN:READ+ASSOCIATION", "id": "PROJECT_TEST_PLAN:READ+ASSOCIATION",
"name": "permission.association" "name": "permission.association_and_disassociation"
}, },
{ {
"id": "PROJECT_TEST_PLAN:READ+EXECUTE" "id": "PROJECT_TEST_PLAN:READ+EXECUTE"