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

fix - 自动同意和驳回功能的日志文案调整

Browse Source
This commit is contained in:
wangli 2024-08-09 09:37:29 +08:00
parent f3e242577a
commit 09d1a587fe
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
* 在日志中一般出现在节点名称的下方
* 不传,默认"已通过"
*/
private String operationDesc = "已通过";
private String operationDesc;
/**
* 附件, 可为空
*/
@ -84,7 +84,8 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
}
public CustomApproveTaskCmd(BpmnTaskAuditDTO dto) {
this(dto, dto.getOperationDesc());
this(dto, null);
this.operationDesc = dto.getOperationDesc();
}
public CustomApproveTaskCmd(BpmnTaskAuditDTO dto, String operationDesc) {
@ -95,28 +96,11 @@ public class CustomApproveTaskCmd extends AbstractCommand<Void> implements Seria
this.nextApprover = dto.getNextApprover();
this.nodeTypes = dto.getNodeTypes();
// 这里的不能直接使用字符串的比较，因为外部可能传入空字符串，比如发起人的通过时，就是传入的空字符串
if (Objects.nonNull(operationDesc)) {
this.operationDesc = operationDesc;
}
}
public CustomApproveTaskCmd(String taskId, String advice, String operationDesc, List<AttachmentDTO> attachmentList,
BpmnTaskDelegateAssigner approver, BpmnTaskDelegateAssigner nextApprover) {
this(taskId, advice, operationDesc, attachmentList, approver, nextApprover, null);
}
public CustomApproveTaskCmd(String taskId, String advice, String operationDesc, List<AttachmentDTO> attachmentList,
BpmnTaskDelegateAssigner approver, BpmnTaskDelegateAssigner nextApprover,
List<BpmnFlowNodeType> nodeTypes) {
this.taskId = taskId;
this.advice = advice;
if (StringUtils.hasText(operationDesc)) {
this.operationDesc = operationDesc;
} else {
this.operationDesc = "已通过";
}
this.attachmentList = attachmentList;
this.approver = approver;
this.nextApprover = nextApprover;
this.nodeTypes = nodeTypes;
}
@Override

7
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomRejectionTaskCmd.java
View File

@ -47,7 +47,7 @@ public class CustomRejectionTaskCmd extends AbstractCommand<Void> implements Ser
private final String taskId;
private final String advice;
private String operationDesc = "已驳回";
private String operationDesc;
private final List<AttachmentDTO> attachmentList;
private final BpmnTaskDelegateAssigner approver;
private final ExtAxHiTaskInstService extAxHiTaskInstService;
@ -57,7 +57,8 @@ public class CustomRejectionTaskCmd extends AbstractCommand<Void> implements Ser
private final List<BpmnFlowNodeType> nodeTypes;
public CustomRejectionTaskCmd(BpmnTaskAuditDTO dto, ExtAxHiTaskInstService extAxHiTaskInstService) {
this(dto, extAxHiTaskInstService, dto.getOperationDesc());
this(dto, extAxHiTaskInstService, null);
this.operationDesc = dto.getOperationDesc();
}
public CustomRejectionTaskCmd(BpmnTaskAuditDTO dto, ExtAxHiTaskInstService extAxHiTaskInstService, String operationDesc) {
@ -65,6 +66,8 @@ public class CustomRejectionTaskCmd extends AbstractCommand<Void> implements Ser
this.advice = dto.getAdvice();
if (StringUtils.hasText(operationDesc)) {
this.operationDesc = operationDesc;
} else {
this.operationDesc = "已驳回";
}
this.attachmentList = dto.getAttachmentList();
this.approver = dto.getApprover();