From 3ca7296efcd5235546ca8c811408aa0b35789959 Mon Sep 17 00:00:00 2001 From: Wang Date: Sat, 24 Jan 2026 18:03:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8F=91=E5=B8=83=E6=96=B0?= =?UTF-8?q?=E7=89=88=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/resp/AppActivityFormResp.java | 12 ------------ .../impl/AppActivityFormServiceImpl.java | 18 ++++++++---------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/controller/resp/AppActivityFormResp.java b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/controller/resp/AppActivityFormResp.java index fad8337..5dbc82f 100644 --- a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/controller/resp/AppActivityFormResp.java +++ b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/controller/resp/AppActivityFormResp.java @@ -11,18 +11,6 @@ public class AppActivityFormResp { private Integer id; - /** - * 表单名称 - */ - @Schema(description = "表单名称") - private String formName; - - /** - * 表单描述 - */ - @Schema(description = "表单描述") - private String formDescription; - /** * 配置 */ diff --git a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java index d7ccc04..9feadf8 100644 --- a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java +++ b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java @@ -9,11 +9,9 @@ import com.seer.teach.mp.entity.MpActivityEntity; import com.seer.teach.mp.entity.MpActivityFormEntity; import com.seer.teach.mp.entity.MpActivityFormFieldEntity; import com.seer.teach.mp.entity.MpActivityFormRelationEntity; -import com.seer.teach.mp.service.IMpActivityFormExecutionService; import com.seer.teach.mp.service.IMpActivityFormFieldService; import com.seer.teach.mp.service.IMpActivityFormRelationService; import com.seer.teach.mp.service.IMpActivityFormService; -import com.seer.teach.mp.service.IMpActivityFormVariableService; import com.seer.teach.mp.service.IMpActivityService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -36,10 +34,10 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class AppActivityFormServiceImpl implements IAppActivityFormService { - private final IMpActivityFormService activityFormTemplateService; + private final IMpActivityFormService activityFormService; private final IMpActivityFormFieldService activityFormFieldService; private final IMpActivityService mpActivityService; - private final IMpActivityFormRelationService activityFormTemplateRelationService; + private final IMpActivityFormRelationService activityFormRelationService; @Override public AppActivityFormResp getFormByActivity(Integer activityId) { @@ -51,20 +49,20 @@ public class AppActivityFormServiceImpl implements IAppActivityFormService { } // 从关联表中获取与活动关联的表单ID - Integer formId = activityFormTemplateRelationService.getPrimaryFormIdByActivityId(activityId); + Integer formId = activityFormRelationService.getPrimaryFormIdByActivityId(activityId); if (formId != null) { - MpActivityFormEntity template = activityFormTemplateService.getById(formId); - if (template != null) { - AppActivityFormResp resp = AppActivityFormConvert.INSTANCE.convertToAppTemplateResp(template); + MpActivityFormEntity form = activityFormService.getById(formId); + if (form != null) { + AppActivityFormResp resp = AppActivityFormConvert.INSTANCE.convertToAppTemplateResp(form); return resp; } } - Optional relation = activityFormTemplateRelationService.getLatestVersionByActivityId(activityId); + Optional relation = activityFormRelationService.getLatestVersionByActivityId(activityId); if (relation.isPresent()) { formId = relation.get().getFormId(); - MpActivityFormEntity template = activityFormTemplateService.getById(formId); + MpActivityFormEntity template = activityFormService.getById(formId); if (template != null) { AppActivityFormResp resp = AppActivityFormConvert.INSTANCE.convertToAppTemplateResp(template); return resp;