Java/seer-teach-cloud-21
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改活动表单设计器发布新版的功能

Browse Source
This commit is contained in:
Wang 2026-01-24 18:03:39 +08:00
parent 768f8cfd3e
commit 3ca7296efc
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/controller/resp/AppActivityFormResp.java
View File

@ -11,18 +11,6 @@ public class AppActivityFormResp {
private Integer id;
/**
* 表单名称
*/
@Schema(description = "表单名称")
private String formName;
/**
* 表单描述
*/
@Schema(description = "表单描述")
private String formDescription;
/**
* 配置
*/

18
seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormServiceImpl.java
View File

@ -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<MpActivityFormRelationEntity> relation = activityFormTemplateRelationService.getLatestVersionByActivityId(activityId);
Optional<MpActivityFormRelationEntity> 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;