From 6a5fb9dcd9fe96d62b5dbbcc2bd48db478706389 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 15:56:22 +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 |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 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 9c40ce3..177072d 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -33,6 +33,8 @@
     private Long workspaceId;
     private String projectType;
     private String deep;
+    private Long parentIssueId;     // �긽�쐞 �씪媛�
+    private String useValue;
     private List<Long> projectIds = Lists.newArrayList();
     private List<Long> issueStatusIds = Lists.newArrayList();
     private List<Long> issueTypeIds = Lists.newArrayList();
@@ -43,6 +45,9 @@
     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();
 
@@ -83,6 +88,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"))) {
@@ -354,6 +371,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;
     }
@@ -406,4 +447,19 @@
         this.excludeIds = excludeIds;
     }
 
+    public Long getParentIssueId() {
+        return parentIssueId;
+    }
+
+    public void setParentIssueId(Long parentIssueId) {
+        this.parentIssueId = parentIssueId;
+    }
+
+    public String getUseValue() {
+        return useValue;
+    }
+
+    public void setUseValue(String useValue) {
+        this.useValue = useValue;
+    }
 }

--
Gitblit v1.8.0