From b1d7844cb525a36b1e0e193e9e96a2531d4badeb Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 22 2월 2022 14:23:26 +0900 Subject: [PATCH] - 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 - 워크플로우에 속해있는 부서 삭제 시 팝업 메시지 수정 --- src/main/java/kr/wisestone/owl/vo/IssueVo.java | 254 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 248 insertions(+), 6 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java index 61fa139..d7319c0 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 kr.wisestone.owl.domain.IssueTableConfig; import java.util.ArrayList; import java.util.List; @@ -30,6 +31,7 @@ private Long severityId; private String severityName; private String severityColor; + private String isApi; private ProjectVo projectVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜 private IssueStatusVo issueStatusVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜 private IssueTypeVo issueTypeVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜 @@ -45,16 +47,44 @@ 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 List<IssueTableConfigVo> issueTableConfigVos = Lists.newArrayList(); private Long attachedFileCount; private Long issueCommentCount; private String modifyByName; // 蹂�寃쎌옄 �젙蹂� - �씠�뒋 蹂�寃� �젙蹂� �긽�꽭 �솗�씤�뿉�꽌 �궗�슜 private WorkflowStatusVo workflowStatusVo; - private Long parentIssueId; // �긽�쐞 �씪媛� + private IssueVo parentIssueVo; + private Long parentIssueId; + 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(); + + private String companyName; + private String ispName; + private String hostingName; + + private int relPage; + private int relPageNumber; + private int relPageSize = 10; + private int relTotalPage = 1; + private Long relTotalCount = 0L; + + private int downPage; + private int downPageNumber; + private int downPageSize = 10; + private int downTotalPage = 1; + private Long downTotalCount = 0L; + + private Boolean inheritPartners; // �뙆�듃�꼫�젙蹂� �긽�냽�쑀臾� 泥댄겕 + private Long usePartner; public IssueVo(){} @@ -222,6 +252,14 @@ this.severityColor = severityColor; } + public String getIsApi() { + return isApi; + } + + public void setIsApi(String isApi) { + this.isApi = isApi; + } + public Boolean getModifyPermissionCheck() { return modifyPermissionCheck; } @@ -314,6 +352,10 @@ this.issueCustomFieldValueVos.add(issueCustomFieldValueVo); } + public void addIssueCustomFieldValueVos(List<IssueCustomFieldValueVo> issueCustomFieldValueVos) { + this.issueCustomFieldValueVos = issueCustomFieldValueVos; + } + public List<IssueCompanyVo> getIssueCompanyVos() { return issueCompanyVos; } @@ -398,6 +440,20 @@ this.issueRelations.add(issueRelationVo); } + public void addRelationIssueVo(IssueVo issueVo) { + if (this.issueRelationVos != null) { + this.issueRelationVos.add(issueVo); + } + } + + /*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; } @@ -410,13 +466,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; @@ -426,5 +482,191 @@ this.issueDownVos = issueDownVos; } + public void addIssueDownVo(IssueVo issueVo) { + if (this.issueDownVos != null) { + this.issueDownVos.add(issueVo); + } + } + 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; + } + + public List<IssueTableConfigVo> getIssueTableConfigVos() { + return issueTableConfigVos; + } + + public void setIssueTableConfigVos(List<IssueTableConfigVo> issueTableConfigVos) { + this.issueTableConfigVos = issueTableConfigVos; + } + + public void addIssueTableConfigVo(IssueTableConfigVo issueTableConfigVo) { + if (this.issueTableConfigVos != null) { + this.issueTableConfigVos.add(issueTableConfigVo); + } + } + + public Long getParentIssueId() { + return parentIssueId; + } + + public void setParentIssueId(Long parentIssueId) { + this.parentIssueId = parentIssueId; + } + + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getIspName() { + return ispName; + } + + public void setIspName(String ispName) { + this.ispName = ispName; + } + + public String getHostingName() { + return hostingName; + } + + public void setHostingName(String hostingName) { + this.hostingName = hostingName; + } + + public int getRelPageSize() { + return relPageSize; + } + + public void setRelPageSize(int relPageSize) { + this.relPageSize = relPageSize; + } + + public int getDownPageSize() { + return downPageSize; + } + + public void setDownPageSize(int downPageSize) { + this.downPageSize = downPageSize; + } + + public int getRelPage() { + return relPage; + } + + public void setRelPage(int relPage) { + this.relPage = relPage; + } + + public int getDownPage() { + return downPage; + } + + public void setDownPage(int downPage) { + this.downPage = downPage; + } + + public int getRelTotalPage() { + return relTotalPage; + } + + public void setRelTotalPage(int relTotalPage) { + this.relTotalPage = relTotalPage; + } + + public int getDownTotalPage() { + return downTotalPage; + } + + public void setDownTotalPage(int downTotalPage) { + this.downTotalPage = downTotalPage; + } + + public Long getRelTotalCount() { + return relTotalCount; + } + + public void setRelTotalCount(Long relTotalCount) { + this.relTotalCount = relTotalCount; + } + + public Long getDownTotalCount() { + return downTotalCount; + } + + public void setDownTotalCount(Long downTotalCount) { + this.downTotalCount = downTotalCount; + } + + public int getRelPageNumber() { + return relPageNumber; + } + + public void setRelPageNumber(int relPageNumber) { + this.relPageNumber = relPageNumber; + } + + public int getDownPageNumber() { + return downPageNumber; + } + + public void setDownPageNumber(int downPageNumber) { + this.downPageNumber = downPageNumber; + } + + public Boolean getInheritPartners() { + return inheritPartners; + } + + public void setInheritPartners(Boolean inheritPartners) { + this.inheritPartners = inheritPartners; + } + + public Long getUsePartner() { + return usePartner; + } + + public void setUsePartner(Long usePartner) { + this.usePartner = usePartner; + } } -- Gitblit v1.8.0