From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 31 三月 2025 09:42:00 +0800 Subject: [PATCH] 添加审签逻辑,移动flow通用代码,添加根据角色查询用户,新增时间工具类,修改指派设备bug --- lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java index a15c0b1..5c99fc1 100644 --- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java +++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/dto/FlowMyBusinessDto.java @@ -64,6 +64,9 @@ @Excel(name = "娴佺▼涓氬姟瀹炰緥id 涓�涓祦绋嬩笟鍔″敮涓�锛屾湰琛ㄤ腑涔熷敮涓�", width = 15) @ApiModelProperty(value = "娴佺▼涓氬姟瀹炰緥id 涓�涓祦绋嬩笟鍔″敮涓�锛屾湰琛ㄤ腑涔熷敮涓�") private String processInstanceId; + @ApiModelProperty(value = "娴佺▼绫诲瀷") + @Dict(dicCode = "flow_type") + private String category; /**娴佺▼涓氬姟绠�瑕佹弿杩�*/ @Excel(name = "娴佺▼涓氬姟绠�瑕佹弿杩�", width = 15) @ApiModelProperty(value = "娴佺▼涓氬姟绠�瑕佹弿杩�") @@ -119,11 +122,30 @@ @TableField(exist = false) private String taskStatus; + @ApiModelProperty("鍘嗗彶娴佺▼瀹炰緥ID") + private transient String hisProcInsId; + private transient String flowName; /**娴佺▼寮�濮嬫椂闂�*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private transient Date startTime; /**娴佺▼缁撴潫鏃堕棿*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private transient Date endTime; + + /**褰撳墠鐢ㄦ埛*/ + private transient String currentUser; + + @ApiModelProperty(value = "鍓嶉┍鑺傜偣") + private transient String preNode; + + /**澶勭悊鏃堕暱锛堝垎閽燂級*/ + @TableField(exist = false) + @ApiModelProperty(value = "澶勭悊鏃堕暱锛堝垎閽燂級") + private transient String duration; + } -- Gitblit v1.9.3