From 6a5fb9dcd9fe96d62b5dbbcc2bd48db478706389 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 15:56:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index ab9768d..0d975f9 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -1,6 +1,8 @@
package kr.wisestone.owl.vo;
import com.google.common.collect.Lists;
+import kr.wisestone.owl.domain.IssueTableConfig;
+
import java.util.ArrayList;
import java.util.List;
@@ -35,9 +37,6 @@
private PriorityVo priorityVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private SeverityVo severityVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private UserVo registerVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
- private CompanyFieldVo companyFieldVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
- private IspFieldVo ispFieldVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
- private HostingFieldVo hostingFieldVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private Boolean modifyPermissionCheck = Boolean.FALSE;
private List<UserVo> userVos = Lists.newArrayList();
private List<DepartmentVo> departmentVos = Lists.newArrayList(); //�떞�떦遺��꽌 異붽�
@@ -52,9 +51,15 @@
private Long attachedFileCount;
private Long issueCommentCount;
private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
- private String byName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
private WorkflowStatusVo workflowStatusVo;
- private Long parentIssueId; // �긽�쐞 �씪媛�
+ //private Long parentIssueId; // �긽�쐞 �씪媛�
+ private IssueVo parentIssueVo;
+
+ private List<IssueCompanyVo> issueCompanyVos;
+ private List<IssueIspVo> issueIspVos;
+ private List<IssueHostingVo> issueHostingVos;
+
+ private List<UseCompanyVo> useCompanyVo = Lists.newArrayList();
public IssueVo(){}
@@ -314,6 +319,30 @@
this.issueCustomFieldValueVos.add(issueCustomFieldValueVo);
}
+ public List<IssueCompanyVo> getIssueCompanyVos() {
+ return issueCompanyVos;
+ }
+
+ public void setIssueCompanyVos(List<IssueCompanyVo> issueCompanyVos) {
+ this.issueCompanyVos = issueCompanyVos;
+ }
+
+ public List<IssueIspVo> getIssueIspVos() {
+ return issueIspVos;
+ }
+
+ public void setIssueIspVos(List<IssueIspVo> issueIspVos) {
+ this.issueIspVos = issueIspVos;
+ }
+
+ public List<IssueHostingVo> getIssueHostingVos() {
+ return issueHostingVos;
+ }
+
+ public void setIssueHostingVos(List<IssueHostingVo> issueHostingVos) {
+ this.issueHostingVos = issueHostingVos;
+ }
+
public Long getAttachedFileCount() {
return attachedFileCount;
}
@@ -338,30 +367,6 @@
this.registerVo = registerVo;
}
- public CompanyFieldVo getCompanyFieldVo() {
- return companyFieldVo;
- }
-
- public void setCompanyFieldVo(CompanyFieldVo companyFieldVo) {
- this.companyFieldVo = companyFieldVo;
- }
-
- public IspFieldVo getIspFieldVo() {
- return ispFieldVo;
- }
-
- public void setIspFieldVo(IspFieldVo ispFieldVo) {
- this.ispFieldVo = ispFieldVo;
- }
-
- public HostingFieldVo getHostingFieldVo() {
- return hostingFieldVo;
- }
-
- public void setHostingFieldVo(HostingFieldVo hostingFieldVo) {
- this.hostingFieldVo = hostingFieldVo;
- }
-
public List<IssueHistoryVo> getIssueHistoryVos() {
return issueHistoryVos;
}
@@ -376,14 +381,6 @@
public void setModifyByName(String modifyByName) {
this.modifyByName = modifyByName;
- }
-
- public String getByName() {
- return byName;
- }
-
- public void setByName(String byName) {
- this.byName = byName;
}
public void setWorkflowStatusVo(WorkflowStatusVo workflowStatusVo) {
@@ -418,14 +415,6 @@
this.departmentVos = departmentVos;
}
- public Long getParentIssueId() {
- return parentIssueId;
- }
-
- public void setParentIssueId(Long parentIssueId) {
- this.parentIssueId = parentIssueId;
- }
-
public List<IssueVo> getIssueDownVos() {
return issueDownVos;
}
@@ -434,5 +423,19 @@
this.issueDownVos = issueDownVos;
}
+ public IssueVo getParentIssueVo() {
+ return parentIssueVo;
+ }
+ public void setParentIssueVo(IssueVo parentIssueVo) {
+ this.parentIssueVo = parentIssueVo;
+ }
+
+ public List<UseCompanyVo> getUseCompanyVo() {
+ return useCompanyVo;
+ }
+
+ public void setUseCompanyVo(List<UseCompanyVo> useCompanyVo) {
+ this.useCompanyVo = useCompanyVo;
+ }
}
--
Gitblit v1.8.0