From 3325ed4b23ccf5cdd1a78507ff4a64ccd1ec59e6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 15:30:35 +0900
Subject: [PATCH] 완료이슈 숨기기 기능
---
src/main/resources/mybatis/query-template/issue-template.xml | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 55d1396..5479d53 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -103,6 +103,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="projectIds.size != 0">
AND project.id IN
@@ -192,7 +196,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
@@ -241,7 +244,7 @@
INNER JOIN priority priority FORCE INDEX(PRIMARY) ON issue.priority_id = priority.id
INNER JOIN severity severity FORCE INDEX(PRIMARY) ON issue.severity_id = severity.id
INNER JOIN issue_department isd ON isd.issue_id = issue.id
- INNER JOIN department d ON d.id = isd.department_id
+ INNER JOIN user_department ud ON ud.department_id = isd.department_id
LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON issue.id = issue_custom.issue_id
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as attachedFileCount FROM attached_file GROUP BY issue_id)
temp_attached_file on (temp_attached_file.issue_id = issue.id)
@@ -299,6 +302,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>
@@ -384,7 +391,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 +541,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 +575,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 +670,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>
@@ -696,6 +704,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>
@@ -981,4 +993,13 @@
</choose>
</select>
+ <!-- 醫낅즺 �븞�맂 �븯�쐞 �씠�뒋 媛��졇�삤湲� -->
+ <select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="java.lang.Long">
+ SELECT
+ iss.id as id
+ FROM issue iss
+ INNER JOIN issue_status issueStatus on iss.issue_status_id = issueStatus.id
+ WHERE iss.parent_issue_id = #{parentIssueId}
+ AND issueStatus.issue_status_type != 'CLOSE'
+ </select>
</mapper>
--
Gitblit v1.8.0