From f2f8241dd52ef12ec109f6f4f0f13042055338ac Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 14 二月 2025 14:55:56 +0800 Subject: [PATCH] 修改指派设备 修改设备结构树权限 优化查询 优化排序 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java index 28464e7..004f4fa 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java @@ -6,13 +6,14 @@ import io.swagger.annotations.Api; import lombok.Data; import lombok.NoArgsConstructor; +import org.jeecg.common.aspect.annotation.Dict; import java.util.Date; @Data @NoArgsConstructor @TableName("nc_assign_file_stream") -@Api(value= "娴佺▼鎿嶄綔") +@Api(value= "DNC鎸囨淳璁惧娴佺▼鎿嶄綔") public class AssignFileStream { @TableId(value = "stream_id") private String streamId; @@ -24,6 +25,8 @@ private String partsId; @TableField(value = "process_id") private String processId; + @TableField(value = "step_id") + private String stepId; @TableField(value = "doc_id") private String docId; @TableField(value = "file_id") @@ -45,6 +48,7 @@ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date approveTime; @TableField(value = "status") + @Dict(dicCode = "dnc_assign_stream_status") private Integer status; @JsonIgnore @TableField(value = "create_time", select = false, fill = FieldFill.INSERT) @@ -62,4 +66,10 @@ @TableLogic @TableField(value = "delete_flag", select = false) private Integer deleteFlag = 0; + + /**鎸囨淳璁惧涓撶敤-鎵�灞濱D*/ + private transient String attributionId; + + /**鎸囨淳璁惧涓撶敤-鎵�灞瀟ype*/ + private transient String attributionType; } -- Gitblit v1.9.3