From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 18 一月 2021 09:57:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java | 102 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 82 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java index 52f79fc..17473d0 100644 --- a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java +++ b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java @@ -1,6 +1,7 @@ package com.nanometer.smartlab.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; public class HazardousWaste implements Serializable { @@ -8,24 +9,24 @@ private Long id; /** 酸 acid **/ - private Float acid; + private BigDecimal acid; /** 碱 alkali **/ - private Float alkali; + private BigDecimal alkali; /** 有机 organic **/ - private Float organic; + private BigDecimal organic; /** 固废 solid **/ - private Float solid; + private BigDecimal solid; /** 医疗 medical **/ - private Float medical; + private BigDecimal medical; - /** 申请人 apply_person **/ + /** 确认者 apply_person **/ private String applyPerson; - /** 项目组 project **/ + /** 课题组 project **/ private String project; /** 部门 department **/ @@ -36,6 +37,21 @@ /** 创建时间 create_time **/ private Date createTime; + + /** 单号 tid **/ + private String tid; + + /** 状态 待解决、已解决、已拒绝 status **/ + private String status; + + /** 创建者 creator **/ + private String creator; + + /** 更新人 updator **/ + private String updator; + + /** 创建时间 updatetime **/ + private Date updatetime; /** id **/ public Long getId() { @@ -48,52 +64,52 @@ } /** 酸 acid **/ - public Float getAcid() { + public BigDecimal getAcid() { return acid; } /** 酸 acid **/ - public void setAcid(Float acid) { + public void setAcid(BigDecimal acid) { this.acid = acid; } /** 碱 alkali **/ - public Float getAlkali() { + public BigDecimal getAlkali() { return alkali; } /** 碱 alkali **/ - public void setAlkali(Float alkali) { + public void setAlkali(BigDecimal alkali) { this.alkali = alkali; } /** 有机 organic **/ - public Float getOrganic() { + public BigDecimal getOrganic() { return organic; } /** 有机 organic **/ - public void setOrganic(Float organic) { + public void setOrganic(BigDecimal organic) { this.organic = organic; } /** 固废 solid **/ - public Float getSolid() { + public BigDecimal getSolid() { return solid; } /** 固废 solid **/ - public void setSolid(Float solid) { + public void setSolid(BigDecimal solid) { this.solid = solid; } /** 医疗 medical **/ - public Float getMedical() { + public BigDecimal getMedical() { return medical; } /** 医疗 medical **/ - public void setMedical(Float medical) { + public void setMedical(BigDecimal medical) { this.medical = medical; } @@ -107,12 +123,12 @@ this.applyPerson = applyPerson == null ? null : applyPerson.trim(); } - /** 项目组 project **/ + /** 课题组 project **/ public String getProject() { return project; } - /** 项目组 project **/ + /** 课题组 project **/ public void setProject(String project) { this.project = project == null ? null : project.trim(); } @@ -146,4 +162,50 @@ public void setCreateTime(Date createTime) { this.createTime = createTime; } -} \ No newline at end of file + + /** 单号 tid **/ + public String getTid() { + return tid; + } + + /** 单号 tid **/ + public void setTid(String tid) { + this.tid = tid == null ? null : tid.trim(); + } + + /** 状态 待解决、已解决、已拒绝 status **/ + public String getStatus() { + return status; + } + + /** 状态 待解决、已解决、已拒绝 status **/ + public void setStatus(String status) { + this.status = status == null ? null : status.trim(); + } + + /** 创建人 creator **/ + public String getCreator() { + return creator; + } + + /** 创建人 creator **/ + public void setCreator(String creator) { + this.creator = creator == null ? null : creator.trim(); + } + + public String getUpdator() { + return updator; + } + + public void setUpdator(String updator) { + this.updator = updator; + } + + public Date getUpdatetime() { + return updatetime; + } + + public void setUpdatetime(Date updatetime) { + this.updatetime = updatetime; + } +} -- Gitblit v1.9.2