From 261950c3d8e20fb94141c03b37a2872f75477831 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 금, 14 1월 2022 21:07:15 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/service/impl/WorkflowDepartmentServiceImpl.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/service/impl/WorkflowDepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WorkflowDepartmentServiceImpl.java index 517cd31..e820d25 100644 --- a/src/main/java/kr/wisestone/owl/service/impl/WorkflowDepartmentServiceImpl.java +++ b/src/main/java/kr/wisestone/owl/service/impl/WorkflowDepartmentServiceImpl.java @@ -66,6 +66,40 @@ } // �떞�떦 遺��꽌�젙蹂대�� 議고쉶�븳�떎. + public List<WorkflowDepartmentVo> find(Long workflowId, Long issueStatusId) { + WorkflowDepartmentCondition condition = new WorkflowDepartmentCondition(); + condition.setWorkflowId(workflowId); + condition.setIssueStatusId(issueStatusId); + + return find(condition); + } + + public List<WorkflowDepartment> find(Long workflowId) { + return this.workflowDepartmentRepository.findByWorkflowId(workflowId); + } + + + @Override + // �썙�겕�뵆濡쒖슦�쓽 �빐�떦 �씠�뒋�긽�깭瑜� 媛�吏� �썙�겕�뵆濡쒖슦 遺��꽌 媛��졇�삤湲�(Ready) + public List<Long> findFirstDepartmentIds(Workflow workflow) { + List<Long> departmentIds = Lists.newArrayList(); + IssueStatus issueStatus = issueStatusService.findByIssueStatusTypeIsReady(workflow); + + // �썙�겕�뵆濡쒖슦 �긽�깭�뿉 �뵲瑜� �떞�떦遺��꽌 媛��졇�삤湲� + if (issueStatus != null) { + WorkflowDepartmentCondition workflowDepartmentCondition = new WorkflowDepartmentCondition(); + workflowDepartmentCondition.setIssueStatusId(issueStatus.getId()); + workflowDepartmentCondition.setWorkflowId(workflow.getId()); + List<WorkflowDepartmentVo> workflowDepartmentVos = this.find(workflowDepartmentCondition); + + for (WorkflowDepartmentVo workflowDepartmentVo : workflowDepartmentVos) { + departmentIds.add(workflowDepartmentVo.getDepartmentVo().getId()); + } + } + return departmentIds; + } + + // �떞�떦 遺��꽌�젙蹂대�� 議고쉶�븳�떎. @Transactional(readOnly = true) @Override public List<WorkflowDepartmentVo> find(WorkflowDepartmentCondition condition) { -- Gitblit v1.8.0