From d81a2433ddd01847835729ab0942bcf04651ae78 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 10 2월 2022 09:28:51 +0900
Subject: [PATCH] 1.0.2버전 업
---
src/main/resources/mybatis/query-template/issue-template.xml | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index d220849..56c91b8 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -132,6 +132,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="beginDateRange != null and !beginDateRange.equals('') and endDateRange != null and !endDateRange.equals('')">
+ AND (issue.start_date BETWEEN #{beginDateRange} AND #{endDateRange} OR issue.complete_date BETWEEN #{beginDateRange} AND #{endDateRange})
+ </if>
+
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
<if test="hideDownIssue != null and hideDownIssue == true">
AND issue.parent_issue_id IS NULL
@@ -349,6 +353,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="beginDateRange != null and !beginDateRange.equals('') and endDateRange != null and !endDateRange.equals('')">
+ AND (issue.start_date BETWEEN #{beginDateRange} AND #{endDateRange} OR issue.complete_date BETWEEN #{beginDateRange} AND #{endDateRange})
+ </if>
+
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
<if test="hideDownIssue != null and hideDownIssue == true">
AND issue.parent_issue_id IS NULL
--
Gitblit v1.8.0