From 385f0d9070b90d2253ddaeaf1b2e2491ebaeda95 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 토, 11 12월 2021 21:34:18 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
index 344147e..6c22513 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -2,13 +2,10 @@
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.mapper.DepartmentMapper;
-import kr.wisestone.owl.repository.WorkflowDepartmentRepository;
import kr.wisestone.owl.service.*;
-import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.form.DepartmentForm;
-import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.jsoup.Jsoup;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,16 +46,13 @@
private DepartmentService departmentService;
@Autowired
- private UserDepartmentService userDepartmentService;
+ private WorkflowDepartmentService workflowDepartmentService;
@Autowired
private ProjectRoleDepartmentService projectRoleDepartmentService;
@Autowired
private ProjectRoleService projectRoleService;
-
- @Autowired
- private WorkflowDepartmentRepository workflowDepartmentRepository;
@Autowired
private IssueTypeService issueTypeService;
@@ -167,24 +161,37 @@
@Override
@Transactional(readOnly = true)
public void findWorkflowDepartment(Map<String, Object> resJsonData, DepartmentCondition departmentCondition) {
+ List<DepartmentVo> departmentVos = findWorkflowDepartment(departmentCondition.getIssueTypeId());
+ resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
+ }
- IssueType issueType = this.issueTypeService.getIssueType(departmentCondition.getIssueTypeId());
- Long workflowId = issueType.getWorkflow().getId();
- List<WorkflowDepartment> workflowDepartmentList = this.workflowDepartmentRepository.findByWorkflowId(workflowId);
+ // �썙�겕�뵆濡쒖슦�뿉 �냽�빐�엳�뒗 遺��꽌 紐⑸줉 議고쉶
+ @Override
+ @Transactional(readOnly = true)
+ public List<DepartmentVo> findWorkflowDepartment(Long issueTypeId) {
+ List<WorkflowDepartment> workflowDepartmentList = this.findWorkflowDepartmentByIssueTypeId(issueTypeId);
List<DepartmentVo> departmentVos = Lists.newArrayList();
- //List<Long> workflowDepartmentIds = Lists.newArrayList();
if(workflowDepartmentList != null && workflowDepartmentList.size()>0){
for(WorkflowDepartment workflowDepartment : workflowDepartmentList){
DepartmentVo departmentVo = ConvertUtil.copyProperties(workflowDepartment.getDepartment(), DepartmentVo.class);
departmentVo.setByName(departmentVo.getDepartmentName());
- //workflowDepartmentIds.add(workflowDepartment.getDepartment().getId());
departmentVos.add(departmentVo);
}
- resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
}
+ return departmentVos;
}
+ // �씠�뒋 �쑀�삎(�썙�겕�뵆濡쒖슦)�뿉 �엳�뒗 �떞�떦遺��꽌 議고쉶
+ private List<WorkflowDepartment> findWorkflowDepartmentByIssueTypeId(Long issueTypeId) {
+ Long workflowId = this.getWorkflowId(issueTypeId);
+ return this.workflowDepartmentService.find(workflowId);
+ }
+
+ private Long getWorkflowId(Long issueTypeId) {
+ IssueType issueType = this.issueTypeService.getIssueType(issueTypeId);
+ return issueType.getWorkflow().getId();
+ }
// 遺��꽌 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
--
Gitblit v1.8.0