From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 화, 15 3월 2022 12:12:17 +0900
Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가
---
src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 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 d364f3a..15d419f 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java
@@ -6,10 +6,12 @@
import kr.wisestone.owl.util.MapUtil;
import org.apache.commons.lang3.StringUtils;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
+ * �씠�뒋 �궗�슜�옄 �젙�쓽 �븘�뱶 媛� 寃��깋 議곌굔 �겢�옒�뒪
* Created by wisestone on 2018-06-07.
*/
public class IssueCustomFieldValueCondition {
@@ -17,9 +19,21 @@
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 String useStartDateValue;
+ private String useEndDateValue;
+
private boolean useParentIssueId = true;
+ /**
+ * �씠�뒋 �긽�깭 �쑀�삎(READY / OPEN / CLOSE)
+ */
private String issueStatusType;
public IssueCustomFieldValueCondition(){}
@@ -32,7 +46,6 @@
switch(customFieldType) {
case INPUT:
case NUMBER:
- case DATETIME:
case IP_ADDRESS:
case EMAIL:
case SITE:
@@ -43,6 +56,18 @@
// �뀓�뒪�듃 �븘�뱶�뒗 1媛쒕컰�뿉 �븞�뱾�뼱�삩�떎.
if (!StringUtils.isEmpty(useValue)) {
condition.setUseValue(useValue);
+ }
+ }
+ }
+ break;
+ case DATETIME:
+ if (MapUtil.getStrings(conditions, "useValues") != null) {
+ for (String useValue : MapUtil.getStrings(conditions, "useValues")) {
+ if (!StringUtils.isEmpty(useValue)) {
+ condition.setUseValue(useValue);
+ List<String> customDateRange = Arrays.asList(useValue.split("~"));
+ condition.setUseStartDateValue(customDateRange.get(0));
+ condition.setUseEndDateValue(customDateRange.get(1));
}
}
}
@@ -115,6 +140,22 @@
this.useValue = useValue;
}
+ public String getUseStartDateValue() {
+ return useStartDateValue;
+ }
+
+ public void setUseStartDateValue(String useStartDateValue) {
+ this.useStartDateValue = useStartDateValue;
+ }
+
+ public String getUseEndDateValue() {
+ return useEndDateValue;
+ }
+
+ public void setUseEndDateValue(String useEndDateValue) {
+ this.useEndDateValue = useEndDateValue;
+ }
+
public String getCustomFieldType() {
return customFieldType;
}
--
Gitblit v1.8.0