From dccda7c93a2a18571fe43c5de1c66eabefc25139 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 17 11월 2021 18:31:06 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 198 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 154 insertions(+), 44 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 9b1895f..1fdcfc3 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -70,6 +70,15 @@
private SeverityService severityService;
@Autowired
+ private CompanyFieldService companyFieldService;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
+
+ @Autowired
private CommonConfiguration configuration;
@Autowired
@@ -83,6 +92,9 @@
@Autowired
private IssueUserService issueUserService;
+
+ @Autowired
+ private IssueDepartmentService issueDepartmentService;
@Autowired
private CustomFieldService customFieldService;
@@ -101,6 +113,9 @@
@Autowired
private ProjectRoleUserService projectRoleUserService;
+
+ @Autowired
+ private ProjectRoleDepartmentService projectRoleDepartmentService;
@Autowired
private IssueRiskService issueRiskService;
@@ -181,6 +196,23 @@
issue.setIssueType(issueType);
issue.setPriority(priority);
issue.setSeverity(severity);
+
+ // �뾽泥� �븘�뱶 �쑀�슚�꽦 泥댄겕
+ if(issueForm.getCompanyId() != null){
+ CompanyField companyField = this.companyFieldService.getCompany(issueForm.getCompanyId());
+ issue.setCompanyField(companyField);
+ }
+ // ISP �븘�뱶 �쑀�슚�꽦 泥댄겕
+ if(issueForm.getIspId() != null) {
+ IspField ispField = this.ispFieldService.getIsp(issueForm.getIspId());
+ issue.setIspFieldId(ispField);
+ }
+ // HOSTING �븘�뱶 �쑀�슚�꽦 泥댄겕
+ if (issueForm.getHostingId() != null){
+ HostingField hostingField = this.hostingFieldService.getHosting(issueForm.getHostingId());
+ issue.setHostingFieldId(hostingField);
+ }
+
issue.setIssueNumber(this.issueNumberGeneratorService.generateIssueNumber(project)); // 媛� �봽濡쒖젥�듃�쓽 怨좎쑀 �씠�뒋 踰덊샇 �깮�꽦
this.issueRepository.saveAndFlush(issue);
@@ -189,7 +221,7 @@
// �떞�떦�옄 吏��젙
//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
// �떞�떦遺��꽌 吏��젙
- this.issueUserService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
@@ -244,18 +276,25 @@
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(issueUser.getDepartment().getDepartmentName());
- /*assigneeBuilder.append("(");
+ assigneeBuilder.append(issueUser.getUser().getName());
+ assigneeBuilder.append("(");
assigneeBuilder.append(CommonUtil.decryptAES128(issueUser.getUser().getAccount()));
- assigneeBuilder.append(")");*/
+ assigneeBuilder.append(")");
assigneeBuilder.append("\n");
}
-
issueMap.put("assignees", assigneeBuilder.toString());
+
+ // �떞�떦遺��꽌
+ StringBuilder departsBuilder = new StringBuilder();
+ for (IssueDepartment issueDepartment : issue.getIssueDepartments()) {
+ departsBuilder.append(issueDepartment.getDepartment().getDepartmentName());
+ departsBuilder.append("\n");
+ }
+ issueMap.put("departsBuilder", departsBuilder.toString());
+
// 湲곌컙
if (!StringUtils.isEmpty(issue.getStartDate())) {
issueMap.put("period", issue.getStartDate() + " ~ " + issue.getCompleteDate());
@@ -386,6 +425,7 @@
issueCondition.setIssueIds(issueKeys);
List<Map<String, Object>> results = this.issueMapper.find(issueCondition);
+
// �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
StopWatch serviceStart = new StopWatch();
serviceStart.start();
@@ -660,8 +700,8 @@
return true;
}
- // �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎. => �떞�떦遺��꽌
- private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+ // �씠�뒋 �떞�떦�옄 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setIssueUserList(List<IssueVo> issueVos, IssueCondition issueCondition) {
if (issueVos.size() < 1) {
return;
}
@@ -669,28 +709,61 @@
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<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")));
+ 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<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")),
+ 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�뿉 �떞�떦�옄 �젙蹂대�� �뀑�똿
+ for (IssueVo issueVo : issueVos) {
+ if (MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId())) != null) {
+ List<UserVo> userVos = (List) MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId()));
+
+ issueVo.setUserVos(userVos);
+ }
+
+ // �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
+ if (this.checkHasPermission(issueVo, issueVo.getUserVos())) {
+ issueVo.setModifyPermissionCheck(Boolean.TRUE);
+ }
+ }
+ }
+
+ // �씠�뒋 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setIssueDepartmentList(List<IssueVo> issueVos, IssueCondition issueCondition) {
+ if (issueVos.size() < 1) {
+ return;
+ }
+
+ List<Map<String, Object>> issueDepartments = this.issueMapper.findIssueDepartment(issueCondition);
+ Map<String, Object> issueConverterDepartments = new HashMap<>();
+
+ // �씠�뒋�뿉 �빐�떦�븯�뒗 �씠�뒋 �떞�떦遺��꽌 �젙蹂� �뀑�똿
+ for (Map<String, Object> issueDepartment : issueDepartments) {
+ String issueId = MapUtil.getString(issueDepartment, "issueId");
+
+ if (MapUtil.getObject(issueConverterDepartments, issueId) != null) {
+ List<DepartmentVo> departments = (List) MapUtil.getObject(issueConverterDepartments, issueId);
+ departments.add(new DepartmentVo(MapUtil.getLong(issueDepartment, "id"), MapUtil.getString(issueDepartment, "departmentName"), MapUtil.getString(issueDepartment, "departmentDescription")));
+ } else {
+ List<DepartmentVo> departments = Lists.newArrayList(new DepartmentVo(MapUtil.getLong(issueDepartment, "id"), MapUtil.getString(issueDepartment, "departmentName"), MapUtil.getString(issueDepartment, "departmentDescription")));
+ issueConverterDepartments.put(issueId, departments);
}
}
// �씠�뒋Vo�뿉 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿
for (IssueVo issueVo : issueVos) {
- if (MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId())) != null) {
- List<DepartmentVo> departmentVos = (List) MapUtil.getObject(issueConverterUsers, String.valueOf(issueVo.getId()));
+ if (MapUtil.getObject(issueConverterDepartments, String.valueOf(issueVo.getId())) != null) {
+ List<DepartmentVo> departmentVos = (List) MapUtil.getObject(issueConverterDepartments, String.valueOf(issueVo.getId()));
issueVo.setDepartmentVos(departmentVos);
}
@@ -719,6 +792,9 @@
issueVo.setIssueStatusVo(ConvertUtil.copyProperties(issue.getIssueStatus(), IssueStatusVo.class));
issueVo.setPriorityVo(ConvertUtil.copyProperties(issue.getPriority(), PriorityVo.class));
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
+ issueVo.setCompanyFieldVo(ConvertUtil.copyProperties(issue.getCompanyField(), CompanyFieldVo.class));
+ issueVo.setIspFieldVo(ConvertUtil.copyProperties(issue.getIspFieldId(), IspFieldVo.class));
+ issueVo.setHostingFieldVo(ConvertUtil.copyProperties(issue.getHostingFieldId(), HostingFieldVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
//this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
@@ -726,6 +802,8 @@
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
+ this.setDownIssues(issue, issueVo);
+
break;
case "02": // �봽濡쒖젥�듃, �씠�뒋 �쑀�삎, �씠�뒋 �긽�깭, �슦�꽑�닚�쐞, 以묒슂�룄, �떞�떦�옄, 泥⑤��뙆�씪, �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂�, �뙎湲�, 湲곕줉�쓣 �뀑�똿�븳�떎.
@@ -740,6 +818,13 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, issueVo);
}
+ // �븯�쐞 �씠�뒋 �젙蹂대�� �뀑�똿�븳�떎
+ 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);
+ }
+
// �씠�뒋 �긽�꽭 �젙蹂대�� �뀑�똿�븳�떎.
@Override
@Transactional(readOnly = true)
@@ -751,6 +836,9 @@
issueVo.setIssueStatusVo(issueStatusVo);
issueVo.setPriorityVo(ConvertUtil.copyProperties(issue.getPriority(), PriorityVo.class));
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
+ issueVo.setCompanyFieldVo(ConvertUtil.copyProperties(issue.getCompanyField(), CompanyFieldVo.class));
+ issueVo.setIspFieldVo(ConvertUtil.copyProperties(issue.getIspFieldId(), IspFieldVo.class));
+ issueVo.setHostingFieldVo(ConvertUtil.copyProperties(issue.getHostingFieldId(), HostingFieldVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
//this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
this.setIssueDepartment(issue, issueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
@@ -759,6 +847,7 @@
this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
this.setIssueHistory(issue, issueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
+ this.setDownIssues(issue, issueVo);
}
// �벑濡앹옄 �젙蹂� 異붽�
@@ -844,8 +933,8 @@
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);
+ for (IssueDepartment issueDepartment : issue.getIssueDepartments()) {
+ DepartmentVo departmentVo = ConvertUtil.copyProperties(issueDepartment.getDepartment(), DepartmentVo.class);
departmentVo.setByName(departmentVo.getByName());
departmentVos.add(departmentVo);
}
@@ -897,7 +986,7 @@
// �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
this.workspaceService.checkUseWorkspace();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- //this.verifyIssueModifyPermission(issueForm.getId());
+ this.verifyIssueModifyPermission(issueForm.getId());
// �봽濡쒖젥�듃 �쑀�슚�꽦 泥댄겕
Project project = this.projectService.getProject(issueForm.getProjectId());
// �씠�뒋 �긽�깭 �쑀�슚�꽦 泥댄겕
@@ -913,8 +1002,10 @@
// �궇吏� �쑀�슚�꽦 泥댄겕
this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
- // �떞�떦�옄 �쑀�슚�꽦 泥댄겕 => �떞�떦遺��꽌濡� 蹂�寃�
- this.verifyIssueAssignee(project, issueForm);
+ // �떞�떦�옄 �쑀�슚�꽦 泥댄겕
+ //this.verifyIssueAssignee(project, issueForm);
+ // �떞�떦遺��꽌 �쑀�슚�꽦 泥댄겕
+ this.verifyIssueDepartment(project, issueForm);
Issue issue = this.getIssue(issueForm.getId());
@@ -942,9 +1033,11 @@
issue.setCompleteDate(issueForm.getCompleteDate());
this.issueRepository.saveAndFlush(issue);
- // �떞�떦遺��꽌 吏��젙
//this.issueUserService.modifyIssueUser(issue, project.getWorkspace(), issueForm.getUserIds());
- this.issueUserService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ // �떞�떦遺��꽌 吏��젙
+ if(issueForm.getDepartmentIds().size()>0){
+ this.issueDepartmentService.modifyIssueDepartment(issue, project.getWorkspace(), issueForm.getDepartmentIds());
+ }
// multipartFile �쓣 file Map List 媛앹껜濡� 蹂�寃쏀븳�떎.
List<Map<String, Object>> convertFileMaps = this.convertMultipartFileToFile(multipartFiles);
@@ -1018,7 +1111,7 @@
}
// �씠�뒋 �떞�떦遺��꽌濡� 吏��젙�맆 遺��꽌媛� �빐�떦 �봽濡쒖젥�듃�뿉 李몄뿬 �븯怨� �엳�뒗 遺��꽌�씤吏� �솗�씤
- private void verifyIssueAssignee(Project project, IssueForm issueForm) {
+ private void verifyIssueDepartment(Project project, IssueForm issueForm) {
if (issueForm.getDepartmentIds().size() > 0) {
List<Long> trustDepartmentIds = Lists.newArrayList(); // 李몄뿬 �솗�씤�맂 遺��꽌
@@ -1026,9 +1119,9 @@
boolean includeProject = false;
for (ProjectRole projectRole : project.getProjectRoles()) {
- ProjectRoleUser projectRoleUser = this.projectRoleUserService.findByProjectRoleIdAndDepartmentId(projectRole.getId(), departmentId);
+ ProjectRoleDepartment projectRoleDepartment = this.projectRoleDepartmentService.findByProjectRoleIdAndDepartmentId(projectRole.getId(), departmentId);
- if (projectRoleUser != null) {
+ if (projectRoleDepartment != null) {
includeProject = true;
trustDepartmentIds.add(departmentId);
break;
@@ -1036,17 +1129,17 @@
}
// �뜲�씠�꽣 蹂댁젙 �옉�뾽 - �봽濡쒖젥�듃�뿉�꽌 �젣�쇅�맂 �궗�슜�옄�뒗 �떞�떦�옄�뿉�꽌 �젣�쇅 �맆 �닔 �엳�룄濡� 泥섎━
- /*if (!includeProject) {
+ 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(); // 李몄뿬 �솗�씤�맂 �궗�슜�옄
@@ -1065,17 +1158,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);
@@ -1096,7 +1189,7 @@
}
return userVos;
- }*/
+ }
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
private boolean checkHasPermission(IssueVo issueVo, List<UserVo> issueUserVos) {
@@ -1165,7 +1258,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());
@@ -1246,7 +1339,7 @@
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = new StringBuilder();
// �씠�뒋 �닔�젙 沅뚰븳 泥댄겕
- //this.verifyIssueModifyPermission(issueForm.getId());
+ this.verifyIssueModifyPermission(issueForm.getId());
Issue issue = this.getIssue(issueForm.getId());
issue.setProject(this.projectService.getProject(issueForm.getProjectId()));
@@ -1254,7 +1347,7 @@
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.issueDepartmentService.modifyIssueDepartment(issue, issue.getProject().getWorkspace(), issueForm.getDepartmentIds());
this.issueRepository.saveAndFlush(issue);
// �씠�뒋 �씠�젰 �벑濡�
@@ -1304,7 +1397,7 @@
private Issue issueRemoves(Long issueId) {
Issue issue = this.getIssue(issueId);
// �씠�뒋 �닔�젙 沅뚰븳�쓣 媛뽮퀬 �엳�뒗吏� �솗�씤
- //this.verifyIssueModifyPermission(issueId);
+ this.verifyIssueModifyPermission(issueId);
// �씠�뒋 泥⑤� �뙆�씪�쓣 �궘�젣�븳�떎.
if (issue.getAttachedFiles().size() > 0) {
@@ -1441,7 +1534,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("department", this.messageAccessor.message("common.department"), 20, ExportExcelAttrVo.ALIGN_CENTER)); // �떞�떦遺��꽌
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("departments", 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)); // �벑濡앹옄
@@ -1546,6 +1639,7 @@
result.put("description", description);
result.put("issueTypeName", issueVo.getIssueTypeName());
result.put("assignees", CommonUtil.convertUserVosToString(issueVo.getUserVos()));
+ result.put("departments", CommonUtil.convertDepartmentVosToString(issueVo.getDepartmentVos()));
result.put("priorityName", issueVo.getPriorityName());
result.put("severityName", issueVo.getSeverityName());
@@ -1802,7 +1896,8 @@
if (issueAssigneeMaps.size() > 0) {
// �씠�뒋 �떞�떦�옄 踰뚰겕 �벑濡�
- this.issueUserService.insertIssueUser(issueAssigneeMaps);
+ //this.issueUserService.insertIssueUser(issueAssigneeMaps);
+ this.issueDepartmentService.insertIssueDepartment(issueAssigneeMaps);
}
}
@@ -2433,4 +2528,19 @@
return tasks;
}
+
+ @Transactional
+ @Override
+ public void modifyParentIssue(IssueForm issueForm) {
+ Issue issue = this.issueRepository.getOne(issueForm.getId());
+ Long parentIssueId = issueForm.getParentIssueId();
+ if (parentIssueId != null) {
+ Issue parentIssue = this.issueRepository.getOne(parentIssueId);
+ issue.setParentIssue(parentIssue);
+ } else {
+ issue.setParentIssue(null);
+ }
+
+ this.issueRepository.saveAndFlush(issue);
+ }
}
--
Gitblit v1.8.0