From 01023fd1c3f2de92f89987fbc6d13ca98ff3087e Mon Sep 17 00:00:00 2001 From: WangXu10 Date: Wed, 22 Nov 2023 11:08:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=AD=97=E6=AE=B5=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functional/service/FunctionalCaseService.java | 7 ------- .../metersphere/system/dto/sdk/TemplateCustomFieldDTO.java | 3 +++ .../io/metersphere/system/service/BaseTemplateService.java | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java index 34c12a0ae9..386e85e8c9 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseService.java @@ -181,17 +181,10 @@ public class FunctionalCaseService { //获取附件信息 functionalCaseAttachmentService.getAttachmentInfo(functionalCaseDetailDTO); - handData(functionalCaseDetailDTO); - - return functionalCaseDetailDTO; } - private void handData(FunctionalCaseDetailDTO functionalCaseDetailDTO) { - FunctionalCaseModule caseModule = functionalCaseModuleMapper.selectByPrimaryKey(functionalCaseDetailDTO.getModuleId()); - functionalCaseDetailDTO.setModuleName(caseModule.getName()); - } private Boolean checkIsFollowCase(String caseId, String userId) { FunctionalCaseFollowerExample example = new FunctionalCaseFollowerExample(); diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java index a2719ecd07..21b47c463f 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/TemplateCustomFieldDTO.java @@ -27,4 +27,7 @@ public class TemplateCustomFieldDTO { @Schema(title = "选项值") private List options; + @Schema(title = "字段类型") + private String type; + } diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java index b4e24890d2..3a2dfdb250 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTemplateService.java @@ -119,6 +119,7 @@ public class BaseTemplateService { TemplateCustomFieldDTO templateCustomFieldDTO = new TemplateCustomFieldDTO(); BeanUtils.copyBean(templateCustomFieldDTO, i); templateCustomFieldDTO.setFieldName(customField.getName()); + templateCustomFieldDTO.setType(customField.getType()); AbstractCustomFieldResolver customFieldResolver = CustomFieldResolverFactory.getResolver(customField.getType()); Object defaultValue = null; try {