From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/entity/SysUser.java | 209 ++++++---------------------------------------------
1 files changed, 26 insertions(+), 183 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysUser.java b/src/main/java/com/nanometer/smartlab/entity/SysUser.java
index 30c124f..666fd30 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysUser.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysUser.java
@@ -1,214 +1,57 @@
package com.nanometer.smartlab.entity;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.sql.Timestamp;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.entity.enumtype.Waster;
+import lombok.Getter;
+import lombok.Setter;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
/**
* Created by johnny on 17/11/18.
*/
+@Getter
+@Setter
+@JsonInclude(NON_NULL)
public class SysUser implements Serializable {
- private String id;
+ private Long id;
private String arp;
private String account;
private String password;
- private String company;
- private String department;
+ private Long company;
+ private Long department;
private String name;
private String phone;
private String email;
private String memo;
private String idCard;
- private int point;
- private ApproverFlag approverFlag;
+ private ApproverFlag approverFlag;
+ private Long roleId;
private SeeFlag seeFlag;
- private String roleId;
private ValidFlag validFlag;
private Timestamp createTime;
+ private Integer point;
private Timestamp updateTime;
+ private Long projectId;
+ private Waster waster;
+ // 图片的相对地址
+ private String url;
+ // 考试分数
+ private BigDecimal score;
+
+
+ //非数据库字段
private String containerCodeList;
private String roleName;
- private String project;
- private Waster waster;
+ private String departmentName;
+ private String projectName;
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public int getPoint() {
- return point;
- }
-
- public void setPoint(int point) {
- this.point = point;
- }
-
- public String getArp() {
- return arp;
- }
-
- public void setArp(String arp) {
- this.arp = arp;
- }
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- public String getDepartment() {
- return department;
- }
-
- public void setDepartment(String department) {
- this.department = department;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public String getIdCard() {
- return idCard;
- }
-
- public void setIdCard(String idCard) {
- this.idCard = idCard;
- }
-
- public ApproverFlag getApproverFlag() {
- return approverFlag;
- }
-
- public void setApproverFlag(ApproverFlag approverFlag) {
- this.approverFlag = approverFlag;
- }
-
- public String getRoleId() {
- return roleId;
- }
-
- public void setRoleId(String roleId) {
- this.roleId = roleId;
- }
-
- public ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public String getRoleName() {
- return roleName;
- }
-
- public void setRoleName(String roleName) {
- this.roleName = roleName;
- }
-
- public SeeFlag getSeeFlag() {
- return seeFlag;
- }
-
- public void setSeeFlag(SeeFlag seeFlag) {
- this.seeFlag = seeFlag;
- }
-
- public String getContainerCodeList() {
- return containerCodeList;
- }
-
- public void setContainerCodeList(String containerCodeList) {
- this.containerCodeList = containerCodeList;
- }
-
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- public Waster getWaster() {
- return waster;
- }
-
- public void setWaster(Waster waster) {
- this.waster = waster;
- }
}
--
Gitblit v1.9.2