From b2e3d6532dbbb3929e01a598dcef7eb07f39b826 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 11 七月 2025 09:30:27 +0800 Subject: [PATCH] 保洁巡检本周代码 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 77dc6b6..7034d98 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -11,6 +11,7 @@ import javax.validation.constraints.Email; import javax.validation.constraints.Size; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -33,21 +34,28 @@ /** 部门ID */ //@Excel(name = "部门编号", type = Type.IMPORT) @ApiModelProperty(value = "部门id") - private Long deptId; + @TableField("deptId") + private String deptId; /** 用户账号 */ //@Excel(name = "登录名称") @ApiModelProperty(value = "登录名称") private String userName; - @TableField("dept_type") @ApiModelProperty(value = "部门类型 1项目部 2部门") + @TableField("deptType") private Integer deptType; @TableField("code") @ApiModelProperty(value = "编号") - private Integer code; + private String code; @TableField("templateId") @ApiModelProperty(value = "所属任务模板id") private String templateId; + @TableField(exist = false) + @ApiModelProperty(value = "合格率") + private BigDecimal rate; + @TableField(exist = false) + @ApiModelProperty(value = "完成率") + private BigDecimal finish; /** 用户昵称 */ //@Excel(name = "用户名称") @@ -191,12 +199,12 @@ return userId != null && 1L == userId; } - public Long getDeptId() + public String getDeptId() { return deptId; } - public void setDeptId(Long deptId) + public void setDeptId(String deptId) { this.deptId = deptId; } -- Gitblit v1.7.1