From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 18:30:04 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정
---
src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 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 ae863c5..a0b9fac 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -6,6 +6,7 @@
import org.springframework.data.domain.Pageable;
import org.springframework.util.StringUtils;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -27,6 +28,8 @@
private String endStartDate;
private String beginCompleteDate;
private String endCompleteDate;
+ private String beginDateRange;
+ private String endDateRange;
private Integer page;
private Integer pageSize;
private Long loginUserId;
@@ -158,6 +161,18 @@
if (StringUtils.hasText(MapUtil.getString(conditions, "endCompleteDate"))) {
Date endCompleteDate = DateUtil.convertStrToDate(MapUtil.getString(conditions, "endCompleteDate"), "yy-MM-dd");
condition.setEndCompleteDate(DateUtil.convertDateToStr(endCompleteDate, "yyyy-MM-dd"));
+ }
+
+ if (StringUtils.hasText(MapUtil.getString(conditions, "dateRange"))) {
+ String dateRange = MapUtil.getString(conditions, "dateRange");
+ if (!StringUtils.isEmpty(dateRange)) {
+ List<String> date = Arrays.asList(dateRange.split("~"));
+
+ Date beginDateRange = DateUtil.convertStrToDate(date.get(0).trim(), "yy-MM-dd");
+ condition.setBeginDateRange(DateUtil.convertDateToStr(beginDateRange, "yyyy-MM-dd"));
+ Date endDateRange = DateUtil.convertStrToDate(date.get(1).trim(), "yy-MM-dd");
+ condition.setEndDateRange(DateUtil.convertDateToStr(endDateRange, "yyyy-MM-dd"));
+ }
}
if (MapUtil.getLongs(conditions, "projectIds") != null) {
@@ -317,6 +332,22 @@
this.endCompleteDate = endCompleteDate;
}
+ public String getBeginDateRange() {
+ return beginDateRange;
+ }
+
+ public void setBeginDateRange(String beginDateRange) {
+ this.beginDateRange = beginDateRange;
+ }
+
+ public String getEndDateRange() {
+ return endDateRange;
+ }
+
+ public void setEndDateRange(String endDateRange) {
+ this.endDateRange = endDateRange;
+ }
+
public Integer getPage() {
return page;
}
--
Gitblit v1.8.0