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/HazardousWaste.java | 167 ++++---------------------------------------------------
1 files changed, 13 insertions(+), 154 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
index 61d5995..6d57aac 100644
--- a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
+++ b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
@@ -1,9 +1,14 @@
package com.nanometer.smartlab.entity;
+import lombok.Getter;
+import lombok.Setter;
+
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+@Getter
+@Setter
public class HazardousWaste implements Serializable {
/** id **/
private Long id;
@@ -24,16 +29,16 @@
private BigDecimal medical;
/** 确认者 apply_person **/
- private String applyPerson;
+ private Long applyPerson;
/** 课题组 project **/
- private String project;
+ private Long projectId;
/** 部门 department **/
private String department;
/** 单位 unit **/
- private String unit;
+ private Long unit;
/** 创建时间 create_time **/
private Date createTime;
@@ -53,159 +58,13 @@
/** 创建时间 updatetime **/
private Date updatetime;
- /** id **/
- public Long getId() {
- return id;
- }
- /** id **/
- public void setId(Long id) {
- this.id = id;
- }
- /** 酸 acid **/
- public BigDecimal getAcid() {
- return acid;
- }
+ //非数据库字段
+ /** 课题组 project **/
+ private String projectName;
- /** 酸 acid **/
- public void setAcid(BigDecimal acid) {
- this.acid = acid;
- }
+ private String applyPersonName;
- /** 碱 alkali **/
- public BigDecimal getAlkali() {
- return alkali;
- }
-
- /** 碱 alkali **/
- public void setAlkali(BigDecimal alkali) {
- this.alkali = alkali;
- }
-
- /** 有机 organic **/
- public BigDecimal getOrganic() {
- return organic;
- }
-
- /** 有机 organic **/
- public void setOrganic(BigDecimal organic) {
- this.organic = organic;
- }
-
- /** 固废 solid **/
- public BigDecimal getSolid() {
- return solid;
- }
-
- /** 固废 solid **/
- public void setSolid(BigDecimal solid) {
- this.solid = solid;
- }
-
- /** 医疗 medical **/
- public BigDecimal getMedical() {
- return medical;
- }
-
- /** 医疗 medical **/
- public void setMedical(BigDecimal medical) {
- this.medical = medical;
- }
-
- /** 申请人 apply_person **/
- public String getApplyPerson() {
- return applyPerson;
- }
-
- /** 申请人 apply_person **/
- public void setApplyPerson(String applyPerson) {
- this.applyPerson = applyPerson == null ? null : applyPerson.trim();
- }
-
- /** 课题组 project **/
- public String getProject() {
- return project;
- }
-
- /** 课题组 project **/
- public void setProject(String project) {
- this.project = project == null ? null : project.trim();
- }
-
- /** 部门 department **/
- public String getDepartment() {
- return department;
- }
-
- /** 部门 department **/
- public void setDepartment(String department) {
- this.department = department == null ? null : department.trim();
- }
-
- /** 单位 unit **/
- public String getUnit() {
- return unit;
- }
-
- /** 单位 unit **/
- public void setUnit(String unit) {
- this.unit = unit == null ? null : unit.trim();
- }
-
- /** 创建时间 create_time **/
- public Date getCreateTime() {
- return createTime;
- }
-
- /** 创建时间 create_time **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- /** 单号 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;
- }
+ private String unitName;
}
--
Gitblit v1.9.2