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 |   72 ++++++++++++++++++++++++++++++++---
 1 files changed, 65 insertions(+), 7 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 301b14b..344147e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -1,11 +1,10 @@
 package kr.wisestone.owl.service.impl;
 
-import kr.wisestone.owl.domain.Department;
-import kr.wisestone.owl.domain.UserDepartment;
-import kr.wisestone.owl.domain.UserLevel;
+import kr.wisestone.owl.domain.*;
 import kr.wisestone.owl.mapper.DepartmentMapper;
-import kr.wisestone.owl.service.UserDepartmentService;
-import kr.wisestone.owl.service.UserService;
+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;
@@ -13,6 +12,7 @@
 import org.jsoup.Jsoup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import com.google.common.collect.Lists;
 import kr.wisestone.owl.common.ExcelConditionCheck;
@@ -20,8 +20,6 @@
 import kr.wisestone.owl.constant.MsgConstants;
 import kr.wisestone.owl.exception.OwlRuntimeException;
 import kr.wisestone.owl.repository.DepartmentRepository;
-import kr.wisestone.owl.service.DepartmentService;
-import kr.wisestone.owl.service.WorkspaceService;
 import kr.wisestone.owl.util.ConvertUtil;
 import kr.wisestone.owl.vo.*;
 import kr.wisestone.owl.web.view.ExcelView;
@@ -52,6 +50,18 @@
 
     @Autowired
     private UserDepartmentService userDepartmentService;
+
+    @Autowired
+    private ProjectRoleDepartmentService projectRoleDepartmentService;
+
+    @Autowired
+    private ProjectRoleService projectRoleService;
+
+    @Autowired
+    private WorkflowDepartmentRepository workflowDepartmentRepository;
+
+    @Autowired
+    private IssueTypeService issueTypeService;
 
     @Autowired
     private WorkspaceService workspaceService;
@@ -127,6 +137,54 @@
         this.departmentRepository.flush();
     }
 
+    //  �봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 遺��꽌 �젙蹂대�� 議고쉶�븳�떎.
+    @Override
+    @Transactional(readOnly = true)
+    public List<Map<String, Object>> findProjectDepartment(Project project) {
+        DepartmentCondition departmentCondition = new DepartmentCondition();
+        departmentCondition.setProjectId(project.getId());
+        return this.departmentMapper.findProjectDepartment(departmentCondition);
+    }
+
+    //  �봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 遺��꽌 紐⑸줉�쓣 媛��졇�삩�떎.
+    @Override
+    @Transactional(readOnly = true)
+    public void findProjectDepartment(Map<String, Object> resJsonData, DepartmentCondition departmentCondition) {
+        ProjectRole projectRole = this.projectRoleService.findByProjectIdAndRoleType(departmentCondition.getProjectId(), ProjectRole.TYPE_DEFAULT);
+        List<ProjectRoleDepartment> projectRoleDepartments = this.projectRoleDepartmentService.findByProjectRoleId(projectRole.getId());
+        List<DepartmentVo> departmentVos = Lists.newArrayList();
+
+        for (ProjectRoleDepartment projectRoleDepartment : projectRoleDepartments) {
+            DepartmentVo departmentVo = ConvertUtil.copyProperties(projectRoleDepartment.getDepartment(), DepartmentVo.class);
+            departmentVo.setByName(departmentVo.getDepartmentName());
+            departmentVos.add(departmentVo);
+        }
+
+        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