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

wyu

2021-12-07 abafa635343ceb64ac96df24d061ea49809fc268

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

 src/main/java/kr/wisestone/owl/service/IssueService.java

@@ -92,4 +92,6 @@
    void findPartner(Map<String, Object> resJsonData, Map<String, Object> params);

    void findApiIssue(ApiMonitorCondition apiMonitorCondition, Map<String, Object> resJsonData);

    void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos);
}

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

@@ -732,21 +732,33 @@
        return issueVos;
    }

    private void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
    @Override
    @Transactional(readOnly = true)
    public void setCountDownIssues(List<Map<String, Object>> results, List<IssueVo> issueVos) {
        for (Map<String, Object> result : results){
            List<Issue> downIssues = this.issueRepository.findByParentIssueId((Long) result.get("id")); //하위이슈 가져오기
            if(downIssues != null && downIssues.size() > 0){ //상위이슈 가지고 있는 애들이 있으면
                int downIssueCount = 0;
                int downIssueAllCount = 0;// 하위이슈 전체 카운트
                int downIssueCount = 0;// 하위이슈 미완료 카운트
                for(Issue downIssue : downIssues){
                    downIssueCount ++;
                    downIssueAllCount ++;
                    Long parentIssueId = downIssue.getParentIssue().getId();
                    Issue parentIssue = this.getIssue(parentIssueId);
                    IssueVo parentIssueVo = ConvertUtil.copyProperties(parentIssue, IssueVo.class);
                    parentIssueVo.setDownIssueCount(downIssueCount);
                    parentIssueVo.setDownIssueAllCount(downIssueAllCount);

                    IssueStatus downIssueStatus = this.issueStatusService.getIssueStatus(downIssue.getIssueStatus().getId());
                    IssueVo downIssueVo = ConvertUtil.copyProperties(downIssue, IssueVo.class);
                    downIssueVo.setIssueStatusType(downIssueStatus.getIssueStatusType().toString());

                    if(!downIssueVo.getIssueStatusType().equals("CLOSE")){ //미완료 하위이슈 체크
                        downIssueCount ++;
                    }

                    for(IssueVo issueVo : issueVos){
                        if(issueVo.getId().equals(parentIssueVo.getId())){
                            issueVo.setDownIssueCount(parentIssueVo.getDownIssueCount());
                            issueVo.setDownIssueCount(downIssueCount);
                            issueVo.setDownIssueAllCount(parentIssueVo.getDownIssueAllCount());
                        }
                    }
                }

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

@@ -323,11 +323,11 @@
        //  삭제할 이슈 상태가 워크플로우 에서 사용되고 있는지 확인한다.
        this.checkUseWorkflow(issueStatus);

        //  기본으로 제공되는 이슈 상태는 삭제 금지
        if (issueStatus.getDefaultYn()) {
        //  기본으로 제공되는 이슈 상태는 삭제 금지 -> 기본제공이여도 사용하지 않으면 삭제 가능하도록 수정
        /*if (issueStatus.getDefaultYn()) {
            throw new OwlRuntimeException(
                    this.messageAccessor.getMessage(MsgConstants.DEFAULT_ISSUE_STATUS_NOT_REMOVE));
        }
        }*/

        this.issueStatusRepository.delete(issueStatus);
    }

 src/main/java/kr/wisestone/owl/vo/IssueVo.java

@@ -54,6 +54,7 @@
    private WorkflowStatusVo workflowStatusVo;
    private IssueVo parentIssueVo;
    private int downIssueCount;
    private int downIssueAllCount;

    private List<IssueCompanyVo> issueCompanyVos;
    private List<IssueIspVo> issueIspVos;
@@ -466,4 +467,12 @@
    public void setDownIssueCount(int downIssueCount) {
        this.downIssueCount = downIssueCount;
    }

    public int getDownIssueAllCount() {
        return downIssueAllCount;
    }

    public void setDownIssueAllCount(int downIssueAllCount) {
        this.downIssueAllCount = downIssueAllCount;
    }
}

 src/main/resources/mybatis/query-template/issueStatus-template.xml

@@ -8,8 +8,7 @@
        DISTINCT i.id as id,
        i.name as name,
        i.color as color,
        i.issue_status_type as issueStatusType,
        CASE i.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
        i.issue_status_type as issueStatusType
        FROM
        issue_status i
        INNER JOIN workspace ws on i.workspace_id = ws.id

 src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js

@@ -193,6 +193,11 @@
                                            }
                                            break;

                                        //  하위이슈 카운트
                                        case "DOWN_ISSUE_COUNT" :
                                            makeTag += '<span>'  + scope.data.downIssueCount + ' / ' + scope.data.downIssueAllCount + '</span>';
                                            break;

                                        //  프로젝트 기간 표시
                                        case "PROJECT_DUE_DATE" :
                                            makeTag += "<span>" + scope.data.startDate + " ~ " + scope.data.endDate + "</span>";

 src/main/webapp/scripts/app/issue/issueList.controller.js

@@ -309,9 +309,10 @@
                        case "COUNT_DOWN_ISSUE" : //  하위 이슈 개수
                            $scope.vm.tableConfigs.push($tableProvider.config()
                                .setHName("common.countDownIssue")
                                .setDType("renderer")
                                .setHWidth("bold " + issueTableConfig.width)
                                .setDAlign("text-center")
                                .setDName("downIssueCount"));
                                .setDRenderer("DOWN_ISSUE_COUNT"));
                            break;
                    }