From 3d1d29425c873257a65f4fde8a4bfc43d6211b83 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 15:58:50 +0900
Subject: [PATCH] - 완료이슈 숨기기 기능 - 업체관리 오류 해결
---
src/main/resources/mybatis/query-template/issue-template.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 1ac0cbb..6df1c93 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -15,6 +15,7 @@
issue.complete_date as completeDate,
issue.issue_number as issueNumber,
issue.register_date as registerDate,
+ issue.is_api as isApi,
SUBSTRING(issue.modify_date, 1, 19) as modifyDate,
project.id as projectId,
project.name as projectName,
@@ -101,6 +102,10 @@
<if test="endCompleteDate != null and !endCompleteDate.equals('')">
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
+ </if>
+
+ <if test="hideIssue != null and hideIssue == true">
+ AND issue_status.issue_status_type != 'CLOSE'
</if>
<choose>
@@ -192,7 +197,6 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
- AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -301,6 +305,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="hideIssue != null and hideIssue == true">
+ AND issue_status.issue_status_type != 'CLOSE'
+ </if>
+
<choose>
<when test="myDepartmentIds.size != 0">
AND isd.department_id IN
@@ -384,7 +392,6 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
- AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -535,7 +542,6 @@
LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
- AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -570,6 +576,10 @@
<if test="endCompleteDate != null and !endCompleteDate.equals('')">
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
+ </if>
+
+ <if test="hideIssue != null and hideIssue == true">
+ AND iss.issue_status_type != 'CLOSE'
</if>
<choose>
@@ -661,7 +671,6 @@
LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
- AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -698,6 +707,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="hideIssue != null and hideIssue == true">
+ AND iss.issue_status_type != 'CLOSE'
+ </if>
+
<choose>
<when test="myDepartmentIds.size != 0">
AND isd.department_id IN
--
Gitblit v1.8.0