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:27:35 +08:00
parent a91ea307e4
commit 68ca2e67e9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppActivityFormExecutionServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.seer.teach.mp.entity.MpActivityFormFieldEntity;
import com.seer.teach.mp.entity.MpActivityFormVariableEntity; import com.seer.teach.mp.entity.MpActivityFormVariableEntity;
import com.seer.teach.mp.service.IMpActivityFormExecutionService; import com.seer.teach.mp.service.IMpActivityFormExecutionService;
import com.seer.teach.mp.service.IMpActivityFormFieldService; import com.seer.teach.mp.service.IMpActivityFormFieldService;
import com.seer.teach.mp.service.IMpActivityFormRelationService;
import com.seer.teach.mp.service.IMpActivityFormVariableService; import com.seer.teach.mp.service.IMpActivityFormVariableService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -43,7 +44,7 @@ public class AppActivityFormExecutionServiceImpl implements IAppActivityFormExec
private final IMpActivityFormExecutionService activityFormExecutionService; private final IMpActivityFormExecutionService activityFormExecutionService;
private final IMpActivityFormVariableService activityFormVariableService; private final IMpActivityFormVariableService activityFormVariableService;
private final IMpActivityFormFieldService activityFormFieldService; private final IMpActivityFormFieldService activityFormFieldService;
private final IMpActivityFormRelationService activityFormRelationService;
@Override @Override
@Transactional @Transactional
@ -136,13 +137,19 @@ public class AppActivityFormExecutionServiceImpl implements IAppActivityFormExec
@Override @Override
public AppFormFieldWithValueResp getExecutionWithFormData(Integer activityId, Integer agentId, Integer userId) { public AppFormFieldWithValueResp getExecutionWithFormData(Integer activityId, Integer agentId, Integer userId) {
Integer formId = activityFormRelationService.getPrimaryFormIdByActivityId(activityId);
if (Objects.isNull(formId)) {
log.warn("未找到该活动对应的表单ID，活动ID：{}", activityId);
return null;
}
log.info("获取表单执行信息，活动ID：{}，代理ID：{}，用户ID：{},表单ID：{}", activityId, agentId, userId,formId);
MpActivityFormExecutionEntity execution = activityFormExecutionService.getOneByActivityIdAndAgentIdAndSubmitterId(activityId, agentId, userId); MpActivityFormExecutionEntity execution = activityFormExecutionService.getOneByActivityIdAndAgentIdAndSubmitterId(activityId, agentId, userId);
if (Objects.isNull(execution)) { if (Objects.isNull(execution)) {
log.warn("未找到该用户的执行记录，活动ID：{}，代理ID：{}，用户ID：{}", activityId, agentId, userId); log.warn("未找到该用户的执行记录，活动ID：{}，代理ID：{}，用户ID：{}", activityId, agentId, userId);
return null; return null;
} }
// 获取表单字段定义 // 获取表单字段定义
List<MpActivityFormFieldEntity> fieldDefinitions = activityFormFieldService.getFieldListByFormId(execution.getFormId()); List<MpActivityFormFieldEntity> fieldDefinitions = activityFormFieldService.getFieldListByFormId(formId);
if(CollectionUtil.isEmpty(fieldDefinitions)){ if(CollectionUtil.isEmpty(fieldDefinitions)){
log.warn("表单字段定义为空，表单ID：{}", execution.getFormId()); log.warn("表单字段定义为空，表单ID：{}", execution.getFormId());
return null; return null;
@ -164,7 +171,7 @@ public class AppActivityFormExecutionServiceImpl implements IAppActivityFormExec
response.setExecutionId(execution.getId()); response.setExecutionId(execution.getId());
response.setExecutionNo(execution.getExecutionNo()); response.setExecutionNo(execution.getExecutionNo());
response.setActivityId(execution.getActivityId()); response.setActivityId(execution.getActivityId());
response.setFormId(execution.getFormId()); response.setFormId(formId);
response.setSubmitterId(execution.getSubmitterId()); response.setSubmitterId(execution.getSubmitterId());
// 组合字段定义和对应的值 // 组合字段定义和对应的值
List<AppFormFieldWithValueResp.FieldWithValueItemResp> fields = new ArrayList<>(fieldDefinitions.size()); List<AppFormFieldWithValueResp.FieldWithValueItemResp> fields = new ArrayList<>(fieldDefinitions.size());

1
seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/impl/MpActivityFormRelationServiceImpl.java
View File

@ -110,7 +110,6 @@ public class MpActivityFormRelationServiceImpl extends ServiceImpl<MpActivityFor
int num = Integer.parseInt(parts[i]); int num = Integer.parseInt(parts[i]);
result += (long) num * (long) Math.pow(1000, 2 - i); result += (long) num * (long) Math.pow(1000, 2 - i);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// 如果版本号格式不正确，返回0
return 0L; return 0L;
} }
} }