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

Merge branch 'feature/REQ-6570' into dev

Browse Source
This commit is contained in:
wangli 2025-11-26 14:49:26 +08:00
commit 6c51985a03
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/AttachmentDTO.java
View File

@ -52,9 +52,11 @@ public class AttachmentDTO implements Serializable {
/** /**
* 文件描述 * 文件描述
* 该数据无实际作用
*/ */
@ApiModelProperty(value = "文件描述") @ApiModelProperty(value = "文件描述")
@IndexField(exist = false) @IndexField(exist = false)
@Deprecated
private String description; private String description;
/** /**

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomTransferUserTaskCmd.java
View File

@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import static cn.axzo.workflow.common.code.BpmnTaskRespCode.TASK_HAS_BEEN_COMPLETE;
import static cn.axzo.workflow.common.code.BpmnTaskRespCode.TRANSFER_TO_SELF; import static cn.axzo.workflow.common.code.BpmnTaskRespCode.TRANSFER_TO_SELF;
import static cn.axzo.workflow.common.code.OtherRespCode.ASSIGNEE_NODE_ID_NOT_EXISTS; import static cn.axzo.workflow.common.code.OtherRespCode.ASSIGNEE_NODE_ID_NOT_EXISTS;
import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_ADVICE; import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_ADVICE;
@ -100,6 +101,9 @@ public class CustomTransferUserTaskCmd extends AbstractCommand<Void> implements
TaskService taskService = processEngineConfiguration.getTaskService(); TaskService taskService = processEngineConfiguration.getTaskService();
TaskEntity task = (TaskEntity) taskService.createTaskQuery().taskId(originTaskId).singleResult(); TaskEntity task = (TaskEntity) taskService.createTaskQuery().taskId(originTaskId).singleResult();
if (Objects.isNull(task)) {
throw new WorkflowEngineException(TASK_HAS_BEEN_COMPLETE);
}
validTargetAssigneeNodeId(task.getProcessDefinitionId()); validTargetAssigneeNodeId(task.getProcessDefinitionId());

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
View File

@ -267,7 +267,7 @@ public class CustomTaskHelper {
Authentication.setAuthenticatedUserId(assigner.buildAssigneeId()); Authentication.setAuthenticatedUserId(assigner.buildAssigneeId());
attachmentList.forEach(dto -> { attachmentList.forEach(dto -> {
Attachment attachment = taskService.createAttachment(dto.getType().getType(), task.getId(), processInstanceId, Attachment attachment = taskService.createAttachment(dto.getType().getType(), task.getId(), processInstanceId,
dto.getName(), dto.getDescription(), dto.getUrl()); dto.getName(), dto.getFileKey(), dto.getUrl());
taskService.saveAttachment(attachment); taskService.saveAttachment(attachment);
}); });
task.setTransientVariableLocal(TASK_ATTACHMENTS_VAR_NAME, attachmentList); task.setTransientVariableLocal(TASK_ATTACHMENTS_VAR_NAME, attachmentList);

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java
View File

@ -1821,7 +1821,8 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic
.id(e.getId()) .id(e.getId())
.type(type) .type(type)
.name(e.getName()) .name(e.getName())
.description(e.getDescription()) // .description(e.getDescription())
.fileKey(e.getDescription())
.url(e.getUrl()) .url(e.getUrl())
.build()) .build())
.collect(Collectors.toList()); .collect(Collectors.toList());