Merge remote-tracking branch 'origin/master'

jhjang

2021-12-14 fe2b018f2c33d4444ed8a9c731f78e8f9ec6aadc

 src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java

@@ -2,12 +2,11 @@

import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.mapper.DepartmentMapper;
import kr.wisestone.owl.repository.UserDepartmentRepository;
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;
@@ -42,19 +41,25 @@
    private DepartmentRepository departmentRepository;

    @Autowired
    private UserDepartmentService userDepartmentService;

    @Autowired
    private DepartmentMapper departmentMapper;

    @Autowired
    private DepartmentService departmentService;

    @Autowired
    private UserDepartmentService userDepartmentService;
    private WorkflowDepartmentService workflowDepartmentService;

    @Autowired
    private ProjectRoleDepartmentService projectRoleDepartmentService;

    @Autowired
    private ProjectRoleService projectRoleService;

    @Autowired
    private IssueTypeService issueTypeService;

    @Autowired
    private WorkspaceService workspaceService;
@@ -156,6 +161,41 @@
        resJsonData.put(Constants.RES_KEY_CONTENTS, departmentVos);
    }

    //  워크플로우에 속해있는 부서 목록 조회
    @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);
    }

    //  워크플로우에 속해있는 부서 목록 조회
    @Override
    @Transactional(readOnly = true)
    public List<DepartmentVo> findWorkflowDepartment(Long issueTypeId) {
        List<WorkflowDepartment> workflowDepartmentList = this.findWorkflowDepartmentByIssueTypeId(issueTypeId);
        List<DepartmentVo> departmentVos = Lists.newArrayList();

        if(workflowDepartmentList != null && workflowDepartmentList.size()>0){
            for(WorkflowDepartment workflowDepartment : workflowDepartmentList){
                DepartmentVo departmentVo = ConvertUtil.copyProperties(workflowDepartment.getDepartment(), DepartmentVo.class);
                departmentVo.setByName(departmentVo.getDepartmentName());
                departmentVos.add(departmentVo);
            }
        }
        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
@@ -197,7 +237,12 @@

    @Override
    public boolean countInDepartment(Long id) {
        return this.departmentMapper.countInDepartment(id) > 0;
        boolean result = false;
        List<UserDepartment> usingDepartments = this.userDepartmentService.findByDepartmentId(id);
        if(usingDepartments != null && usingDepartments.size() > 0){
            result = true;
        }
        return result;
    }

    //  DepartmentVos 데이터를 엑셀에서 표시할 수 있는 데이터로 변경한다.