From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 14:35:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 84 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 adaf960..c531292 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -16,6 +16,7 @@
  */
 public class IssueCondition {
     private Long id;
+    private String keyWord;
     private String title;
     private String description;
     private String combinationIssueNumber;
@@ -33,7 +34,9 @@
     private Long workspaceId;
     private String projectType;
     private String deep;
+    private String isApi;
     private Long parentIssueId;     // �긽�쐞 �씪媛�
+    private String useValue;
     private List<Long> projectIds = Lists.newArrayList();
     private List<Long> issueStatusIds = Lists.newArrayList();
     private List<Long> issueTypeIds = Lists.newArrayList();
@@ -44,11 +47,19 @@
     private List<Long> registerIds = Lists.newArrayList();
     private List<String> issueIds = Lists.newArrayList();   //  �씠�뒋 紐⑸줉 寃��깋�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶濡� 1李� 寃��깋�븳 寃곌낵瑜� �떞�쓣�븣 �궗�슜
     private List<Map<String, Object>> issueCustomFields = Lists.newArrayList();
+    private List<Map<String, Object>> issueCompanyField = Lists.newArrayList();
+    private List<Map<String, Object>> issueIspField = Lists.newArrayList();
+    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
 
     public IssueCondition(){}
+
+    public IssueCondition(Long issueId, Long parentIssueId){
+        this.id = issueId;
+        this.parentIssueId = parentIssueId;
+    }
     //  ���떆蹂대뱶 �쐞湲곌�由� �쐞�젽�뿉�꽌 �궗�슜
     public IssueCondition(List<String> issueIds){
         this.issueIds = issueIds;
@@ -84,6 +95,18 @@
 
         if (MapUtil.getObject(conditions, "issueCustomFields") != null) {
             condition.setIssueCustomFields((List)MapUtil.getObject(conditions, "issueCustomFields"));
+        }
+
+        if (MapUtil.getObject(conditions, "issueCompanyField") != null) {
+            condition.setIssueCompanyField((List)MapUtil.getObject(conditions, "issueCompanyField"));
+        }
+
+        if (MapUtil.getObject(conditions, "issueIspField") != null) {
+            condition.setIssueIspField((List)MapUtil.getObject(conditions, "issueIspField"));
+        }
+
+        if (MapUtil.getObject(conditions, "issueHostingField") != null) {
+            condition.setIssueHostingField((List)MapUtil.getObject(conditions, "issueHostingField"));
         }
 
         if (StringUtils.hasText(MapUtil.getString(conditions, "beginRegisterDate"))) {
@@ -152,7 +175,19 @@
             condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
         }
 
+        if (MapUtil.getLong(conditions, "issueId") != null) {
+            condition.setId(MapUtil.getLong(conditions, "issueId"));
+        }
+
         return condition;
+    }
+
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
     }
 
     public Long getId() {
@@ -267,6 +302,14 @@
         this.deep = deep;
     }
 
+    public String getIsApi() {
+        return isApi;
+    }
+
+    public void setIsApi(String isApi) {
+        this.isApi = isApi;
+    }
+
     public List<Long> getProjectIds() {
         return projectIds;
     }
@@ -355,6 +398,30 @@
         this.issueCustomFields = issueCustomFields;
     }
 
+    public List<Map<String, Object>> getIssueCompanyField() {
+        return issueCompanyField;
+    }
+
+    public void setIssueCompanyField(List<Map<String, Object>> issueCompanyField) {
+        this.issueCompanyField = issueCompanyField;
+    }
+
+    public List<Map<String, Object>> getIssueIspField() {
+        return issueIspField;
+    }
+
+    public void setIssueIspField(List<Map<String, Object>> issueIspField) {
+        this.issueIspField = issueIspField;
+    }
+
+    public List<Map<String, Object>> getIssueHostingField() {
+        return issueHostingField;
+    }
+
+    public void setIssueHostingField(List<Map<String, Object>> issueHostingField) {
+        this.issueHostingField = issueHostingField;
+    }
+
     public List<String> getIssueIds() {
         return issueIds;
     }
@@ -414,4 +481,20 @@
     public void setParentIssueId(Long parentIssueId) {
         this.parentIssueId = parentIssueId;
     }
+
+    public String getUseValue() {
+        return useValue;
+    }
+
+    public void setUseValue(String useValue) {
+        this.useValue = useValue;
+    }
+
+    public List<Long> getMyDepartmentIds() {
+        return myDepartmentIds;
+    }
+
+    public void setMyDepartmentIds(List<Long> myDepartmentIds) {
+        this.myDepartmentIds = myDepartmentIds;
+    }
 }

--
Gitblit v1.8.0