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

View File

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

View File

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