From 189c4e4ed8e973f89555f7187f4062227976c547 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 16 Oct 2024 14:50:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BA=E8=BD=A6=E8=BE=86=E3=80=81?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E5=92=8C=E7=89=B9=E6=AE=8A=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6=E5=92=8C=E6=8A=84=E9=80=81?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ProcessCarEsApproval、ProcessMachineEsApproval 和 ProcessSpecialEsApproval 三个实体类中 - 新增附件和抄送人员字段，使用 @Dict 注解进行字典转换 - 附件字段关联 sys_oss 表的 fileName 和 id 字段 -抄送人员字段关联 sys_user表的 realname 和 id 字段 --- .../entity/ProcessCarEsApproval.java | 15 +++++++++++++++ .../entity/ProcessMachineEsApproval.java | 15 +++++++++++++++ .../entity/ProcessSpecialEsApproval.java | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/entity/ProcessCarEsApproval.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/entity/ProcessCarEsApproval.java index 621f05d8..e377352c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/entity/ProcessCarEsApproval.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/entity/ProcessCarEsApproval.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -78,6 +79,20 @@ public class ProcessCarEsApproval implements Serializable { @ApiModelProperty(value = "业务JSON数据") private String businessJson; + /** + * 附件 + */ + @Dict(dictTable = "sys_oss", dicText = "fileName", dicCode = "id") + @ApiModelProperty(value = "附件") + private String attach; + + /** + * 抄送人员 + */ + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + @ApiModelProperty(value = "抄送人员") + private String copyUser; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/entity/ProcessMachineEsApproval.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/entity/ProcessMachineEsApproval.java index 035f6b68..53e1a432 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/entity/ProcessMachineEsApproval.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/entity/ProcessMachineEsApproval.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -78,6 +79,20 @@ public class ProcessMachineEsApproval implements Serializable { @ApiModelProperty(value = "业务JSON数据") private String businessJson; + /** + * 附件 + */ + @Dict(dictTable = "sys_oss", dicText = "fileName", dicCode = "id") + @ApiModelProperty(value = "附件") + private String attach; + + /** + * 抄送人员 + */ + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + @ApiModelProperty(value = "抄送人员") + private String copyUser; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java index 5fc596b3..c30fcb94 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -78,6 +79,20 @@ public class ProcessSpecialEsApproval implements Serializable { @ApiModelProperty(value = "业务JSON数据") private String businessJson; + /** + * 附件 + */ + @Dict(dictTable = "sys_oss", dicText = "fileName", dicCode = "id") + @ApiModelProperty(value = "附件") + private String attach; + + /** + * 抄送人员 + */ + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") + @ApiModelProperty(value = "抄送人员") + private String copyUser; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file