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/SysLaboratory.java | 136 +++++---------------------------------------
1 files changed, 17 insertions(+), 119 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java b/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
index c947a6d..d99bf82 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
@@ -1,7 +1,10 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
import java.io.Serializable;
import java.sql.Timestamp;
@@ -13,140 +16,35 @@
/**
* Created by johnny on 17/11/23.
*/
+@Getter
+@Setter
@SuppressWarnings("serial")
@JsonInclude(NON_NULL)
+@JsonIgnoreProperties(value = {"handler"})
public class SysLaboratory implements Serializable {
+ private static final long serialVersionUID = 1L;
- private String id;
- private String type;//实验室类型
+ private Long id;
+ private Long type;//实验室类型
private String name;//实验室名
private String infoCode;//状态码
private String barCode;//地点条码
private String location1;//使用地点-楼号
private String location2;//使用地点-地址号
- private String department;//负责部门
+ private Long department;//负责部门
private Timestamp createTime;
private Timestamp updateTime;
private ValidFlag validFlag;
- //显示
- private List<String> projects;
//存放
private String project;
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
+ //非数据库字段
+ //显示
+ private List<SysProject> projects;
+ private List<SysLaboratoryContainer> laboratoryContainers;
+ private String typeName;//实验室类型名称
+ private String location;
+ private String departmentName;
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getInfoCode() {
- return infoCode;
- }
-
- public void setInfoCode(String infoCode) {
- this.infoCode = infoCode;
- }
-
- public String getBarCode() {
- return barCode;
- }
-
- public void setBarCode(String barCode) {
- this.barCode = barCode;
- }
-
- public String getLocation1() {
- return location1;
- }
-
- public void setLocation1(String location1) {
- this.location1 = location1;
- }
-
- public String getLocation2() {
- return location2;
- }
-
- public void setLocation2(String location2) {
- this.location2 = location2;
- }
-
- 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 ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public String getDepartment() {
- return department;
- }
-
- public void setDepartment(String department) {
- this.department = department;
- }
-
- public List<String> getProjects() {
- if (projects == null && project != null){
- this.projects = Arrays.asList(this.project.split(","));
- }
- return projects;
- }
-
- public void setProjects(List<String> projects) {
- this.projects = projects;
- }
-
- public String getProject() {
- if (this.project == null){
- this.project = "";
- if (projects != null && projects.size() > 0) {
- projects.forEach(pro->{
- this.project += ",";
- this.project += pro;
- });
- this.project = this.project.substring(1);
- }
- }
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
}
--
Gitblit v1.9.2