修改课题管理bug

kongzy

2023-11-28 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7

 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;
    }
}