From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 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..9309aa9 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysLaboratoryContainer.java
@@ -1,14 +1,19 @@
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.*;
+
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
/**
* Created by johnny on 17/11/23.
*/
@SuppressWarnings("serial")
+@JsonInclude(NON_NULL)
public class SysLaboratoryContainer implements Serializable {
private String id;
@@ -27,8 +32,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 +162,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