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

feat(测试用例): excel拆分单元格

This commit is contained in:
WangXu10 2024-08-03 21:29:01 +08:00 committed by 刘瑞斌
parent 317d88a18b
commit 7e9a68d3f1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseExportRequest.java
View File

@ -33,4 +33,7 @@ public class FunctionalCaseExportRequest extends BaseFunctionalCaseBatchDTO impl
@Schema(description = "文件id") @Schema(description = "文件id")
private String fileId; private String fileId;
@Schema(description = "单元格拆分")
private Boolean isMerge = false;
} }

2
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseFileService.java
View File

@ -463,7 +463,7 @@ public class FunctionalCaseFileService {
//构建其他字段 //构建其他字段
buildExportOtherField(functionalCase, data, caseCommentMap, executeCommentMap, reviewCommentMap, request); buildExportOtherField(functionalCase, data, caseCommentMap, executeCommentMap, reviewCommentMap, request);
validateExportTextField(data); validateExportTextField(data);
if (CollectionUtils.isNotEmpty(textDescriptionList)) { if (CollectionUtils.isNotEmpty(textDescriptionList) && !request.getIsMerge()) {
// 如果有多条步骤则添加多条数据，之后合并单元格 // 如果有多条步骤则添加多条数据，之后合并单元格
buildExportMergeData(rowMergeInfo, list, textDescriptionList, expectedResultList, data); buildExportMergeData(rowMergeInfo, list, textDescriptionList, expectedResultList, data);
} else { } else {