From 1123d12eb51d23edcd4a39660ef8cd47802b931d Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 30 一月 2024 11:06:32 +0800
Subject: [PATCH] change config
---
src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java b/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
index 7f37c85..c947a6d 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
@@ -1,14 +1,20 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import java.io.Serializable;
import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.List;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
/**
* Created by johnny on 17/11/23.
*/
@SuppressWarnings("serial")
+@JsonInclude(NON_NULL)
public class SysLaboratory implements Serializable {
private String id;
@@ -22,6 +28,10 @@
private Timestamp createTime;
private Timestamp updateTime;
private ValidFlag validFlag;
+ //显示
+ private List<String> projects;
+ //存放
+ private String project;
public String getId() {
return id;
@@ -103,11 +113,40 @@
this.validFlag = validFlag;
}
- public String getDepartment() {
- return department;
- }
+ public String getDepartment() {
+ return department;
+ }
- public void setDepartment(String department) {
- this.department = 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