이슈 테이블 설정 오류 해결

이민희

2022-01-13 303d80b28240177fdb813872d00fad757cd650d4

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

@@ -1,10 +1,9 @@
package kr.wisestone.owl.web.condition;

import com.google.common.collect.Lists;
import kr.wisestone.owl.util.CommonUtil;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.DateUtil;
import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.util.*;
import kr.wisestone.owl.vo.PageVo;
import org.springframework.data.domain.Pageable;
import org.springframework.util.StringUtils;

import java.util.Date;
@@ -53,7 +52,13 @@
    private List<Long> statusIds = Lists.newArrayList();
    private List<Long> excludeIds = Lists.newArrayList();
    private List<Long> myDepartmentIds; // 내가 속해있는 부서 ID
    private Boolean hideIssue;
    private Boolean hideDownIssue;
    private Boolean hideCompleteIssue;
    private Boolean isTree; // 트리구조 모드 일때
    private Pageable relPageable;
    private Pageable downPageable;
    private Boolean allIssue; // 전체이슈 보여주기
    private Long issueTypeId;

    public IssueCondition(){}

@@ -68,6 +73,20 @@

    public static IssueCondition make(Map<String, Object> conditions) {
        IssueCondition condition = ConvertUtil.convertMapToClass(conditions, IssueCondition.class);
        Map<String, Object> pageContents = (Map<String, Object>) conditions.get("pageContent");
        if (pageContents != null) {
            PageVo downPageVo = new PageVo();
            downPageVo.setPage(MapUtil.getInteger(pageContents, "downPage"));
            downPageVo.setPageSize(MapUtil.getInteger(pageContents, "downPageSize"));

            PageVo relPageVo = new PageVo();
            relPageVo.setPage(MapUtil.getInteger(pageContents, "relPage"));
            relPageVo.setPageSize(MapUtil.getInteger(pageContents, "relPageSize"));

            PageUtil pageUtil = new PageUtil();
            condition.setRelPageable(pageUtil.convertPageable(relPageVo));
            condition.setDownPageable(pageUtil.convertPageable(downPageVo));
        }

        if (!StringUtils.isEmpty(condition.getCombinationIssueNumber())) {
            if (condition.getCombinationIssueNumber().contains("-")) {
@@ -152,6 +171,10 @@
            condition.setIssueTypeIds(MapUtil.getLongs(conditions, "issueTypeIds"));
        }

        if (MapUtil.getLong(conditions, "issueTypeId") != null) {
            condition.setIssueTypeId(MapUtil.getLong(conditions, "issueTypeId"));
        }

        if (MapUtil.getLongs(conditions, "priorityIds") != null) {
            condition.setPriorityIds(MapUtil.getLongs(conditions, "priorityIds"));
        }
@@ -180,8 +203,22 @@
            condition.setId(MapUtil.getLong(conditions, "issueId"));
        }

        if (MapUtil.getBoolean(conditions, "hideIssue")) {
            condition.setHideIssue(MapUtil.getBoolean(conditions, "hideIssue"));
        if (MapUtil.getBoolean(conditions, "hideDownIssue") != null) {
            if(MapUtil.getBoolean(conditions, "isTree") != null && !MapUtil.getBoolean(conditions, "isTree")){
                condition.setHideDownIssue(MapUtil.getBoolean(conditions, "hideDownIssue"));
            }else if(MapUtil.getBoolean(conditions, "isTree")) {
                condition.setHideDownIssue(false);
            }
        }

        if (MapUtil.getBoolean(conditions, "hideCompleteIssue") != null) {
            condition.setHideCompleteIssue(MapUtil.getBoolean(conditions, "hideCompleteIssue"));
        }

        if (MapUtil.getBoolean(conditions, "isTree") != null) {
            condition.setTree(MapUtil.getBoolean(conditions, "isTree"));
        } else {
            condition.setTree(false);
        }

        return condition;
@@ -503,11 +540,59 @@
        this.myDepartmentIds = myDepartmentIds;
    }

    public Boolean getHideIssue() {
        return hideIssue;
    public Boolean getHideDownIssue() {
        return hideDownIssue;
    }

    public void setHideIssue(Boolean hideIssue) {
        this.hideIssue = hideIssue;
    public void setHideDownIssue(Boolean hideDownIssue) {
        this.hideDownIssue = hideDownIssue;
    }

    public Boolean getHideCompleteIssue() {
        return hideCompleteIssue;
    }

    public void setHideCompleteIssue(Boolean hideCompleteIssue) {
        this.hideCompleteIssue = hideCompleteIssue;
    }

    public Boolean getTree() {
        return isTree;
    }

    public void setTree(Boolean tree) {
        isTree = tree;
    }

    public Pageable getRelPageable() {
        return relPageable;
    }

    public void setRelPageable(Pageable relPageable) {
        this.relPageable = relPageable;
    }

    public Pageable getDownPageable() {
        return downPageable;
    }

    public void setDownPageable(Pageable downPageable) {
        this.downPageable = downPageable;
    }

    public Boolean getAllIssue() {
        return allIssue;
    }

    public void setAllIssue(Boolean allIssue) {
        this.allIssue = allIssue;
    }

    public Long getIssueTypeId() {
        return issueTypeId;
    }

    public void setIssueTypeId(Long issueTypeId) {
        this.issueTypeId = issueTypeId;
    }
}