From 6ae9f3ab6d498f7a4d72c3fbbe8b90e6358f389b Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 21 12월 2021 13:31:54 +0900
Subject: [PATCH] 사용자 정의필드 시간형태 등호 변경

---
 src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 1 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
index 6b0c747..23b0d61 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -34,6 +34,7 @@
     private Long workspaceId;
     private String projectType;
     private String deep;
+    private String isApi;
     private Long parentIssueId;     // �긽�쐞 �씪媛�
     private String useValue;
     private List<Long> projectIds = Lists.newArrayList();
@@ -51,9 +52,17 @@
     private List<Map<String, Object>> issueHostingField = Lists.newArrayList();
     private List<Long> statusIds = Lists.newArrayList();
     private List<Long> excludeIds = Lists.newArrayList();
-
+    private List<Long> myDepartmentIds; // �궡媛� �냽�빐�엳�뒗 遺��꽌 ID
+    private Boolean hideDownIssue;
+    private Boolean hideCompleteIssue;
+    private Boolean isTree; // �듃由ш뎄議� 紐⑤뱶 �씪�븣
 
     public IssueCondition(){}
+
+    public IssueCondition(Long issueId, Long parentIssueId){
+        this.id = issueId;
+        this.parentIssueId = parentIssueId;
+    }
     //  ���떆蹂대뱶 �쐞湲곌�由� �쐞�젽�뿉�꽌 �궗�슜
     public IssueCondition(List<String> issueIds){
         this.issueIds = issueIds;
@@ -171,6 +180,24 @@
 
         if (MapUtil.getLong(conditions, "issueId") != null) {
             condition.setId(MapUtil.getLong(conditions, "issueId"));
+        }
+
+        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;
@@ -294,6 +321,14 @@
 
     public void setDeep(String deep) {
         this.deep = deep;
+    }
+
+    public String getIsApi() {
+        return isApi;
+    }
+
+    public void setIsApi(String isApi) {
+        this.isApi = isApi;
     }
 
     public List<Long> getProjectIds() {
@@ -475,4 +510,36 @@
     public void setUseValue(String useValue) {
         this.useValue = useValue;
     }
+
+    public List<Long> getMyDepartmentIds() {
+        return myDepartmentIds;
+    }
+
+    public void setMyDepartmentIds(List<Long> myDepartmentIds) {
+        this.myDepartmentIds = myDepartmentIds;
+    }
+
+    public Boolean getHideDownIssue() {
+        return hideDownIssue;
+    }
+
+    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;
+    }
 }

--
Gitblit v1.8.0