From b29b4008fcc85a8184d30af44dab540d50a14698 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 08 四月 2025 14:03:14 +0800 Subject: [PATCH] 查询流程图中的历史任务去重、修改任务相关完善 --- flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java index af7ee57..a0b4b54 100644 --- a/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java +++ b/flowable/src/main/java/com/ycl/domain/vo/ProcessLogVO.java @@ -1,5 +1,6 @@ package com.ycl.domain.vo; +import com.ycl.common.enums.business.ProcessLogEventTypeEnum; import com.ycl.system.domain.base.AbsVo; import com.ycl.domain.entity.ProcessLog; import org.springframework.lang.NonNull; @@ -22,26 +23,38 @@ @ApiModelProperty("浠诲姟id") private String taskId; + @ApiModelProperty("浠诲姟鍚嶇О") + private String taskName; + /** 浜嬩欢鏃ュ織绫诲瀷 */ @ApiModelProperty("浜嬩欢鏃ュ織绫诲瀷") - private String eventType; + private ProcessLogEventTypeEnum eventType; /** 椤圭洰id */ @ApiModelProperty("椤圭洰id") - private Long projectId; + private String projectId; /** 娴佺▼瀹炰緥id */ @ApiModelProperty("娴佺▼瀹炰緥id") - private String flowInsId; + private String processInsId; /** 浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹� */ @ApiModelProperty("浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹�") private Long userId; + @ApiModelProperty("鐢ㄦ埛鍚�") + private String nickName; + /** 浜嬩欢鏁版嵁锛屾牴鎹笉鍚岀殑浜嬩欢鍙瓨鍌ㄥ搴旂殑鎵╁睍鏁版嵁銆傚杞姙浜嬩欢鍙瓨鍌ㄨ浆鍔炲墠鍚庣殑澶勭悊浜轰俊鎭� */ @ApiModelProperty("浜嬩欢鏁版嵁锛屾牴鎹笉鍚岀殑浜嬩欢鍙瓨鍌ㄥ搴旂殑鎵╁睍鏁版嵁銆傚杞姙浜嬩欢鍙瓨鍌ㄨ浆鍔炲墠鍚庣殑澶勭悊浜轰俊鎭�") private String eventDataJson; + @ApiModelProperty("json杞崲鍚庣殑瀵硅薄") + private Object eventDataObj; + + @ApiModelProperty("鍐呭") + private String content; + public static ProcessLogVO getVoByEntity(@NonNull ProcessLog entity, ProcessLogVO vo) { if(vo == null) { vo = new ProcessLogVO(); -- Gitblit v1.8.0