- 전체 프로젝트 선택시 이슈유형에 프로젝트 설정 되어 있는 항목만 리스트로 가져오도록 수정

jhjang

2021-11-16 dd7e78ae9a5732ec89f65a8c51ee894947bafcb6

- 전체 프로젝트 선택시 이슈유형에 프로젝트 설정 되어 있는 항목만 리스트로 가져오도록 수정

 src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java

@@ -1,6 +1,7 @@
package kr.wisestone.owl.web.condition;

import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;

import java.util.Map;

@@ -15,11 +16,15 @@
    private Long workspaceId;
    private Long projectId;
    private String deep;    //  상세 조회에서 가져올 데이터의 종류를 결정한다.
    private boolean UseProject = false;     // 프로젝트에서 사용중인 이슈타입을 가져올때 사용

    public IssueTypeCondition(){}

    public static IssueTypeCondition make(Map<String, Object> conditions) {
        IssueTypeCondition condition = ConvertUtil.convertMapToClass(conditions, IssueTypeCondition.class);
    public static IssueTypeCondition make(Map<String, Object> params) {
        IssueTypeCondition condition = ConvertUtil.convertMapToClass(params, IssueTypeCondition.class);
        if (MapUtil.getString(params, "useProject") != null) {
            condition.setUseProject(MapUtil.getBoolean(params, "useProject"));
        }
        return condition;
    }

@@ -78,4 +83,12 @@
    public void setProjectId(Long projectId) {
        this.projectId = projectId;
    }

    public boolean isUseProject() {
        return UseProject;
    }

    public void setUseProject(boolean useProject) {
        UseProject = useProject;
    }
}

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

@@ -19,6 +19,9 @@
        <if test="projectId != '' and projectId != null">
            AND it.project_id like CONCAT('%',#{projectId},'%')
        </if>
        <if test="useProject != '' and useProject != null and useProject == true">
            AND it.project_id IS NOT NULL
        </if>
        AND ws.id = #{workspaceId}
        <if test="page != null and !page.equals('')">
            limit #{pageSize} offset #{page};

 src/main/webapp/scripts/app/common/common.controller.js

@@ -211,6 +211,7 @@
                   //  이슈 타입 목록 검색 조건을 만든다.
                   var conditions = {
                       projectId : projectId > -1 ? projectId : null,
                       useProject : true,
                       deep : "01" //  이슈 유형에 연결된 워크플로우 정보를 찾는다.
                   }


 src/main/webapp/views/project/projectList.html

@@ -20,9 +20,11 @@
            <li class="nav-item">
                <a class="nav-link cursor" ng-class="{ 'active' : vm.tab == 'PROJECT_LIST' }" ng-click="fn.changeTab('PROJECT_LIST')" translate="project.normalList">일감 목록</a>
            </li>
            <!--
            <li class="nav-item">
                <a class="nav-link cursor" ng-class="{ 'active' : vm.tab == 'PROJECT_TIMELINE' }" ng-click="fn.changeTab('PROJECT_TIMELINE')" translate="project.timeLine">타임 라인</a>
            </li>
            -->
        </ul>
    </div>
</div>
@@ -32,9 +34,10 @@
    <div ng-show="vm.tab == 'PROJECT_LIST'">
        <div ng-include include-replace src="'views/project/projectListNormal.html'"></div>
    </div>

<!--
    <div ng-show="vm.tab == 'PROJECT_TIMELINE'">
        <div ng-include include-replace src="'views/project/projectListTimeline.html'"></div>
    </div>
    -->
</div>