From 617835a40ab2f88f8eadb0107e9c8c03ea108c72 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 09 2월 2022 18:02:55 +0900
Subject: [PATCH] - 이슈 추가, 수정 시 isp와 호스팅 CODE 유효성 체크

---
 src/main/resources/mybatis/query-template/issue-template.xml |   12 ++++++++++++
 1 files changed, 12 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 cf64f38..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
@@ -140,6 +144,10 @@
 
         <if test="hideCompleteIssue != null and hideCompleteIssue == true">
             AND issue_status.issue_status_type != 'CLOSE'
+        </if>
+
+        <if test="parentYN != null and parentYN == true">
+            AND issue.parent_issue_id IS NULL
         </if>
 
         <choose>
@@ -345,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