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

Merge branch 'feature/countersign_ext' into dev

Browse Source
This commit is contained in:
wangli 2025-10-20 16:54:38 +08:00
commit ba439c5706
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/dto/SignatureDTO.java
View File

@ -1,5 +1,6 @@
package cn.axzo.workflow.common.model.dto; package cn.axzo.workflow.common.model.dto;
import cn.axzo.workflow.common.enums.BpmnProcessTaskResultEnum;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -41,5 +43,7 @@ public class SignatureDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String signature; private String signature;
private String advice; private String advice;
private BpmnProcessTaskResultEnum result;
private Date operationTime;
} }
} }

6
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomApproveTaskCmd.java
View File

@ -2,6 +2,7 @@ package cn.axzo.workflow.core.engine.cmd;
import cn.axzo.workflow.common.enums.AttachmentTypeEnum; import cn.axzo.workflow.common.enums.AttachmentTypeEnum;
import cn.axzo.workflow.common.enums.BpmnFlowNodeType; import cn.axzo.workflow.common.enums.BpmnFlowNodeType;
import cn.axzo.workflow.common.enums.BpmnProcessTaskResultEnum;
import cn.axzo.workflow.common.model.dto.SignatureDTO; import cn.axzo.workflow.common.model.dto.SignatureDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.AttachmentDTO; import cn.axzo.workflow.common.model.request.bpmn.task.AttachmentDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskAuditDTO;
@ -28,6 +29,7 @@ import org.springframework.util.StringUtils;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -202,7 +204,9 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
.ifPresent(attachment -> dto.getSignatures().add(0, .ifPresent(attachment -> dto.getSignatures().add(0,
new SignatureDTO.SignDetail() new SignatureDTO.SignDetail()
.setSignature(attachment.getUrl()) .setSignature(attachment.getUrl())
.setAdvice(advice))); .setAdvice(advice)
.setResult(BpmnProcessTaskResultEnum.APPROVED)
.setOperationTime(new Date())));
if (!any.isPresent()) { if (!any.isPresent()) {
signatures.add(dto); signatures.add(dto);
} }