From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java
index 61d82dd..5475ac0 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java
@@ -10,14 +10,27 @@
 import java.util.Map;
 
 /**
+ * �씠�뒋 �궗�슜�옄 �젙�쓽 �븘�뱶 媛� 寃��깋 議곌굔 �겢�옒�뒪
  * Created by wisestone on 2018-06-07.
  */
 public class IssueCustomFieldValueCondition {
+    private Long issueTypeId;
     private Long workspaceId;
     private Long customFieldId;
     private String customFieldType;
-    private List<String> useValues = Lists.newArrayList();  //  �떒�씪, �떎以� �씪�븣 寃��깋 媛�
-    private String useValue;    //  �뀓�뒪�듃 �븘�뱶�씪 �븣 寃��깋 媛�
+    /**
+     * �궗�슜�옄 �젙�쓽 �븘�뱶 �궗�슜 媛�
+     */
+    private List<String> useValues = Lists.newArrayList();
+    /**
+     * �뀓�뒪�듃 �븘�뱶�씪 �븣 寃��깋 媛�
+     */
+    private String useValue;
+    private boolean useParentIssueId = true;
+    /**
+     * �씠�뒋 �긽�깭 �쑀�삎(READY / OPEN / CLOSE)
+     */
+    private String issueStatusType;
 
     public IssueCustomFieldValueCondition(){}
 
@@ -28,6 +41,12 @@
 
         switch(customFieldType) {
             case INPUT:
+            case NUMBER:
+            case DATETIME:
+            case IP_ADDRESS:
+            case EMAIL:
+            case SITE:
+            case TEL:
                 if (MapUtil.getStrings(conditions, "useValues") != null) {
                     //  怨듬갚�씠 �븘�땶 臾몄옄媛� �뱾�뼱�엳�쓣 �븣留� useValues 媛� �쑝濡� �뀑�똿�븳�떎.
                     for (String useValue : MapUtil.getStrings(conditions, "useValues")) {
@@ -44,7 +63,7 @@
                     //  怨듬갚�씠 �븘�땶 臾몄옄媛� �뱾�뼱�엳�쓣 �븣留� useValues 媛� �쑝濡� �뀑�똿�븳�떎.
                     for (String useValue : MapUtil.getStrings(conditions, "useValues")) {
                         if (!StringUtils.isEmpty(useValue)) {
-                            condition.addUseValues(useValue);
+                            condition.addUseValue(useValue);
                         }
                     }
                 }
@@ -52,6 +71,22 @@
         }
 
         return condition;
+    }
+
+    public String getIssueStatusType() {
+        return issueStatusType;
+    }
+
+    public void setIssueStatusType(String issueStatusType) {
+        this.issueStatusType = issueStatusType;
+    }
+
+    public Long getIssueTypeId() {
+        return issueTypeId;
+    }
+
+    public void setIssueTypeId(Long issueTypeId) {
+        this.issueTypeId = issueTypeId;
     }
 
     public Long getWorkspaceId() {
@@ -78,7 +113,7 @@
         this.useValues = useValues;
     }
 
-    public void addUseValues(String useValue) {
+    public void addUseValue(String useValue) {
         this.useValues.add(useValue);
     }
 
@@ -97,4 +132,13 @@
     public void setCustomFieldType(String customFieldType) {
         this.customFieldType = customFieldType;
     }
+
+    public boolean isUseParentIssueId() {
+        return useParentIssueId;
+    }
+
+    public void setUseParentIssueId(boolean useParentIssueId) {
+        this.useParentIssueId = useParentIssueId;
+    }
+
 }

--
Gitblit v1.8.0