From 30ddd2cf095d2857ba1134fb3deaf51392ef1030 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 21:31:45 +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 | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 587a349..344147e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -2,6 +2,7 @@
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;
@@ -55,6 +56,12 @@
@Autowired
private ProjectRoleService projectRoleService;
+
+ @Autowired
+ private WorkflowDepartmentRepository workflowDepartmentRepository;
+
+ @Autowired
+ private IssueTypeService issueTypeService;
@Autowired
private WorkspaceService workspaceService;
@@ -156,6 +163,28 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
}
+ // �썙�겕�뵆濡쒖슦�뿉 �냽�빐�엳�뒗 遺��꽌 紐⑸줉 議고쉶
+ @Override
+ @Transactional(readOnly = true)
+ public void findWorkflowDepartment(Map<String, Object> resJsonData, DepartmentCondition departmentCondition) {
+
+ IssueType issueType = this.issueTypeService.getIssueType(departmentCondition.getIssueTypeId());
+ Long workflowId = issueType.getWorkflow().getId();
+ List<WorkflowDepartment> workflowDepartmentList = this.workflowDepartmentRepository.findByWorkflowId(workflowId);
+ 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);
+ }
+ }
+
// 遺��꽌 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
--
Gitblit v1.8.0