From b8ab6de032d3a6ee029331dbb58d764a5409189b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 28 2월 2022 15:51:13 +0900
Subject: [PATCH] - api로 하위이슈 추가 시 상위이슈의 파트너 정보 적용

---
 src/main/resources/mybatis/query-template/issue-template.xml |   10 ++++++++++
 1 files changed, 10 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..96b5c07 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -22,6 +22,7 @@
         project.project_key as projectKey,
         issue_type.id as issueTypeId,
         issue_type.name as issueTypeName,
+        issue_type.inherit_partners as inheritPartners,
         issue_status.id as issueStatusId,
         issue_status.issue_status_type as issueStatusType,
         issue_status.name as issueStatusName,
@@ -35,6 +36,7 @@
         ic.name AS companyName,
         ii.name AS ispName,
         ih.name AS hostingName,
+        d.department_name AS departmentName,
         GROUP_CONCAT(issue_custom.use_value) AS useValue,
         IFNULL(temp_attached_file.attachedFileCount, 0) as attachedFileCount,
         IFNULL(temp_issue_comment.issueCommentCount, 0) as issueCommentCount
@@ -130,6 +132,10 @@
 
         <if test="endCompleteDate != null and !endCompleteDate.equals('')">
             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('')">
@@ -349,6 +355,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