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 | 143 ++++++++++-------------------------------------
1 files changed, 32 insertions(+), 111 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..6d57aac 100644
--- a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
+++ b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
@@ -1,149 +1,70 @@
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;
/** 酸 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 **/
- private String applyPerson;
+ /** 确认者 apply_person **/
+ private Long applyPerson;
- /** 项目组 project **/
- private String project;
+ /** 课题组 project **/
+ private Long projectId;
/** 部门 department **/
private String department;
/** 单位 unit **/
- private String unit;
+ private Long unit;
/** 创建时间 create_time **/
private Date createTime;
- /** id **/
- public Long getId() {
- return id;
- }
+ /** 单号 tid **/
+ private String tid;
- /** id **/
- public void setId(Long id) {
- this.id = id;
- }
+ /** 状态 待解决、已确认、已拒绝 status **/
+ private String status;
- /** 酸 acid **/
- public Float getAcid() {
- return acid;
- }
+ /** 创建者 creator **/
+ private String creator;
- /** 酸 acid **/
- public void setAcid(Float acid) {
- this.acid = acid;
- }
+ /** 更新人 updator **/
+ private String updator;
- /** 碱 alkali **/
- public Float getAlkali() {
- return alkali;
- }
+ /** 创建时间 updatetime **/
+ private Date updatetime;
- /** 碱 alkali **/
- public void setAlkali(Float alkali) {
- this.alkali = alkali;
- }
- /** 有机 organic **/
- public Float getOrganic() {
- return organic;
- }
- /** 有机 organic **/
- public void setOrganic(Float organic) {
- this.organic = organic;
- }
+ //非数据库字段
+ /** 课题组 project **/
+ private String projectName;
- /** 固废 solid **/
- public Float getSolid() {
- return solid;
- }
+ private String applyPersonName;
- /** 固废 solid **/
- public void setSolid(Float solid) {
- this.solid = solid;
- }
-
- /** 医疗 medical **/
- public Float getMedical() {
- return medical;
- }
-
- /** 医疗 medical **/
- public void setMedical(Float 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;
- }
-}
\ No newline at end of file
+ private String unitName;
+}
--
Gitblit v1.9.2