From 536405414979d1ef722c7374e7d9d1b99af05808 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 06 12월 2021 13:50:48 +0900
Subject: [PATCH] 연관이슈, 하위이슈 - 이슈상태 추가
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 27 ++++++++++++++++++---------
src/main/java/kr/wisestone/owl/vo/IssueRelationVo.java | 9 +++++++++
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 5 ++---
3 files changed, 29 insertions(+), 12 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 9103bfb..bb52d12 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -471,7 +471,6 @@
// HOSTING �젙蹂� ���옣
this.issueHostingService.modifyIssueHostingField(issue, issueForm.getIssueHostingFields());
-
// 泥⑤� �뙆�씪 ���옣
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
@@ -1149,15 +1148,20 @@
if(downIssues != null && downIssues.size()>0){
List<IssueVo> resultList = new ArrayList<>();
for(Issue downIssue : downIssues){
- IssueVo newIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
- newIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
- newIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
- newIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
- this.setRegister(downIssue, newIssueVo); // �벑濡앹옄
- this.setIssueDepartment(downIssue, newIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
- this.setIssueCustomFields(downIssue, newIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+ IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
+ downIssueVo.setIssueTypeVo(ConvertUtil.copyProperties(downIssue.getIssueType(), IssueTypeVo.class));
+ downIssueVo.setPriorityVo(ConvertUtil.copyProperties(downIssue.getPriority(), PriorityVo.class));
+ downIssueVo.setSeverityVo(ConvertUtil.copyProperties(downIssue.getSeverity(), SeverityVo.class));
+ //�씠�뒋 �긽�깭 異붽�
+ IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(downIssue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");
+ issueStatusVo.setIssueStatusType(downIssue.getIssueStatus().getIssueStatusType().toString());
+ downIssueVo.setIssueStatusVo(issueStatusVo);
- resultList.add(newIssueVo);
+ this.setRegister(downIssue, downIssueVo); // �벑濡앹옄
+ this.setIssueDepartment(downIssue, downIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ this.setIssueCustomFields(downIssue, downIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
+
+ resultList.add(downIssueVo);
}
issueVo.setIssueDownVos(resultList);
}
@@ -1251,6 +1255,11 @@
issueRelationVo.setIssueTypeVo(ConvertUtil.copyProperties(relationIssue.getIssueType(), IssueTypeVo.class));
issueRelationVo.setPriorityVo(ConvertUtil.copyProperties(relationIssue.getPriority(), PriorityVo.class));
issueRelationVo.setSeverityVo(ConvertUtil.copyProperties(relationIssue.getSeverity(), SeverityVo.class));
+ //�씠�뒋 �긽�깭 異붽�
+ IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(relationIssue.getIssueStatus(), IssueStatusVo.class, "issueStatusType");
+ issueStatusVo.setIssueStatusType(relationIssue.getIssueStatus().getIssueStatusType().toString());
+ issueRelationVo.setIssueStatusVo(issueStatusVo);
+
this.setRegister(relationIssue, relIssueVo); // �벑濡앹옄
this.setIssueDepartment(relationIssue, relIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setIssueCustomFields(relationIssue, relIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueRelationVo.java b/src/main/java/kr/wisestone/owl/vo/IssueRelationVo.java
index d0bcb00..b7dff4d 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueRelationVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueRelationVo.java
@@ -15,6 +15,7 @@
private PriorityVo priorityVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private SeverityVo severityVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private UserVo registerVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
+ private IssueStatusVo issueStatusVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private List<DepartmentVo> departmentVos = Lists.newArrayList(); //�떞�떦遺��꽌
private Boolean modifyPermissionCheck = Boolean.FALSE;
@@ -95,4 +96,12 @@
public void setModifyPermissionCheck(Boolean modifyPermissionCheck) {
this.modifyPermissionCheck = modifyPermissionCheck;
}
+
+ public IssueStatusVo getIssueStatusVo() {
+ return issueStatusVo;
+ }
+
+ public void setIssueStatusVo(IssueStatusVo issueStatusVo) {
+ this.issueStatusVo = issueStatusVo;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
index d216df7..8a3f3e5 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -31,8 +31,7 @@
@Controller
public class IssueController extends BaseController {
- private static final Logger
- log = LoggerFactory.getLogger(IssueController.class);
+ private static final Logger log = LoggerFactory.getLogger(IssueController.class);
@Autowired
private IssueService issueService;
@@ -61,8 +60,8 @@
Issue issue = this.issueService.addRelIssue(IssueForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFiles("file"));
// 踰꾩쟾 �깮�꽦
this.issueService.addIssueVersion(issue.getId());
- resJsonData.put(Constants.RES_KEY_CONTENTS, issue.getId());
+ resJsonData.put(Constants.RES_KEY_CONTENTS, issue.getId()); //�뿰愿��씠�뒋 ID
return this.setSuccessMessage(resJsonData);
}
--
Gitblit v1.8.0