diff --git a/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties index 9a2f0dd091..bf68e142a0 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_en_US.properties @@ -284,6 +284,7 @@ case.export.system.other.columns.create_user=Create user case.export.system.other.columns.create_time=Create time case.export.system.other.columns.update_user=Update user case.export.system.other.columns.update_time=Update time +case.export.columns.case_edit_type=Edit type export_case_task_stop=Stop export export_case_task_existed=Export task already exists \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties index 436a999024..84e5f1fdb6 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_zh_CN.properties @@ -281,6 +281,7 @@ case.export.system.other.columns.create_user=创建人 case.export.system.other.columns.create_time=创建时间 case.export.system.other.columns.update_user=更新人 case.export.system.other.columns.update_time=更新时间 +case.export.columns.case_edit_type=编辑模式 export_case_task_stop=停止导出 export_case_task_existed=已有导出任务 \ No newline at end of file diff --git a/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties index 1742e06382..eeb6683466 100644 --- a/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/case_zh_TW.properties @@ -285,6 +285,7 @@ case.export.system.other.columns.create_user=創建人 case.export.system.other.columns.create_time=創建時間 case.export.system.other.columns.update_user=更新人 case.export.system.other.columns.update_time=更新時間 +case.export.columns.case_edit_type=編輯模式 export_case_task_stop=停止導出 export_case_task_existed=已有導出任務 \ No newline at end of file diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseFileService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseFileService.java index b1be63ec9e..bed1842fa3 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseFileService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseFileService.java @@ -625,13 +625,13 @@ public class FunctionalCaseFileService { private void buildBaseField(FunctionalCaseExcelData data, FunctionalCase functionalCase, FunctionalCaseBlob functionalCaseBlob, Map moduleMap, List textDescriptionList, List expectedResultList, String url) { data.setNum(functionalCase.getNum().toString()); data.setModule(moduleMap.get(functionalCase.getModuleId())); - data.setTags(functionalCase.getTags().toString()); //构建步骤 buildExportStep(data, functionalCaseBlob, functionalCase.getCaseEditType(), textDescriptionList, expectedResultList); data.setPrerequisite(new String(functionalCaseBlob.getPrerequisite() == null ? new byte[0] : functionalCaseBlob.getPrerequisite(), StandardCharsets.UTF_8)); //标签 data.setTags(JSON.toJSONString(functionalCase.getTags())); + data.setCaseEditType(functionalCase.getCaseEditType()); // 设置超链接 WriteCellData hyperlink = new WriteCellData<>(functionalCase.getName()); data.setHyperLinkName(hyperlink); @@ -874,6 +874,10 @@ public class FunctionalCaseFileService { .collect(Collectors.toList())); } }; + List textDescription = request.getSystemFields().stream().filter(item -> StringUtils.equals(item.getId(), "text_description")).toList(); + if (CollectionUtils.isNotEmpty(textDescription)) { + headList.add(Arrays.asList(Translator.get("case.export.columns.case_edit_type"))); + } return headList; }