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/SysLaboratoryContainer.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java b/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
index 69a2b6d..881ce2d 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.sql.Timestamp;
+import java.util.*;
/**
* Created by johnny on 17/11/23.
@@ -27,8 +28,8 @@
private String characterRight;
private String controllerCode;
private String controllerName;
- private String projectId;
-
+ private List<String> projects;
+ private String project;
public String getControllerName() {
return controllerName;
}
@@ -157,11 +158,32 @@
this.controllerCode = controllerCode;
}
- public String getProjectId() {
- return projectId;
+ public List<String> getProjects() {
+ if (projects == null && project != null){
+ this.projects = Arrays.asList(this.project.split(","));
+ }
+ return projects;
}
- public void setProjectId(String projectId) {
- this.projectId = projectId;
+ 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