From dc873bdc1e57945d6cb6eadd41ef38cc2a4b35d3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 15 11월 2021 17:21:18 +0900
Subject: [PATCH] 담당자 -> 담당부서 변경 * db날리고 실행
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 206 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 153 insertions(+), 53 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 8fec89e..9b1895f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -187,7 +187,9 @@
issue.setReverseIndex(issue.getId() * -1); // 荑쇰━ �냽�룄 媛쒖꽑�쓣 �쐞�빐 由щ쾭�뒪 �씤�뜳�뒪 �깮�꽦
// �떞�떦�옄 吏��젙
- this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
+ //this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
+ // �떞�떦遺��꽌 吏��젙
+ this.issueUserService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
@@ -242,13 +244,14 @@
issueMap.put("issueTypeName", issue.getIssueType().getName());
issueMap.put("issueStatusName", issue.getIssueStatus().getName());
- // �떞�떦�옄
+ // �떞�떦遺��꽌
StringBuilder assigneeBuilder = new StringBuilder();
for (IssueUser issueUser : issue.getIssueUsers()) {
- assigneeBuilder.append(issueUser.getUser().getName());
- assigneeBuilder.append("(");
+ //assigneeBuilder.append(issueUser.getUser().getName());
+ assigneeBuilder.append(issueUser.getDepartment().getDepartmentName());
+ /*assigneeBuilder.append("(");
assigneeBuilder.append(CommonUtil.decryptAES128(issueUser.getUser().getAccount()));
- assigneeBuilder.append(")");
+ assigneeBuilder.append(")");*/
assigneeBuilder.append("\n");
}
@@ -514,7 +517,8 @@
}
// �씠�뒋 �궗�슜�옄 �젙蹂� 異붽�
- this.setIssueUserList(issueVos, issueCondition);
+ //this.setIssueUserList(issueVos, issueCondition);
+ this.setIssueDepartmentList(issueVos, issueCondition);
// �벑濡앹옄 �젙蹂� 異붽�
this.setRegister(issueVos); // �떞�떦�옄 �젙蹂� �뀑�똿
@@ -656,8 +660,8 @@
return true;
}
- // �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎.
- private void setIssueUserList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+ // �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎. => �떞�떦遺��꽌
+ private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition) {
if (issueVos.size() < 1) {
return;
}
@@ -665,26 +669,30 @@
List<Map<String, Object>> issueUsers = this.issueMapper.findIssueUser(issueCondition);
Map<String, Object> issueConverterUsers = new HashMap<>();
- // �씠�뒋�뿉 �빐�떦�븯�뒗 �씠�뒋 �떞�떦�옄 �젙蹂� �뀑�똿
+ // �씠�뒋�뿉 �빐�떦�븯�뒗 �씠�뒋 �떞�떦遺��꽌 �젙蹂� �뀑�똿
for (Map<String, Object> issueUser : issueUsers) {
String issueId = MapUtil.getString(issueUser, "issueId");
if (MapUtil.getObject(issueConverterUsers, issueId) != null) {
- List<UserVo> users = (List) MapUtil.getObject(issueConverterUsers, issueId);
- users.add(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")), MapUtil.getString(issueUser, "profile")));
+ List<DepartmentVo> departments = (List) MapUtil.getObject(issueConverterUsers, issueId);
+ departments.add(new DepartmentVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "departmentName"), MapUtil.getString(issueUser, "departmentDescription")));
+ //List<UserVo> users = (List) MapUtil.getObject(issueConverterUsers, issueId);
+ //users.add(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")), MapUtil.getString(issueUser, "profile")));
} else {
- List<UserVo> users = Lists.newArrayList(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")),
+ List<DepartmentVo> departments = Lists.newArrayList(new DepartmentVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "departmentName"), MapUtil.getString(issueUser, "departmentDescription")));
+ issueConverterUsers.put(issueId, departments);
+ /*List<UserVo> users = Lists.newArrayList(new UserVo(MapUtil.getLong(issueUser, "id"), MapUtil.getString(issueUser, "name"), CommonUtil.decryptAES128(MapUtil.getString(issueUser, "account")),
MapUtil.getString(issueUser, "profile")));
- issueConverterUsers.put(issueId, users);
+ issueConverterUsers.put(issueId, users);*/
}
}
- // �씠�뒋Vo�뿉 �떞�떦�옄 �젙蹂대�� �뀑�똿
+ // �씠�뒋Vo�뿉 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿
for (IssueVo issueVo : issueVos) {
if (MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId())) != null) {
- List<UserVo> userVos = (List) MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId()));
+ List<DepartmentVo> departmentVos = (List) MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId()));
- issueVo.setUserVos(userVos);
+ issueVo.setDepartmentVos(departmentVos);
}
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
@@ -705,7 +713,7 @@
issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
switch (issueCondition.getDeep()) {
- case "01": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �뀑�똿�븳�떎.
+ case "01": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦遺��꽌, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �뀑�똿�븳�떎.
issueVo.setProjectVo(ConvertUtil.copyProperties(issue.getProject(), ProjectVo.class));
issueVo.setIssueTypeVo(ConvertUtil.copyProperties(issue.getIssueType(), IssueTypeVo.class));
issueVo.setIssueStatusVo(ConvertUtil.copyProperties(issue.getIssueStatus(), IssueStatusVo.class));
@@ -713,7 +721,8 @@
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
- this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
+ //this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
+ this.setIssueDepartment(issue, issueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
@@ -743,7 +752,8 @@
issueVo.setPriorityVo(ConvertUtil.copyProperties(issue.getPriority(), PriorityVo.class));
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
- this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
+ //this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
+ this.setIssueDepartment(issue, issueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
@@ -795,7 +805,7 @@
}
// �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎.
- private void setIssueUser(Issue issue, IssueVo issueVo) {
+ /*private void setIssueUser(Issue issue, IssueVo issueVo) {
List<UserVo> userVos = Lists.newArrayList();
for (IssueUser issueUser : issue.getIssueUsers()) {
@@ -828,6 +838,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);
}
// �씠�뒋 泥⑤��뙆�씪 �젙蹂대�� �뀑�똿�븳�떎.
@@ -875,7 +897,7 @@
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- this.verifyIssueModifyPermission(issueForm.getId());
+ //this.verifyIssueModifyPermission(issueForm.getId());
// �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
Project project = this.projectService.getProject(issueForm.getProjectId());
// �씠�뒋 �긽�깭 �쑀�슚�꽦 泥댄겕
@@ -891,7 +913,7 @@
// �궇吏� �쑀�슚�꽦 泥댄겕
this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
- // �떞�떦�옄 �쑀�슚�꽦 泥댄겕
+ // �떞�떦�옄 �쑀�슚�꽦 泥댄겕 => �떞�떦遺��꽌濡� 蹂�寃�
this.verifyIssueAssignee(project, issueForm);
Issue issue = this.getIssue(issueForm.getId());
@@ -920,8 +942,9 @@
issue.setCompleteDate(issueForm.getCompleteDate());
this.issueRepository.saveAndFlush(issue);
- // �떞�떦�옄 吏��젙
- this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
+ // �떞�떦遺��꽌 吏��젙
+ //this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
+ this.issueUserService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
@@ -994,7 +1017,36 @@
return false;
}
- // �씠�뒋 �떞�떦�옄濡� 吏��젙�맆 �궗�슜�옄媛� �빐�떦 �봽濡쒖젥�듃�뿉 李몄뿬 �븯怨� �엳�뒗 �궗�슜�옄 �씤吏� �솗�씤
+ // �씠�뒋 �떞�떦遺��꽌濡� 吏��젙�맆 遺��꽌媛� �빐�떦 �봽濡쒖젥�듃�뿉 李몄뿬 �븯怨� �엳�뒗 遺��꽌�씤吏� �솗�씤
+ private void verifyIssueAssignee(Project project, IssueForm issueForm) {
+ if (issueForm.getDepartmentIds().size() > 0) {
+ List<Long> trustDepartmentIds = Lists.newArrayList(); // 李몄뿬 �솗�씤�맂 遺��꽌
+
+ for (Long departmentId : issueForm.getDepartmentIds()) {
+ boolean includeProject = false;
+
+ for (ProjectRole projectRole : project.getProjectRoles()) {
+ ProjectRoleUser projectRoleUser = this.projectRoleUserService.findByProjectRoleIdAndDepartmentId(projectRole.getId(), departmentId);
+
+ if (projectRoleUser != null) {
+ includeProject = true;
+ trustDepartmentIds.add(departmentId);
+ break;
+ }
+ }
+
+ // �뜲�씠�꽣 蹂댁젙 �옉�뾽 - �봽濡쒖젥�듃�뿉�꽌 �젣�쇅�맂 �궗�슜�옄�뒗 �떞�떦�옄�뿉�꽌 �젣�쇅 �맆 �닔 �엳�룄濡� 泥섎━
+ /*if (!includeProject) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.PROJECT_NOT_INCLUDE_USER));
+ }*/
+ }
+ // 李몄뿬 �솗�씤�맂 遺��꽌濡� �떞�떦遺��꽌 蹂�寃�
+ issueForm.setDepartmentIds(trustDepartmentIds);
+ }
+ }
+
+ /*// �씠�뒋 �떞�떦�옄濡� 吏��젙�맆 �궗�슜�옄媛� �빐�떦 �봽濡쒖젥�듃�뿉 李몄뿬 �븯怨� �엳�뒗 �궗�슜�옄 �씤吏� �솗�씤
private void verifyIssueAssignee(Project project, IssueForm issueForm) {
if (issueForm.getUserIds().size() > 0) {
List<Long> trustUserIds = Lists.newArrayList(); // 李몄뿬 �솗�씤�맂 �궗�슜�옄
@@ -1013,17 +1065,17 @@
}
// �뜲�씠�꽣 蹂댁젙 �옉�뾽 - �봽濡쒖젥�듃�뿉�꽌 �젣�쇅�맂 �궗�슜�옄�뒗 �떞�떦�옄�뿉�꽌 �젣�쇅 �맆 �닔 �엳�룄濡� 泥섎━
- /*if (!includeProject) {
+ *//*if (!includeProject) {
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.PROJECT_NOT_INCLUDE_USER));
- }*/
+ }*//*
}
// 李몄뿬 �솗�씤�맂 �궗�슜�옄濡� �떞�떦�옄 蹂�寃�
issueForm.setUserIds(trustUserIds);
}
- }
+ }*/
- // �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
+ /*// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
private void verifyIssueModifyPermission(Long issueId) {
Issue issue = this.getIssue(issueId);
@@ -1044,7 +1096,7 @@
}
return userVos;
- }
+ }*/
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos) {
@@ -1056,8 +1108,8 @@
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null);
// �씠�뒋 �벑濡앹옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null);
- // �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
- hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ASSIGNEE, issueVo, issueUserVos);
+ // �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎. => �떞�떦遺��꽌濡� �닔�젙 - 泥댄겕
+ //hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ASSIGNEE, issueVo, issueUserVos);
// �떞�떦�옄媛� �뾾�쑝硫� 紐⑤뱺 �궗�슜�옄媛� �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
return hasPermission;
@@ -1089,13 +1141,13 @@
break;
}
- // �씠�뒋 �떞�떦�옄 �뿬遺� �솗�씤
- for (UserVo issueUserVo : issueUserVos) {
+ // �씠�뒋 �떞�떦�옄 �뿬遺� �솗�씤 => �떞�떦遺��꽌濡� �닔�젙 - 泥댄겕
+ /*for (UserVo issueUserVo : issueUserVos) {
if (issueUserVo.getId().equals(this.webAppUtil.getLoginId())) {
hasPermission = true;
break;
}
- }
+ }*/
break;
}
@@ -1113,7 +1165,7 @@
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = new StringBuilder();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- this.verifyIssueModifyPermission(issueForm.getId());
+ //this.verifyIssueModifyPermission(issueForm.getId());
Issue issue = this.getIssue(issueForm.getId());
IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueForm.getIssueStatusId());
@@ -1151,7 +1203,7 @@
}
// �씠�뒋 �떞�떦�옄 蹂�寃�
- @Override
+ /*@Override
@Transactional
public void modifyIssueUser(IssueForm issueForm) {
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
@@ -1166,7 +1218,43 @@
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
this.issueHistoryService.detectIssueManager(issue, issueForm, detectIssueChange);
- this.issueUserService.modifyIssueUser(issue, issue.getProject().getWorkspace(), issueForm.getUserIds());
+ this.issueUserService.modifyIssueUser(issue, issue.getProject().getWorkspace(), issueForm.getDepartmentIds()); //getUserIds -> getDepartmentIds
+ this.issueRepository.saveAndFlush(issue);
+
+ // �씠�뒋 �씠�젰 �벑濡�
+ if (!StringUtils.isEmpty(detectIssueChange.toString())) {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append("<ul class=\"activity-list\">");
+ stringBuilder.append(detectIssueChange.toString());
+ stringBuilder.append("</ul>");
+
+ this.issueHistoryService.addIssueHistory(issue, IssueHistoryType.MODIFY, stringBuilder.toString());
+ }
+
+ // �씠�뒋 踰꾩쟾 �깮�꽦
+ this.issueVersionService.addIssueVersion(issue);
+
+ // �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
+ log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(this.webAppUtil.getLoginUser(), ElasticSearchConstants.ISSUE_USER_CHANGE));
+ }*/
+
+ @Override
+ @Transactional
+ public void modifyIssueDepartment(IssueForm issueForm) {
+ // �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
+ this.workspaceService.checkUseWorkspace();
+ // 蹂�寃� �씠�젰 �젙蹂� 異붿텧
+ StringBuilder detectIssueChange = new StringBuilder();
+ // �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
+ //this.verifyIssueModifyPermission(issueForm.getId());
+ Issue issue = this.getIssue(issueForm.getId());
+ issue.setProject(this.projectService.getProject(issueForm.getProjectId()));
+
+ // 蹂�寃� �씠�젰 �젙蹂� 異붿텧
+ this.issueHistoryService.detectIssueManager(issue, issueForm, detectIssueChange);
+
+ //this.issueUserService.modifyIssueUser(issue, issue.getProject().getWorkspace(), issueForm.getUserIds());
+ this.issueUserService.modifyIssueDepartment(issue, issue.getProject().getWorkspace(), issueForm.getDepartmentIds());
this.issueRepository.saveAndFlush(issue);
// �씠�뒋 �씠�젰 �벑濡�
@@ -1216,7 +1304,7 @@
private Issue issueRemoves(Long issueId) {
Issue issue = this.getIssue(issueId);
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- this.verifyIssueModifyPermission(issueId);
+ //this.verifyIssueModifyPermission(issueId);
// �씠�뒋 泥⑤� �뙆�씪�쓣 �궘�젣�븳�떎.
if (issue.getAttachedFiles().size() > 0) {
@@ -1353,7 +1441,7 @@
excelInfo.addAttrInfos(new ExportExcelAttrVo("title", this.messageAccessor.message("common.issueTitle"), 40, ExportExcelAttrVo.ALIGN_LEFT)); // �씠�뒋 �젣紐�
excelInfo.addAttrInfos(new ExportExcelAttrVo("description", this.messageAccessor.message("common.content"), 60, ExportExcelAttrVo.ALIGN_LEFT)); // �궡�슜
excelInfo.addAttrInfos(new ExportExcelAttrVo("issueTypeName", this.messageAccessor.message("common.issueType"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 ���엯
- excelInfo.addAttrInfos(new ExportExcelAttrVo("assignees", this.messageAccessor.message("common.assignee"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦�옄
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("department", this.messageAccessor.message("common.department"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦遺��꽌
excelInfo.addAttrInfos(new ExportExcelAttrVo("priorityName", this.messageAccessor.message("common.priority"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // �슦�꽑�닚�쐞
excelInfo.addAttrInfos(new ExportExcelAttrVo("severityName", this.messageAccessor.message("common.importance"), 6, ExportExcelAttrVo.ALIGN_CENTER)); // 以묒슂�룄
excelInfo.addAttrInfos(new ExportExcelAttrVo("register", this.messageAccessor.message("common.register"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �벑濡앹옄
@@ -1529,7 +1617,7 @@
excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.issueType"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �씠�뒋 ���엯
excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.priority"), 5, ExportExcelAttrVo.ALIGN_CENTER)); // �슦�꽑�닚�쐞
excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.importance"), 5, ExportExcelAttrVo.ALIGN_CENTER)); // 以묒슂�룄
- excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.assignee"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦�옄
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.department"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦遺��꽌
excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.startDate"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // �떆�옉�씪
excelInfo.addAttrInfos(new ExportExcelAttrVo("id", this.messageAccessor.message("common.endDate"), 10, ExportExcelAttrVo.ALIGN_CENTER)); // 醫낅즺�씪
// �봽濡쒖젥�듃�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� 異붿텧�븯�뿬 �뿊�� download �뀥�뵆由우쓣 留뚮뱺�떎.
@@ -1701,10 +1789,11 @@
List<Map<String, Long>> issueAssigneeMaps = Lists.newArrayList();
for (IssueForm issueForm : issueForms) {
- for (Long userId : issueForm.getUserIds()) {
+ for (Long departmentId : issueForm.getDepartmentIds()) {
Map<String, Long> issueAssigneeMap = new HashMap<>();
issueAssigneeMap.put("issueId", issueForm.getId());
- issueAssigneeMap.put("userId", userId);
+ //issueAssigneeMap.put("userId", userId);
+ issueAssigneeMap.put("departmentId", departmentId);
issueAssigneeMap.put("workspaceId", workspace.getId());
issueAssigneeMap.put("registerId", this.webAppUtil.getLoginId());
issueAssigneeMaps.add(issueAssigneeMap);
@@ -1867,7 +1956,7 @@
this.setIssueFormSeverity(cell, severityMaps, issueForm, rowIndex);
break;
case 6:
- // �떞�떦�옄瑜� IssueForm �뿉 ���옣�븳�떎.
+ // �떞�떦遺��꽌瑜� IssueForm �뿉 ���옣�븳�떎.
this.setIssueFormAssignee(cell, userMaps, issueForm, project);
break;
case 7:
@@ -2008,21 +2097,21 @@
issueForm.setSeverityId(severity.getId());
}
- // �떞�떦�옄瑜� IssueForm �뿉 ���옣�븳�떎.
+ // �떞�떦遺��꽌瑜� IssueForm �뿉 ���옣�븳�떎.
private void setIssueFormAssignee(Cell cell, Map<String, Object> userMaps, IssueForm issueForm, Project project) {
if (cell != null) {
String[] splitAssignee = CommonUtil.convertExcelStringToCell(cell).split("#");
Map<String, Object> userMap = (Map<String, Object>) MapUtil.getObject(userMaps, project.getProjectKey());
- List<Long> userIds = Lists.newArrayList();
+ List<Long> departmentIds = Lists.newArrayList();
for (String account : splitAssignee) {
if (MapUtil.getLong(userMap, account) != null) {
- userIds.add(MapUtil.getLong(userMap, account));
+ departmentIds.add(MapUtil.getLong(userMap, account));
}
}
- issueForm.setUserIds(userIds);
+ issueForm.setDepartmentIds(departmentIds);
}
}
@@ -2285,17 +2374,24 @@
taskUserSave.put(taskId.toString(), Lists.newArrayList());
}
- List<Map<String, Object>> taskUsers = Lists.newArrayList();
+ List<Map<String, Object>> taskDepartments = Lists.newArrayList();
// task 媛� �븯�굹�룄 �뾾�쓣 寃쎌슦�뿉�뒗 議고쉶瑜� �븯吏� �븡�뒗�떎.
if (!taskCondition.getIssueIds().isEmpty()) {
- taskUsers = this.issueMapper.getAllTaskUser(taskCondition);
+ //taskUsers = this.issueMapper.getAllTaskUser(taskCondition);
+ taskDepartments = this.issueMapper.getAllTaskUser(taskCondition);
}
// task_id �뿉 留ㅼ묶�릺�뒗 �떞�떦�옄 �젙蹂대�� 以�鍮꾪븳�떎.
- for (Map<String, Object> taskUser : taskUsers) {
+ /*for (Map<String, Object> taskUser : taskUsers) {
Long taskId = MapUtil.getLong(taskUser, "taskId");
List<UserVo> userVos = (List<UserVo>)taskUserSave.get(taskId.toString());
userVos.add(ConvertUtil.convertMapToClass(taskUser, UserVo.class));
+ }*/
+
+ for (Map<String, Object> taskDepartment : taskDepartments) {
+ Long taskId = MapUtil.getLong(taskDepartment, "taskId");
+ List<DepartmentVo> departmentVos = (List<DepartmentVo>)taskUserSave.get(taskId.toString());
+ departmentVos.add(ConvertUtil.convertMapToClass(taskDepartment, DepartmentVo.class));
}
for (Map<String, Object> result : results) {
@@ -2320,8 +2416,12 @@
}
// �떞�떦�옄 �뀑�똿
- List<UserVo> userVos = (List<UserVo>)taskUserSave.get(taskVo.getId().toString());
- taskVo.setUserVos(userVos);
+ //List<UserVo> userVos = (List<UserVo>)taskUserSave.get(taskVo.getId().toString());
+ //taskVo.setUserVos(userVos);
+
+ // �떞�떦遺��꽌 �꽭�똿
+ List<DepartmentVo> departmentVos = (List<DepartmentVo>)taskUserSave.get(taskVo.getId().toString());
+ taskVo.setDepartmentVos(departmentVos);
List<IssueVo> taskVos = (List<IssueVo>)tasks.get(MapUtil.getString(result, "workflowStatusId"));
taskVos.add(taskVo);
--
Gitblit v1.8.0