From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/java/kr/wisestone/owl/web/condition/IssueCustomFieldValueCondition.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 5475ac0..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,6 +6,7 @@
import kr.wisestone.owl.util.MapUtil;
import org.apache.commons.lang3.StringUtils;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -26,6 +27,9 @@
* �뀓�뒪�듃 �븘�뱶�씪 �븣 寃��깋 媛�
*/
private String useValue;
+ private String useStartDateValue;
+ private String useEndDateValue;
+
private boolean useParentIssueId = true;
/**
* �씠�뒋 �긽�깭 �쑀�삎(READY / OPEN / CLOSE)
@@ -42,7 +46,6 @@
switch(customFieldType) {
case INPUT:
case NUMBER:
- case DATETIME:
case IP_ADDRESS:
case EMAIL:
case SITE:
@@ -53,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));
}
}
}
@@ -125,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