이슈 목록 조회 방식 - 전체이슈 보기 / 상위 이슈만 보기 / 하위 이슈만 보기로 수정

박지현

2022-03-07 71a5ce92795fb1a4fbff5fceab8135ec98a691e5

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

@@ -6,6 +6,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.util.StringUtils;

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -27,6 +28,8 @@
    private String endStartDate;
    private String beginCompleteDate;
    private String endCompleteDate;
    private String beginDateRange;
    private String endDateRange;
    private Integer page;
    private Integer pageSize;
    private Long loginUserId;
@@ -57,8 +60,9 @@
    private Boolean isTree; // 트리구조 모드 일때
    private Pageable relPageable;
    private Pageable downPageable;
    private Boolean allIssue; // 전체이슈 보여주기
    private Boolean allIssue; // 완료된 이슈까지 보여줄지 여부
    private Long issueTypeId;
    private Boolean parentYN;   //상위이슈만 조회 여부

    public IssueCondition(){}

@@ -159,6 +163,18 @@
            condition.setEndCompleteDate(DateUtil.convertDateToStr(endCompleteDate, "yyyy-MM-dd"));
        }

        if (StringUtils.hasText(MapUtil.getString(conditions, "dateRange"))) {
            String dateRange = MapUtil.getString(conditions, "dateRange");
            if (!StringUtils.isEmpty(dateRange)) {
                List<String> date = Arrays.asList(dateRange.split("~"));

                Date beginDateRange = DateUtil.convertStrToDate(date.get(0).trim(), "yy-MM-dd");
                condition.setBeginDateRange(DateUtil.convertDateToStr(beginDateRange, "yyyy-MM-dd"));
                Date endDateRange = DateUtil.convertStrToDate(date.get(1).trim(), "yy-MM-dd");
                condition.setEndDateRange(DateUtil.convertDateToStr(endDateRange, "yyyy-MM-dd"));
            }
        }

        if (MapUtil.getLongs(conditions, "projectIds") != null) {
            condition.setProjectIds(MapUtil.getLongs(conditions, "projectIds"));
        }
@@ -203,9 +219,24 @@
            condition.setId(MapUtil.getLong(conditions, "issueId"));
        }

        if (MapUtil.getBoolean(conditions, "hideDownIssue") != null) {

        if (MapUtil.getInteger(conditions, "hideDownIssue") != null) {
            int hideDownIssue = MapUtil.getInteger(conditions, "hideDownIssue");
            if(MapUtil.getBoolean(conditions, "isTree") != null && !MapUtil.getBoolean(conditions, "isTree")){
                condition.setHideDownIssue(MapUtil.getBoolean(conditions, "hideDownIssue"));
                switch (hideDownIssue){
                    case 0 : // 이슈 모두 보여주기
                        condition.setHideDownIssue(false);
                        condition.setParentYN(true);
                        break;
                    case 1 : // 상위이슈만 보여주기
                        condition.setHideDownIssue(true);
                        condition.setParentYN(true);
                        break;
                    case 2 : // 하위이슈만 보여주기
                        condition.setHideDownIssue(false);
                        condition.setParentYN(false);
                        break;
                }
            }else if(MapUtil.getBoolean(conditions, "isTree")) {
                condition.setHideDownIssue(false);
            }
@@ -219,6 +250,10 @@
            condition.setTree(MapUtil.getBoolean(conditions, "isTree"));
        } else {
            condition.setTree(false);
        }

        if (MapUtil.getBoolean(conditions, "parentYN") != null && MapUtil.getBoolean(conditions, "parentYN")) {
            condition.setParentYN(true);
        }

        return condition;
@@ -310,6 +345,22 @@

    public void setEndCompleteDate(String endCompleteDate) {
        this.endCompleteDate = endCompleteDate;
    }

    public String getBeginDateRange() {
        return beginDateRange;
    }

    public void setBeginDateRange(String beginDateRange) {
        this.beginDateRange = beginDateRange;
    }

    public String getEndDateRange() {
        return endDateRange;
    }

    public void setEndDateRange(String endDateRange) {
        this.endDateRange = endDateRange;
    }

    public Integer getPage() {
@@ -595,4 +646,12 @@
    public void setIssueTypeId(Long issueTypeId) {
        this.issueTypeId = issueTypeId;
    }

    public Boolean getParentYN() {
        return parentYN;
    }

    public void setParentYN(Boolean parentYN) {
        this.parentYN = parentYN;
    }
}