From 72cbca5a2e1263ad691bc7b3c0080691640309ab Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 11:18:01 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/domain/IssueType.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueType.java b/src/main/java/kr/wisestone/owl/domain/IssueType.java
index ac7f750..c100ca0 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueType.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueType.java
@@ -27,8 +27,25 @@
@JoinColumn(name = "workflow_id")
private Workflow workflow;
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "project_id")
+ private Project project;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "company_id")
+ private CompanyField companyField;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "isp_id")
+ private IspField ispField;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "hosting_id")
+ private HostingField hostingField;
+
@OneToMany(mappedBy = "issueType", cascade = { CascadeType.ALL }, orphanRemoval = true)
private Set<IssueTypeCustomField> issueTypeCustomFields = new HashSet<>();
+
public IssueType(){}
@@ -95,4 +112,36 @@
public void setIssueTypeCustomFields(Set<IssueTypeCustomField> issueTypeCustomFields) {
this.issueTypeCustomFields = issueTypeCustomFields;
}
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ public CompanyField getCompanyField() {
+ return companyField;
+ }
+
+ public void setCompanyField(CompanyField companyField) {
+ this.companyField = companyField;
+ }
+
+ public IspField getIspField() {
+ return ispField;
+ }
+
+ public void setIspField(IspField ispField) {
+ this.ispField = ispField;
+ }
+
+ public HostingField getHostingField() {
+ return hostingField;
+ }
+
+ public void setHostingField(HostingField hostingField) {
+ this.hostingField = hostingField;
+ }
}
--
Gitblit v1.8.0