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

Merge branch 'feature/REQ-5965' into dev

Browse Source
This commit is contained in:
wangli 2025-11-10 11:43:35 +08:00
commit f135a14eb5
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/ProcessLogItemDTO.java
View File

@ -1,5 +1,6 @@
package cn.axzo.workflow.common.model.response; package cn.axzo.workflow.common.model.response;
import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum;
import cn.axzo.workflow.common.model.request.bpmn.task.AttachmentDTO; import cn.axzo.workflow.common.model.request.bpmn.task.AttachmentDTO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -61,4 +62,10 @@ public class ProcessLogItemDTO {
*/ */
@ApiModelProperty(value = "操作时间") @ApiModelProperty(value = "操作时间")
private String operationTime; private String operationTime;
/**
* 日志项结果，对应{@link BpmnProcessInstanceResultEnum#name()}
*/
@ApiModelProperty(value = "日志项结果")
private String result;
} }

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

@ -559,6 +559,7 @@ public class PrintAdminController implements PrintAdminApi {
.fileList(getAttachmentByType(attachmentByTaskMap, log.getTaskId(), AttachmentTypeEnum.file)) .fileList(getAttachmentByType(attachmentByTaskMap, log.getTaskId(), AttachmentTypeEnum.file))
.signatureUrl(getAttachmentByType(attachmentByTaskMap, log.getTaskId(), AttachmentTypeEnum.signature).stream().findFirst().orElse(new AttachmentDTO()).getUrl()) .signatureUrl(getAttachmentByType(attachmentByTaskMap, log.getTaskId(), AttachmentTypeEnum.signature).stream().findFirst().orElse(new AttachmentDTO()).getUrl())
.operationTime(DateUtil.format(log.getEndTime(), "yyyy.MM.dd HH:mm:ss")) .operationTime(DateUtil.format(log.getEndTime(), "yyyy.MM.dd HH:mm:ss"))
.result(log.getStatus())
.build()); .build());
}); });
parseSignatureUrl(logItems); parseSignatureUrl(logItems);