Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-11-15 9e1224315ff031c5cfccda6ccb0d7841729d8612

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

@@ -43,6 +43,9 @@
    private WorkflowService workflowService;

    @Autowired
    private ProjectService projectService;

    @Autowired
    private WorkspaceService workspaceService;

    @Autowired
@@ -108,6 +111,8 @@
        issueType.setWorkspace(workspace);
        Workflow workflow = this.workflowService.getWorkflow(issueTypeForm.getWorkflowId());
        issueType.setWorkflow(workflow);
        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        return this.issueTypeRepository.saveAndFlush(issueType);
    }
@@ -166,6 +171,8 @@
            this.setUseIssueTypeByWorkflow(issueTypeVos);
        }

        this.setUseIssueTypeByProject(issueTypeVos);

        resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
                totalPage, totalCount));

@@ -179,6 +186,18 @@
        for (IssueTypeVo issueTypeVo : issueTypeVos) {
            IssueType issueType = this.getIssueType(issueTypeVo.getId());
            issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
        }
    }

    //  이슈 유형에 연결된 프로젝트 정보를 셋팅한다.
    private void setUseIssueTypeByProject(List<IssueTypeVo> issueTypeVos) {
        for (IssueTypeVo issueTypeVo : issueTypeVos) {
            IssueType issueType = this.getIssueType(issueTypeVo.getId());

            Project project = issueType.getProject();
            if (project != null) {
                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
            }
        }
    }

@@ -196,6 +215,11 @@
                case "01": //  워크플로우 정보를 가져온다.
                    issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
                    break;
            }

            Project project = issueType.getProject();
            if (project != null) {
                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
            }
        }

@@ -222,6 +246,9 @@
        ConvertUtil.copyProperties(issueTypeForm, issueType, "id", "issueTypeType");
        issueType.setWorkflow(workflow);

        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
        issueType.setProject(project);

        this.issueTypeRepository.saveAndFlush(issueType);

        return issueType;