src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/java/kr/wisestone/owl/vo/IssueRelationVo.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
src/main/java/kr/wisestone/owl/vo/IssueVo.java | ●●●●● 패치 | 보기 | raw | blame | 히스토리 |
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -808,7 +808,7 @@ this.setAttachedFiles(issue, issueVo); // 첨부 파일 정보 셋팅 this.setIssueCustomFields(issue, issueVo); // 사용자 정의 필드 값 정보 셋팅 this.setRelationIssue(issue, issueVo); //연관 일감 셋팅 this.setDownIssues(issue, issueVo); this.setDownIssues(issue, issueVo); //하위 이슈 세팅 break; @@ -827,8 +827,19 @@ // 하위 이슈 정보를 셋팅한다 private void setDownIssues(Issue issue, IssueVo issueVo) { List<Issue> downIssues = this.issueRepository.findByParentIssueId(issue.getId()); List<IssueVo> issueVos = ConvertUtil.convertObjectsToClasses(downIssues, IssueVo.class); issueVo.setIssueDownVos(issueVos); List<IssueVo> downIssueVos = ConvertUtil.convertObjectsToClasses(downIssues, IssueVo.class); for(IssueVo downIssueVo : downIssueVos){ for(Issue downIssue : downIssues){ downIssueVo.setTitle(downIssue.getTitle()); downIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class)); downIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class)); downIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class)); this.setRegister(downIssue, downIssueVo); // 등록자 this.setIssueDepartment(downIssue, downIssueVo); // 담당부서 정보 셋팅 } issueVo.setIssueDownVos(downIssueVo); } } // 이슈 상세 정보를 셋팅한다. @@ -901,6 +912,11 @@ issueRelationVo.setIssueRelation(relIssueVo); issueRelationVo.setTitle(relationIssue.getTitle()); issueRelationVo.setIssueTypeVo(ConvertUtil.copyProperties(relationIssue.getIssueType(), IssueTypeVo.class)); issueRelationVo.setPriorityVo(ConvertUtil.copyProperties(relationIssue.getPriority(), PriorityVo.class)); issueRelationVo.setSeverityVo(ConvertUtil.copyProperties(relationIssue.getSeverity(), SeverityVo.class)); this.setRegister(relationIssue, relIssueVo); // 등록자 this.setIssueDepartment(relationIssue, relIssueVo); // 담당부서 정보 셋팅 issueVo.addIssueRelationVo(issueRelationVo); } } else { src/main/java/kr/wisestone/owl/vo/IssueRelationVo.java
@@ -1,11 +1,22 @@ package kr.wisestone.owl.vo; import com.google.common.collect.Lists; import java.util.List; public class IssueRelationVo extends BaseVo { private Long id; private Long relationIssueType; private IssueVo issue; private IssueVo issueRelation; private String title; private IssueTypeVo issueTypeVo; // 이슈 상세에서 사용 private PriorityVo priorityVo; // 이슈 상세에서 사용 private SeverityVo severityVo; // 이슈 상세에서 사용 private UserVo registerVo; // 이슈 상세에서 사용 private List<DepartmentVo> departmentVos = Lists.newArrayList(); //담당부서 private Boolean modifyPermissionCheck = Boolean.FALSE; public IssueRelationVo() {} @@ -37,4 +48,51 @@ public void setTitle(String title) { this.title = title; } public IssueTypeVo getIssueTypeVo() { return issueTypeVo; } public void setIssueTypeVo(IssueTypeVo issueTypeVo) { this.issueTypeVo = issueTypeVo; } public PriorityVo getPriorityVo() { return priorityVo; } public void setPriorityVo(PriorityVo priorityVo) { this.priorityVo = priorityVo; } public SeverityVo getSeverityVo() { return severityVo; } public void setSeverityVo(SeverityVo severityVo) { this.severityVo = severityVo; } public UserVo getRegisterVo() { return registerVo; } public void setRegisterVo(UserVo registerVo) { this.registerVo = registerVo; } public List<DepartmentVo> getDepartmentVos() { return departmentVos; } public void setDepartmentVos(List<DepartmentVo> departmentVos) { this.departmentVos = departmentVos; } public Boolean getModifyPermissionCheck() { return modifyPermissionCheck; } public void setModifyPermissionCheck(Boolean modifyPermissionCheck) { this.modifyPermissionCheck = modifyPermissionCheck; } } src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -46,7 +46,7 @@ private List<IssueTypeCustomFieldVo> issueTypeCustomFieldVos = Lists.newArrayList(); private List<IssueCustomFieldValueVo> issueCustomFieldValueVos = Lists.newArrayList(); private List<IssueRelationVo> issueRelations = Lists.newArrayList(); private List<IssueVo> issueDownVos = Lists.newArrayList(); private IssueVo issueDownVos; private List<IssueVo> issueRelationVos = Lists.newArrayList(); private Long attachedFileCount; private Long issueCommentCount; @@ -415,11 +415,11 @@ this.departmentVos = departmentVos; } public List<IssueVo> getIssueDownVos() { public IssueVo getIssueDownVos() { return issueDownVos; } public void setIssueDownVos(List<IssueVo> issueDownVos) { public void setIssueDownVos(IssueVo issueDownVos) { this.issueDownVos = issueDownVos; }