From f820bc3406e6fe88660124b28507f21df6b659ab Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 24 12월 2021 16:47:39 +0900
Subject: [PATCH] 이슈타입 리스트 하위 프로젝트꺼까지 다 보이도록 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 79 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index 1ffff50..b32b1d4 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -10,6 +10,8 @@
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.mapper.IssueTypeMapper;
import kr.wisestone.owl.repository.IssueTypeRepository;
+import kr.wisestone.owl.repository.ProjectClosureRepository;
+import kr.wisestone.owl.repository.ProjectRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
@@ -32,6 +34,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
@Service
public class IssueTypeServiceImpl extends AbstractServiceImpl<IssueType, Long, JpaRepository<IssueType, Long>> implements IssueTypeService {
@@ -40,6 +43,9 @@
@Autowired
private IssueTypeRepository issueTypeRepository;
+
+ @Autowired
+ private ProjectRepository projectRepository;
@Autowired
private WorkflowService workflowService;
@@ -63,6 +69,9 @@
private UserService userService;
@Autowired
+ private ProjectClosureRepository projectClosureRepository;
+
+ @Autowired
private ExcelView excelView;
@Autowired
@@ -83,21 +92,37 @@
switch (projectType) {
case BTS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99")); // 踰꾧렇
- issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe")); // 媛쒖꽑
+ issueTypes.add(new IssueType(workspace, workflow, "�븙�꽦 �룄硫붿씤", "", "#ff5f99", 0L)); // 踰꾧렇
+ issueTypes.add(new IssueType(workspace, workflow, "寃쎌쑀吏� ���쓳", "", "#3598fe", 0L)); // 媛쒖꽑
break;
case RMS_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2")); // �슂援� �궗�빆
+ issueTypes.add(new IssueType(workspace, workflow, "�쑀�룷吏� ���쓳", "", "#3bcde2", 0L)); // �슂援� �궗�빆
break;
case TCM_PROJECT:
- issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7")); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
+ issueTypes.add(new IssueType(workspace, workflow, "遺꾩꽍寃곌낵 ���쓳", "", "#008ca7", 0L)); // �뀒�뒪�듃 耳��씠�뒪, �떎�뻾 �닚�꽌, �쟾�젣 議곌굔, 湲곕� 寃곌낵
break;
}
-
this.issueTypeRepository.saveAll(issueTypes);
}
+ }
+
+ @Override
+ @Transactional
+ public void addDefaultUsedProject(Workspace workspace) {
+ List<IssueType> issueTypes = this.issueTypeRepository.findByWorkspaceId(workspace.getId());
+ List<Project> projects = this.projectRepository.findByWorkspaceId(workspace.getId());
+ if(issueTypes != null && issueTypes.size() > 0){
+ for(IssueType issueType : issueTypes){
+ if(projects != null && projects.size()>0){
+ for(Project project : projects){
+ issueType.setProject(project);
+ }
+ }
+ }
+ }
+
}
// �씠�뒋 �쑀�삎�쓣 �깮�꽦�븳�떎.
@@ -165,9 +190,20 @@
public List<IssueTypeVo> findIssueType(Map<String, Object> resJsonData,
IssueTypeCondition condition, Pageable pageable) {
+ List<Long> downProjectIds = Lists.newArrayList();
+
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+
+ List<ProjectClosure> projectClosures = this.projectClosureRepository.findByParentProjectId(condition.getProjectId());
+ if (projectClosures != null) {
+ for (ProjectClosure projectClosure : projectClosures) {
+ Long downProjectId = projectClosure.getProject().getId();
+ downProjectIds.add(downProjectId);
+ }
+ }
+ condition.setDownProjectIds(downProjectIds);
List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
for (Map<String, Object> result : results) {
@@ -241,13 +277,20 @@
}
}
+ // �씠�뒋 �쑀�삎�뿉 �봽濡쒖젥�듃ID濡� 議고쉶
+ public List<IssueType> findByProjectId(Long projectId) {
+ return this.issueTypeRepository.findByProjectId(projectId);
+ }
+
private void setUseIssueTypeByIssueStatus(List<IssueTypeVo> issueTypeVos) {
for (IssueTypeVo issueTypeVo : issueTypeVos) {
IssueType issueType = this.getIssueType(issueTypeVo.getId());
- IssueStatus issueStatus = issueType.getIssueStatus();
- if (issueStatus != null) {
- issueTypeVo.setCompleteIssueStatusVo(ConvertUtil.copyProperties(issueType.getIssueStatus(), IssueStatusVo.class));
+ Set<IssueTypeApiEndStatus> issueTypeApiEndStatuses = issueType.getIssueTypeApiEndStatuses();
+ if (issueTypeApiEndStatuses != null && issueTypeApiEndStatuses.size() > 0) {
+ IssueTypeApiEndStatus issueTypeApiEndStatus = issueTypeApiEndStatuses.iterator().next();
+
+ issueTypeVo.setCompleteIssueStatusVo(ConvertUtil.copyProperties(issueTypeApiEndStatus.getIssueStatus(), IssueStatusVo.class));
}
}
}
@@ -298,26 +341,6 @@
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
- }
-
- // �씠�뒋 �쑀�삎�쓣 �닔�젙�븳�떎. �옄�룞 醫낅즺 �꽕�젙留� �닔�젙
- @Override
- @Transactional
- public IssueType modifyIssueTypeCompleteIssueStatus(IssueTypeForm issueTypeForm) {
- // �궗�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�씠 �솢�꽦 �긽�깭�씤吏� �솗�씤�븳�떎. �궗�슜 怨듦컙�뿉�꽌 濡쒓렇�씤�븳 �궗�슜�옄媛� 鍮꾪솢�꽦�씤吏� �솗�씤�븳�떎.
- this.workspaceService.checkUseWorkspace();
-
- IssueType issueType = this.getIssueType(issueTypeForm.getId());
- if (issueTypeForm.getCompleteIssueStatusId() != null) {
- // api�뿉�꽌 �궗�슜�븯�뒗 �옄�룞 醫낅즺 �씠�뒋 �긽�깭
- IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueTypeForm.getCompleteIssueStatusId());
- issueType.setIssueStatus(issueStatus);
- }else {
- issueType.setIssueStatus(null);
- }
-
- this.issueTypeRepository.saveAndFlush(issueType);
- return issueType;
}
// �씠�뒋 �쑀�삎�쓣 �닔�젙�븳�떎.
--
Gitblit v1.8.0