From 612b5a21417f3c8dcaed84c1c0691dc883088f61 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 18:04:14 +0900
Subject: [PATCH] 이슈 컬럼 정렬 진행
---
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