From cfc9e71ae55196920b3103d5a4dd9102be0ef69e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 13 12월 2021 10:53:58 +0900
Subject: [PATCH] 부서삭제 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 96 +++++++++++++++++++++++++++++-------------------
1 files changed, 58 insertions(+), 38 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 142f491..0a7bb23 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1,7 +1,6 @@
package kr.wisestone.owl.service.impl;
import com.google.common.collect.Lists;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.common.IssueCustomFieldValueFormComparator;
import kr.wisestone.owl.config.CommonConfiguration;
@@ -753,15 +752,16 @@
Long totalCount = 0L;
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
- if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+// if (this.userWorkspaceService.checkWorkspaceManager(user)
+// || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
results = this.issueMapper.find(issueCondition);
totalCount = this.issueMapper.count(issueCondition);
- } else{
- this.SetMyDepartmentId(issueCondition);
- results = this.issueMapper.findByDepartment(issueCondition);
- totalCount = this.issueMapper.countByDepartment(issueCondition);
- }
+// }
+// } else{
+// this.SetMyDepartmentId(issueCondition);
+// results = this.issueMapper.findByDepartment(issueCondition);
+// totalCount = this.issueMapper.countByDepartment(issueCondition);
+// }
// �뒠�떇 �쟾 - 0.8, 0.9, 0.9, 0.9, 0.9
@@ -781,11 +781,11 @@
// Map �뿉 �엳�뒗 �뜲�씠�꽣瑜� IssueVo �뜲�씠�꽣濡� 蹂��솚�븳�떎.
this.setMapToIssueVo(results, issueVos, issueCondition, user);
-// if (issueCondition.getTree()) {
- this.setDownIssues(issueVos);
+ if (issueCondition.getTree()) {
+ this.setDownIssues(user, issueVos);
this.setRelationIssues(issueVos);
-// }
- this.setCountDownIssues(results, issueVos);
+ }
+ this.setCountDownIssues(issueVos);
this.SetWorkflowDepartment(issueVos); //�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
@@ -799,13 +799,35 @@
}
- // �븯�쐞 �씠�뒋 �꽭�똿
- private void setDownIssues(List<IssueVo> issueVos) {
+ // �븯�쐞 �씠�뒋 �꽭�똿(�옱洹�)
+ private void setDownIssues(User user, List<IssueVo> issueVos) {
for(IssueVo issueVo : issueVos) {
List<Issue> downIssues = this.issueRepository.findByParentIssueId(issueVo.getId());
+ List<IssueVo> downIssueVos = Lists.newArrayList();
+ IssueCondition issueCondition = new IssueCondition();
+ issueCondition.addIssueIds(String.valueOf(issueVo.getId()));
+
for(Issue downIssue : downIssues){
- issueVo.addIssueDownVo(ConvertUtil.copyProperties(downIssue, IssueVo.class));
+ IssueVo addIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
+ addIssueVo.setIssueTypeId(downIssue.getIssueType().getId());
+ downIssueVos.add(addIssueVo);
+
}
+ issueVo.setIssueDownVos(downIssueVos);
+ if (downIssueVos.size() > 0) {
+ this.setDownIssues(user, downIssueVos);
+ }
+
+ // �씠�뒋 �궗�슜�옄 �젙蹂� 異붽�
+ //this.setIssueUserList(issueVos, issueCondition);
+ this.setIssueDepartmentList(issueVos, issueCondition, user);
+ // �벑濡앹옄 �젙蹂� 異붽�
+ this.setRegister(issueVos); // �떞�떦�옄 �젙蹂� �뀑�똿
+
+ // �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂� 異붽�
+ this.setIssueCustomFieldValue(issueVos, issueCondition);
+
+ this.SetWorkflowDepartment(issueVos); //�썙�겕�뵆濡쒖슦�뿉 �꽕�젙�븳 �떞�떦遺��꽌 媛��졇�삤湲�
}
}
@@ -821,9 +843,9 @@
@Override
@Transactional(readOnly = true)
- public void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
- for (Map<String, Object> result : results){
- List<Issue> downIssues = this.issueRepository.findByParentIssueId((Long) result.get("id")); //�븯�쐞�씠�뒋 媛��졇�삤湲�
+ public void setCountDownIssues(List<IssueVo> issueVos) {
+ for (IssueVo issueVo : issueVos){
+ List<Issue> downIssues = this.issueRepository.findByParentIssueId(issueVo.getId()); //�븯�쐞�씠�뒋 媛��졇�삤湲�
if(downIssues != null && downIssues.size() > 0){ //�긽�쐞�씠�뒋 媛�吏�怨� �엳�뒗 �븷�뱾�씠 �엳�쑝硫�
int downIssueAllCount = 0;// �븯�쐞�씠�뒋 �쟾泥� 移댁슫�듃
int downIssueCount = 0;// �븯�쐞�씠�뒋 誘몄셿猷� 移댁슫�듃
@@ -842,12 +864,8 @@
downIssueCount ++;
}
- for(IssueVo issueVo : issueVos){
- if(issueVo.getId().equals(parentIssueVo.getId())){
- issueVo.setDownIssueCount(downIssueCount);
- issueVo.setDownIssueAllCount(parentIssueVo.getDownIssueAllCount());
- }
- }
+ issueVo.setDownIssueCount(downIssueCount);
+ issueVo.setDownIssueAllCount(parentIssueVo.getDownIssueAllCount());
}
}
}
@@ -1646,40 +1664,42 @@
private Issue modifyIssueForApi(User user, IssueForm issueForm, List<MultipartFile> multipartFiles) {
CheckIssueData checkIssueData = this.checkIssue(user, issueForm);
- Issue issue = checkIssueData.getIssue();
- Project project = checkIssueData.getProject();
- IssueType issueType = checkIssueData.getIssueType();
- IssueStatus oldIssueStatus = checkIssueData.getOldIssueStatus();
- IssueStatus issueStatus = checkIssueData.getNewIssueStatus();
+ // �씠�뒋 �씠�젰 �궓湲곌린
+ this.addIssueHistoryModify(user, issueForm, checkIssueData, multipartFiles);
+ // db�뿉 ���옣
+ return this.saveIssue(issueForm, checkIssueData);
+ }
+
+ private void addIssueHistoryModify(User user, IssueForm issueForm, CheckIssueData checkIssueData, List<MultipartFile> multipartFiles) {
// 蹂�寃� �씠�젰 �젙蹂� 異붿텧
StringBuilder detectIssueChange = this.issueHistoryService.detectIssueChange(issueForm, checkIssueData, multipartFiles);
// �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �씠�뒋 �꽆踰꾨�� �깉濡� �뵲�빞 �븳�떎.
- this.checkChangeProject(checkIssueData.getProject(), issue);
+ this.checkChangeProject(checkIssueData.getProject(), checkIssueData.getIssue());
// �씠�뒋 �쑀�삎�씠 蹂�寃쎈릺�뿀�뒗吏� �솗�씤�븯怨� 蹂�寃쎈릺�뿀�떎硫� �씠�뒋 �긽�깭 �냽�꽦�씠 '��湲�' �씤 �씠�뒋 �긽�깭濡� 援먯껜�븳�떎.
- if (this.checkChangeIssueType(issueType, issueStatus, issue)) {
- issueStatus = this.issueStatusService.findByIssueStatusTypeIsReady(issueType.getWorkflow());
+ if (this.checkChangeIssueType(checkIssueData.getIssueType(), checkIssueData.getNewIssueStatus(), checkIssueData.getIssue())) {
+ checkIssueData.setNewIssueStatus(this.issueStatusService.findByIssueStatusTypeIsReady(checkIssueData.getIssueType().getWorkflow()));
// �씠�뒋 �긽�깭 蹂�寃� �씠�젰 �궓湲곌린 - �씠�젰�쓣 �궓湲곌린 �쐞�빐 issueForm �뿉 issueStatus Id 媛믪쓣 ���옣.
- issueForm.setIssueStatusId(issueStatus.getId());
- this.issueHistoryService.detectIssueStatus(issue, issueForm, detectIssueChange, oldIssueStatus, issueStatus);
+ issueForm.setIssueStatusId(checkIssueData.getNewIssueStatus().getId());
+ this.issueHistoryService.detectIssueStatus(checkIssueData.getIssue(), issueForm, detectIssueChange, checkIssueData.getOldIssueStatus(), checkIssueData.getNewIssueStatus());
}
// db�뿉 ���옣
- issue = this.saveIssue(issueForm, checkIssueData);
+// checkIssueData.setIssue(this.saveIssue(issueForm, checkIssueData));
// �씠�뒋 �씠�젰 �벑濡�
if (!StringUtils.isEmpty(detectIssueChange.toString())) {
- this.issueHistoryService.addIssueHistory(issue, user, IssueHistoryType.MODIFY, detectIssueChange.toString());
+ this.issueHistoryService.addIssueHistory(checkIssueData.getIssue(), user, IssueHistoryType.MODIFY, detectIssueChange.toString());
}
// �궗�슜�옄 �떆�뒪�뀥 湲곕뒫 �궗�슜 �젙蹂� �닔吏�
UserVo userVo = ConvertUtil.copyProperties(user, UserVo.class);
log.info(ElasticSearchUtil.makeUserActiveHistoryMessage(userVo, ElasticSearchConstants.ISSUE_MODIFY));
-
- return issue;
}
+
+
private Issue saveIssue(IssueForm issueForm, CheckIssueData checkIssueData) {
Issue issue = checkIssueData.getIssue();
ConvertUtil.copyProperties(issueForm, issue, "id");
--
Gitblit v1.8.0