From 30ddd2cf095d2857ba1134fb3deaf51392ef1030 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 21:31:45 +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 | 133 ++++++++++++++++++++++++++++++--------------
1 files changed, 91 insertions(+), 42 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..7a64cb4 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -1,6 +1,7 @@
package kr.wisestone.owl.vo;
import com.google.common.collect.Lists;
+
import java.util.ArrayList;
import java.util.List;
@@ -35,9 +36,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(); //�떞�떦遺��꽌 異붽�
@@ -47,14 +45,23 @@
private List<IssueTypeCustomFieldVo> issueTypeCustomFieldVos = Lists.newArrayList();
private List<IssueCustomFieldValueVo> issueCustomFieldValueVos = Lists.newArrayList();
private List<IssueRelationVo> issueRelations = Lists.newArrayList();
+ //private List<IssueDownVo> issueDownVos = Lists.newArrayList();
private List<IssueVo> issueDownVos = Lists.newArrayList();
private List<IssueVo> issueRelationVos = Lists.newArrayList();
private Long attachedFileCount;
private Long issueCommentCount;
private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
- private String byName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜
private WorkflowStatusVo workflowStatusVo;
- private Long parentIssueId; // �긽�쐞 �씪媛�
+ private IssueVo parentIssueVo;
+ private int downIssueCount;
+ private int downIssueAllCount;
+ private List<Long> workflowDepartmentIds; // �썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 ID
+
+ private List<IssueCompanyVo> issueCompanyVos;
+ private List<IssueIspVo> issueIspVos;
+ private List<IssueHostingVo> issueHostingVos;
+
+ private List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
public IssueVo(){}
@@ -314,6 +321,34 @@
this.issueCustomFieldValueVos.add(issueCustomFieldValueVo);
}
+ public void addIssueCustomFieldValueVos(List<IssueCustomFieldValueVo> issueCustomFieldValueVos) {
+ this.issueCustomFieldValueVos = issueCustomFieldValueVos;
+ }
+
+ 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 +373,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 +387,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) {
@@ -406,6 +409,14 @@
this.issueRelations.add(issueRelationVo);
}
+ /*public void addIssueDownVo(IssueDownVo issueDownVo) {
+ if (this.issueDownVos == null){
+ this.issueDownVos = new ArrayList<>();
+ }
+
+ this.issueDownVos.add(issueDownVo);
+ }*/
+
public List<IssueVo> getIssueRelationIssueVos() { return this.issueRelationVos; }
public void setIssueRelationIssueVos(List<IssueVo> issueRelationVos) { this.issueRelationVos = issueRelationVos; }
@@ -418,13 +429,13 @@
this.departmentVos = departmentVos;
}
- public Long getParentIssueId() {
- return parentIssueId;
+ /*public List<IssueDownVo> getIssueDownVos() {
+ return issueDownVos;
}
- public void setParentIssueId(Long parentIssueId) {
- this.parentIssueId = parentIssueId;
- }
+ public void setIssueDownVos(List<IssueDownVo> issueDownVos) {
+ this.issueDownVos = issueDownVos;
+ }*/
public List<IssueVo> getIssueDownVos() {
return issueDownVos;
@@ -434,5 +445,43 @@
this.issueDownVos = issueDownVos;
}
+ public IssueVo getParentIssueVo() {
+ return parentIssueVo;
+ }
+ public void setParentIssueVo(IssueVo parentIssueVo) {
+ this.parentIssueVo = parentIssueVo;
+ }
+
+ public List<UsePartnerVo> getUsePartnerVos() {
+ return usePartnerVos;
+ }
+
+ public void setUsePartnerVos(List<UsePartnerVo> usePartnerVos) {
+ this.usePartnerVos = usePartnerVos;
+ }
+
+ public int getDownIssueCount() {
+ return downIssueCount;
+ }
+
+ public void setDownIssueCount(int downIssueCount) {
+ this.downIssueCount = downIssueCount;
+ }
+
+ public int getDownIssueAllCount() {
+ return downIssueAllCount;
+ }
+
+ public void setDownIssueAllCount(int downIssueAllCount) {
+ this.downIssueAllCount = downIssueAllCount;
+ }
+
+ public List<Long> getWorkflowDepartmentIds() {
+ return workflowDepartmentIds;
+ }
+
+ public void setWorkflowDepartmentIds(List<Long> workflowDepartmentIds) {
+ this.workflowDepartmentIds = workflowDepartmentIds;
+ }
}
--
Gitblit v1.8.0