From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/java/kr/wisestone/owl/domain/Department.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/Department.java b/src/main/java/kr/wisestone/owl/domain/Department.java
index 8537951..1fad1bd 100644
--- a/src/main/java/kr/wisestone/owl/domain/Department.java
+++ b/src/main/java/kr/wisestone/owl/domain/Department.java
@@ -1,10 +1,10 @@
package kr.wisestone.owl.domain;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
@Entity
public class Department extends BaseEntity implements Serializable {
@@ -16,6 +16,9 @@
private Long id;
private String departmentName;
private String departmentDescription;
+
+ @OneToMany(mappedBy = "department", cascade = {CascadeType.ALL}, orphanRemoval = true)
+ private Set<ProjectRoleDepartment> projectRoleDepartments = new HashSet<ProjectRoleDepartment>();
public Department() {
}
@@ -43,4 +46,25 @@
public void setDepartmentDescription(String departmentDescription) {
this.departmentDescription = departmentDescription;
}
+
+ public void addProjectRole(ProjectRole projectRole) {
+ if (this.projectRoleDepartments == null) {
+ this.projectRoleDepartments = new HashSet<>();
+ }
+ ProjectRoleDepartment projectRoleDepartment = new ProjectRoleDepartment(projectRole, this);
+
+ this.projectRoleDepartments.add(projectRoleDepartment);
+ }
+
+ public void removeProjectRole(ProjectRole projectRole) {
+ Iterator<ProjectRoleDepartment> iterator = this.projectRoleDepartments.iterator();
+
+ while (iterator.hasNext()) {
+ ProjectRoleDepartment projectRoleDepartment = iterator.next();
+ if (projectRole.getId().equals(projectRoleDepartment.getProjectRole().getId())) {
+ this.projectRoleDepartments.remove(projectRoleDepartment);
+ break;
+ }
+ }
+ }
}
--
Gitblit v1.8.0