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

feat(REQ-3004) - 修复一些特殊配置引起的异常

Browse Source
This commit is contained in:
wangli 2024-12-03 15:54:05 +08:00
parent e483d76a3a
commit e1d064676b
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/bpmn/process/BpmnProcessDefinitionVO.java
View File

@ -88,4 +88,10 @@ public class BpmnProcessDefinitionVO {
@ApiModelProperty(value = "操作人信息")
private BpmnTaskDelegateAssigner operator;
/**
* 部署 ID
*/
@ApiModelProperty(value = "部署 ID")
private String deploymentId;
}

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnProcessDefinitionConverter.java
View File

@ -52,6 +52,9 @@ public interface BpmnProcessDefinitionConverter extends EntityConverter<BpmnProc
if (entity.getTenantId() != null) {
bpmnProcessDefinitionVO.setTenantId(entity.getTenantId());
}
if (entity.getDeploymentId() != null) {
bpmnProcessDefinitionVO.setDeploymentId(entity.getDeploymentId());
}
bpmnProcessDefinitionVO.setVersion(entity.getVersion());
ProcessDefinitionEntity entitySource = (ProcessDefinitionEntity) entity;
bpmnProcessDefinitionVO.setSuspensionState(entitySource.getSuspensionState());

18
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
View File

@ -10,8 +10,10 @@ import cn.axzo.workflow.common.model.response.BpmPageResult;
import cn.axzo.workflow.common.model.response.bpmn.model.BpmnModelDetailVO;
import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessDefinitionVO;
import cn.axzo.workflow.common.model.response.form.definition.FormDefinitionVO;
import cn.axzo.workflow.core.repository.entity.ExtAxBpmnFormRelation;
import cn.axzo.workflow.core.service.BpmnProcessDefinitionService;
import cn.axzo.workflow.core.service.BpmnProcessModelService;
import cn.axzo.workflow.core.service.ExtAxBpmnFormRelationService;
import cn.axzo.workflow.core.service.converter.BpmnProcessDefinitionConverter;
import cn.axzo.workflow.form.service.FormDefinitionService;
import cn.axzo.workflow.server.common.annotation.ErrorReporter;
@ -58,6 +60,8 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
private BpmnProcessModelService bpmnProcessModelService;
@Resource
private FormDefinitionService formDefinitionService;
@Resource
private ExtAxBpmnFormRelationService bpmnFormRelationService;
/**
@ -152,7 +156,7 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
* {@link SuspensionState}
*
* @param processDefinitionId 流程定义 ID
* @param state 状态
* @param state 状态
*/
@Operation(summary = "挂起/激活流程")
@PutMapping("/state/update")
@ -186,9 +190,9 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
/**
* 获取指定模型激活的流程定义 JSON 模型
*
* @param modelId 模型 ID
* @param modelId 模型 ID
* @param tenantId 租户 ID
* @param key 业务分类
* @param key 业务分类
* @return
*/
@Operation(summary = "获取指定模型激活的流程定义 JSON 模型")
@ -215,12 +219,16 @@ public class BpmnProcessDefinitionController implements ProcessDefinitionApi {
Map<String, String> metaInfoMap = JSON.parseObject(modelDetail.getMetaInfo(), Map.class);
updateDTO.setDescription(metaInfoMap.get(MODEL_DESCRIPTION));
ExtAxBpmnFormRelation relation = bpmnFormRelationService.queryByBpmnDefinitionId(processDefinition.getId());
if (Objects.isNull(relation)) {
return success(updateDTO);
}
FormDefinitionSearchDTO search = new FormDefinitionSearchDTO();
search.setKey(modelDetail.getKey());
search.setParentDeploymentId(processDefinition.getId());
search.setParentDeploymentId(processDefinition.getDeploymentId());
search.setTenantId(finalTenantId);
FormDefinitionVO formDefinitionVO = formDefinitionService.get(search);
if(Objects.nonNull(formDefinitionVO)) {
if (Objects.nonNull(formDefinitionVO)) {
updateDTO.setFormJsonModel(new FormJsonModel(modelDetail.getName(), formDefinitionVO.getFields()));
}
return success(updateDTO);