From e7c0ff25749d77b25fdad019861c1a5a444b21dd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 00:36:48 +0900
Subject: [PATCH] 언어팩 수정, 간단한 오류 수정 [프론트]
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index ac137a7..c87e482 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -573,13 +573,6 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂� 異붽�
this.setIssueCustomFieldValue(issueVos, issueCondition);
- // �뾽泥� �젙蹂� 異붽�
- //this.setIssueCompanyField(issueVos, issueCondition);
- // ISP �젙蹂� 異붽�
- //this.setIssueIspField(issueVos, issueCondition);
- // HOSTING �젙蹂� 異붽�
- //this.setIssueHostingField(issueVos, issueCondition);
-
}
// 寃��깋 議곌굔�쓣 留뚮뱺�떎
@@ -815,7 +808,7 @@
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
- this.setDownIssues(issue, issueVo);
+ this.setDownIssues(issue, issueVo); //�븯�쐞 �씠�뒋 �꽭�똿
break;
@@ -834,8 +827,22 @@
// �븯�쐞 �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
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);
+ List<IssueVo> resultList = new ArrayList<>();
+
+ 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); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(downIssue, downIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+ }
+ resultList.add(downIssueVo);
+ }
+ issueVo.setIssueDownVos(resultList); //�봽濡좏듃�뿉�꽌 List�삎�깭濡� 諛쏆븘以섏꽌 由ъ뒪�듃 �삎�떇�쑝濡� 蹂대궡以�
}
// �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
@@ -908,6 +915,12 @@
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); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(relationIssue, relIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
issueVo.addIssueRelationVo(issueRelationVo);
}
} else {
@@ -1770,6 +1783,14 @@
// �씠�뒋 �긽�깭 蹂�寃�
this.modifyIssueStatus(issueForm);
}
+
+ // �떞�떦 遺��꽌 �닔�젙
+ if (issueForm.getDepartmentIds().size() > 0) {
+ Issue issue = this.getIssue(issueForm.getId());
+ Project project = this.projectService.getProject(issueForm.getProjectId());
+
+ this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ }
}
// �씠�뒋 Import �슜 �뿊�� �뀥�뵆由� �떎�슫濡쒕뱶
--
Gitblit v1.8.0