From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 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..7eb89f5 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysLaboratory.java
@@ -4,6 +4,8 @@
import java.io.Serializable;
import java.sql.Timestamp;
+import java.util.Arrays;
+import java.util.List;
/**
* Created by johnny on 17/11/23.
@@ -22,6 +24,10 @@
private Timestamp createTime;
private Timestamp updateTime;
private ValidFlag validFlag;
+ //显示
+ private List<String> projects;
+ //存放
+ private String project;
public String getId() {
return id;
@@ -103,11 +109,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