이슈 Tree 목록 중복 이슈 필터링 수정

이민희

2021-12-14 1cc04f2168129f691eb017153b11b08ab83d9cbd

이슈 Tree 목록 중복 이슈 필터링 수정

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

@@ -866,8 +866,11 @@
        for(IssueVo issueVo : issueVos) {
            if(issueVo.getParentIssueId() != null) {
                Issue parentIssue = this.getIssue(issueVo.getParentIssueId());
                issueVo.setParentIssueVo(ConvertUtil.copyProperties(parentIssue, IssueVo.class));
                ConvertUtil.copyProperties(issueVo.getParentIssueVo(), issueVo);
                //issueVo.setParentIssueVo(ConvertUtil.copyProperties(parentIssue, IssueVo.class));
                if(parentIssue.getIssueCustomFieldValues() == null || parentIssue.getIssueCustomFieldValues().size() == 0){
                    issueVo.setIssueCustomFieldValueVos(null);
                }
                ConvertUtil.copyProperties(parentIssue, issueVo);
            }
        }
    }

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

@@ -54,7 +54,7 @@
        LEFT OUTER JOIN user user ON issue_user.user_id = user.id
        WHERE 1=1
        <if test="keyWord != null and !keyWord.equals('') ">
            AND issue.title like CONCAT('%',#{keyWord},'%')
            AND (issue.title like CONCAT('%',#{keyWord},'%')
            OR issue.description like CONCAT('%',#{keyWord},'%')
            OR issue.start_date like CONCAT('%',#{keyWord},'%')
            OR issue.complete_date like CONCAT('%',#{keyWord},'%')
@@ -68,7 +68,7 @@
            OR priority.name like CONCAT('%',#{keyWord},'%')
            OR severity.name like CONCAT('%',#{keyWord},'%')
            OR issue_custom.use_value like CONCAT('%',#{keyWord},'%')
            OR d.department_name like CONCAT('%',#{keyWord},'%')
            OR d.department_name like CONCAT('%',#{keyWord},'%'))
        </if>

        <if test="title != null and !title.equals('')">
@@ -573,7 +573,7 @@
        LEFT OUTER JOIN user user ON issue_user.user_id = user.id
        WHERE 1=1
        <if test="keyWord != null and !keyWord.equals('') ">
            AND issue.title like CONCAT('%',#{keyWord},'%')
            AND (issue.title like CONCAT('%',#{keyWord},'%')
            OR issue.description like CONCAT('%',#{keyWord},'%')
            OR issue.start_date like CONCAT('%',#{keyWord},'%')
            OR issue.complete_date like CONCAT('%',#{keyWord},'%')
@@ -587,7 +587,7 @@
            OR priority.name like CONCAT('%',#{keyWord},'%')
            OR severity.name like CONCAT('%',#{keyWord},'%')
            OR issue_custom.use_value like CONCAT('%',#{keyWord},'%')
            OR d.department_name like CONCAT('%',#{keyWord},'%')
            OR d.department_name like CONCAT('%',#{keyWord},'%'))
        </if>

        <if test="title != null and !title.equals('')">

 src/main/webapp/views/issue/issueListNormal.html

@@ -336,8 +336,8 @@

                            <!--    우측  -->
                            <div class="col-5" >
                                <span class="issue-detail-label" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">◆</span> 하위 이슈 숨기기</span>
                                <label class='switch' style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
                                <span class="issue-detail-label" ng-if="vm.listMode === 0" style="position: relative; left: 2.8rem; bottom: 5px"><span style="color: #0a7cf8">◆</span> 하위 이슈 숨기기</span>
                                <label class='switch' ng-if="vm.listMode === 0" style="left: 3.3rem"><input type='checkbox' ng-model='vm.hideDownIssue' ng-click='fn.getPageList(0)'>
                                    <span class='slider round'></span>
                                </label>
                                <span class="issue-detail-label" style="position: relative; left: 5.8rem; bottom: 5px"><span style="color: #0a7cf8">◆</span> 완료 이슈 숨기기</span>