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

fix(用例管理): 用例导入文件自定义字段未填，值未模板默认值 

--bug=1036812 --user=王旭 【用例管理】功能用例-模板有设置自定义字段的默认值，Excel导入用例中自定义值是空，导入后数据是空 https://www.tapd.cn/55049933/s/1472056
This commit is contained in:
WangXu10 2024-03-08 17:22:59 +08:00 committed by 刘瑞斌
parent 65454ce818
commit db88c8d6fd
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,7 @@ public class FunctionalCaseService {
for (String saveAttachmentFileId : saveAttachmentFileIds) { for (String saveAttachmentFileId : saveAttachmentFileIds) {
FunctionalCaseAttachmentDTO functionalCaseAttachmentDTO = attachmentDTOMap.get(saveAttachmentFileId); FunctionalCaseAttachmentDTO functionalCaseAttachmentDTO = attachmentDTOMap.get(saveAttachmentFileId);
FunctionalCaseAttachment caseAttachment = functionalCaseAttachmentService.creatAttachment(saveAttachmentFileId, functionalCaseAttachmentDTO.getFileName(), functionalCaseAttachmentDTO.getSize(), caseId, functionalCaseAttachmentDTO.getLocal(), userId); FunctionalCaseAttachment caseAttachment = functionalCaseAttachmentService.creatAttachment(saveAttachmentFileId, functionalCaseAttachmentDTO.getFileName(), functionalCaseAttachmentDTO.getSize(), caseId, functionalCaseAttachmentDTO.getLocal(), userId);
if(functionalCaseAttachmentDTO.getLocal()) { if (functionalCaseAttachmentDTO.getLocal()) {
caseAttachment.setFileSource(CaseFileSourceType.ATTACHMENT.toString()); caseAttachment.setFileSource(CaseFileSourceType.ATTACHMENT.toString());
LogUtils.info("开始复制文件"); LogUtils.info("开始复制文件");
copyFile(request, caseId, saveAttachmentFileId, oldFileMap, functionalCaseAttachmentDTO, defaultRepository); copyFile(request, caseId, saveAttachmentFileId, oldFileMap, functionalCaseAttachmentDTO, defaultRepository);
@ -244,7 +244,7 @@ public class FunctionalCaseService {
try { try {
defaultRepository.copyFile(fileCopyRequest); defaultRepository.copyFile(fileCopyRequest);
} catch (Exception e) { } catch (Exception e) {
LogUtils.error("复制文件失败：{}",e); LogUtils.error("复制文件失败：{}", e);
} }
} }
} }
@ -413,7 +413,7 @@ public class FunctionalCaseService {
//获取变更历史数量数量 //获取变更历史数量数量
OperationHistoryExample operationHistoryExample = new OperationHistoryExample(); OperationHistoryExample operationHistoryExample = new OperationHistoryExample();
List<String>types = List.of(OperationLogType.ADD.name(), OperationLogType.IMPORT.name(), OperationLogType.UPDATE.name()); List<String> types = List.of(OperationLogType.ADD.name(), OperationLogType.IMPORT.name(), OperationLogType.UPDATE.name());
List<String> modules = List.of(OperationLogModule.CASE_MANAGEMENT_CASE_CREATE, OperationLogModule.CASE_MANAGEMENT_CASE_UPDATE); List<String> modules = List.of(OperationLogModule.CASE_MANAGEMENT_CASE_CREATE, OperationLogModule.CASE_MANAGEMENT_CASE_UPDATE);
operationHistoryExample.createCriteria().andSourceIdEqualTo(functionalCaseDetailDTO.getId()).andTypeIn(types).andModuleIn(modules); operationHistoryExample.createCriteria().andSourceIdEqualTo(functionalCaseDetailDTO.getId()).andTypeIn(types).andModuleIn(modules);
functionalCaseDetailDTO.setHistoryCount((int) operationHistoryMapper.countByExample(operationHistoryExample)); functionalCaseDetailDTO.setHistoryCount((int) operationHistoryMapper.countByExample(operationHistoryExample));
@ -1078,7 +1078,14 @@ public class FunctionalCaseService {
FunctionalCaseCustomField caseCustomField = new FunctionalCaseCustomField(); FunctionalCaseCustomField caseCustomField = new FunctionalCaseCustomField();
caseCustomField.setCaseId(caseId); caseCustomField.setCaseId(caseId);
caseCustomField.setFieldId(templateCustomFieldDTO.getFieldId()); caseCustomField.setFieldId(templateCustomFieldDTO.getFieldId());
caseCustomField.setValue(v.toString()); if (StringUtils.equalsIgnoreCase(v.toString(), "[]")) {
//数组类型
caseCustomField.setValue(JSON.toJSONString(templateCustomFieldDTO.getDefaultValue()));
} else {
caseCustomField.setValue(StringUtils.defaultIfBlank(v.toString(),
Optional.ofNullable(templateCustomFieldDTO.getDefaultValue()).map(Object::toString).orElse(StringUtils.EMPTY)
));
}
customFieldMapper.insertSelective(caseCustomField); customFieldMapper.insertSelective(caseCustomField);
} }
}); });