From 146daecda27390f35b99c65a8c9565c6049bec71 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 16:54:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 72 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 7 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 0be3c51..0c3b5b1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -12,6 +12,7 @@
import kr.wisestone.owl.repository.IssueTypeRepository;
import kr.wisestone.owl.service.*;
import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.vo.*;
import kr.wisestone.owl.web.condition.IssueTypeCondition;
import kr.wisestone.owl.web.form.IssueTypeForm;
@@ -50,13 +51,7 @@
private WorkspaceService workspaceService;
@Autowired
- private CompanyFieldService companyFieldService;
-
- @Autowired
- private IspFieldService ispFieldService;
-
- @Autowired
- private HostingFieldService hostingFieldService;
+ private IssueStatusService issueStatusService;
@Autowired
private IssueTypeMapper issueTypeMapper;
@@ -85,6 +80,8 @@
for (ProjectType projectType : projectTypes) {
List<IssueType> issueTypes = Lists.newArrayList();
Workflow workflow = this.workflowService.findByWorkspaceIdAndProjectType(workspace.getId(), projectType);
+ //String projectKey = "BTS";
+ //Project project = this.projectService.findByProjectKey(projectKey);
switch (projectType) {
case BTS_PROJECT:
@@ -173,10 +170,30 @@
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+
List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+ for (Map<String, Object> result : results) {
+ Long projectId = MapUtil.getLong(result, "projectId");
+ if (projectId != null) {
+ Project project = this.projectService.getProject(projectId);
+ ProjectVo projectVo = ConvertUtil.copyProperties(project, ProjectVo.class);
+ result.put("projectVo", projectVo);
+
+ }
+ Long issueStatusId = MapUtil.getLong(result, "completeIssueStatusId");
+ if (issueStatusId != null) {
+ IssueStatus issueStatus = this.issueStatusService.getIssueStatus(issueStatusId);
+ IssueStatusVo issueStatusVo = ConvertUtil.copyProperties(issueStatus, IssueStatusVo.class);
+ result.put("completeIssueStatusVo", issueStatusVo);
+ }
+ }
+
Long totalCount = this.issueTypeMapper.count(condition);
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
List<IssueTypeVo> issueTypeVos = ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
+// for (IssueTypeVo issueTypeVo : issueTypeVos) {
+//
+// }
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
if (condition.getDeep() != null) {
@@ -184,6 +201,7 @@
}
this.setUseIssueTypeByProject(issueTypeVos);
+ this.setUseIssueTypeByIssueStatus(issueTypeVos);
/*this.setUseIssueTypeByCompanyField(issueTypeVos);
this.setUseIssueTypeByIspField(issueTypeVos);
this.setUseIssueTypeByHostingField(issueTypeVos);*/
@@ -194,6 +212,15 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVos);
return issueTypeVos;
+ }
+
+ // �씠�뒋 �쑀�삎 紐⑸줉�쓣 議고쉶�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public List<IssueTypeVo> findIssueType(IssueTypeCondition condition) {
+ condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+ return ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
}
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
@@ -212,6 +239,17 @@
Project project = issueType.getProject();
if (project != null) {
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
+ }
+ }
+ }
+
+ 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));
}
}
}
@@ -264,6 +302,26 @@
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;
+ }
+
// �씠�뒋 �쑀�삎�쓣 �닔�젙�븳�떎.
@Override
@Transactional
--
Gitblit v1.8.0