From 8e6c2879222d906759291370f86756681c5f51c4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 15 11월 2021 13:05:16 +0900
Subject: [PATCH] 이슈관리 - 담당부서 추가
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 13 +++++++++++++
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 9 +++++++++
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 4 ++--
src/main/java/kr/wisestone/owl/domain/IssueUser.java | 12 ++++++++++++
src/main/resources/migration/V1_1__Initial_Setup.sql | 6 ++++--
5 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueUser.java b/src/main/java/kr/wisestone/owl/domain/IssueUser.java
index e5876a4..88ceb1d 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueUser.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueUser.java
@@ -23,6 +23,10 @@
@JoinColumn(name = "workspace_id")
private Workspace workspace;
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "department_id")
+ private Department department;
+
public IssueUser() {
}
@@ -62,4 +66,12 @@
public void setWorkspace(Workspace workspace) {
this.workspace = workspace;
}
+
+ public Department getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(Department department) {
+ this.department = department;
+ }
}
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 8fec89e..797434f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -744,6 +744,7 @@
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
+ this.setIssueDepartment(issue, issueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
@@ -830,6 +831,18 @@
issueVo.setUserVos(userVos);
}
+ // �씠�뒋 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setIssueDepartment(Issue issue, IssueVo issueVo) {
+ List<DepartmentVo> departmentVos = Lists.newArrayList();
+
+ for (IssueUser issueUser : issue.getIssueUsers()) {
+ DepartmentVo departmentVo = ConvertUtil.copyProperties(issueUser.getDepartment(), DepartmentVo.class);
+ departmentVo.setByName(departmentVo.getByName());
+ departmentVos.add(departmentVo);
+ }
+ issueVo.setDepartmentVos(departmentVos);
+ }
+
// �씠�뒋 泥⑤��뙆�씪 �젙蹂대�� �뀑�똿�븳�떎.
private void setAttachedFiles(Issue issue, IssueVo issueVo) {
List<AttachedFileVo> attachedFileVos = Lists.newArrayList();
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 71fe386..e906deb 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -237,11 +237,11 @@
} else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄
- DepartmentForm departmentForm = new DepartmentForm();
+ /*DepartmentForm departmentForm = new DepartmentForm();
departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
Department department = this.departmentService.add(departmentForm);
- this.departmentRepository.saveAndFlush(department);
+ this.departmentRepository.saveAndFlush(department);*/
Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index ee7808a..8d4b6a4 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -37,6 +37,7 @@
private UserVo registerVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private Boolean modifyPermissionCheck = Boolean.FALSE;
private List<UserVo> userVos = Lists.newArrayList();
+ private List<DepartmentVo> departmentVos = Lists.newArrayList(); //�떞�떦遺��꽌 異붽�
private List<AttachedFileVo> attachedFileVos = Lists.newArrayList();
private List<IssueCommentVo> issueCommentVos = Lists.newArrayList();
private List<IssueHistoryVo> issueHistoryVos = Lists.newArrayList();
@@ -370,4 +371,12 @@
public List<IssueVo> getIssueRelationIssueVos() { return this.issueRelationVos; }
public void setIssueRelationIssueVos(List<IssueVo> issueRelationVos) { this.issueRelationVos = issueRelationVos; }
+
+ public List<DepartmentVo> getDepartmentVos() {
+ return departmentVos;
+ }
+
+ public void setDepartmentVos(List<DepartmentVo> departmentVos) {
+ this.departmentVos = departmentVos;
+ }
}
diff --git a/src/main/resources/migration/V1_1__Initial_Setup.sql b/src/main/resources/migration/V1_1__Initial_Setup.sql
index 6dc56c9..91a8e2d 100644
--- a/src/main/resources/migration/V1_1__Initial_Setup.sql
+++ b/src/main/resources/migration/V1_1__Initial_Setup.sql
@@ -303,7 +303,8 @@
-- �뀒�씠釉� owl_en_1.5.issue_user 援ъ“ �궡蹂대궡湲�
CREATE TABLE IF NOT EXISTS `issue_user` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
- `user_id` bigint(20) NOT NULL,
+ `user_id` bigint(20) NULL,
+ `department_id` bigint(20) NOT NULL,
`issue_id` bigint(20) NOT NULL,
`workspace_id` bigint(20) NOT NULL,
`register_id` bigint(20) NOT NULL,
@@ -314,7 +315,8 @@
KEY `userIdAndIssueIdIndex` (`user_id`,`issue_id`),
KEY `issueIdIndex` (`issue_id`),
KEY `workspaceIdIndex` (`workspace_id`),
- KEY `userIdIndex` (`user_id`)
+ KEY `userIdIndex` (`user_id`),
+ KEY `departmentIdIndex` (`department_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- �뀒�씠釉� �뜲�씠�꽣 owl_en_1.5.issue_user:~0 rows (���왂�쟻) �궡蹂대궡湲�
--
Gitblit v1.8.0