wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3845) - 调整获取流程模型表单定义内容

Browse Source
This commit is contained in:
wangli 2025-12-18 10:23:25 +08:00
parent 279d066b3b
commit 98f560dc77
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetFormModelByProcessInstanceIdCmd.java
View File

@ -8,9 +8,11 @@ import org.flowable.form.api.FormInfo;
import org.flowable.form.api.FormInstance;
import org.flowable.form.api.FormRepositoryService;
import org.flowable.form.api.FormService;
import org.springframework.util.CollectionUtils;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -38,8 +40,12 @@ public class CustomGetFormModelByProcessInstanceIdCmd extends AbstractCommand<Fo
FormEngineConfigurationApi formEngineConfiguration = CommandContextUtil.getFormEngineConfiguration(commandContext);
FormService formService = formEngineConfiguration.getFormService();
FormInstance formInstance = formService.createFormInstanceQuery().processInstanceId(processInstanceId).singleResult();
String formDefinitionId = formInstance.getFormDefinitionId();
List<FormInstance> list = formService.createFormInstanceQuery().processInstanceId(processInstanceId).orderBySubmittedDate().desc().list();
if (CollectionUtils.isEmpty(list)) {
return null;
}
String formDefinitionId = list.get(0).getFormDefinitionId();
FormRepositoryService formRepositoryService = formEngineConfiguration.getFormRepositoryService();
return formRepositoryService.getFormModelById(formDefinitionId);
}

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/PrintAdminController.java
View File

@ -346,7 +346,7 @@ public class PrintAdminController implements PrintAdminApi {
}
private void convertValueToObject(Map<String, Object> result, FormInfo formInfo) {
if (CollectionUtils.isEmpty(result)) {
if (CollectionUtils.isEmpty(result) || Objects.isNull(formInfo)) {
return;
}
Map<String, FormField> stringFormFieldMap = ((SimpleFormModel) formInfo.getFormModel()).allFieldsAsMap();