From a792396d2e2573419cc7308ede32f84b4578d6e9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 13:32:19 +0900
Subject: [PATCH] 이슈 Tree 목록 중복 이슈 필터링 수정
---
src/main/resources/mybatis/query-template/issue-template.xml | 170 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 122 insertions(+), 48 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 5479d53..ba47a55 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,
@@ -44,6 +45,8 @@
LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON issue.id = issue_custom.issue_id
LEFT OUTER JOIN issue_department isd FORCE INDEX(issueIdIndex) ON issue.id = isd.issue_id
LEFT OUTER JOIN issue_user issue_user FORCE INDEX(issueIdIndex) ON issue.id = issue_user.issue_id
+ LEFT OUTER JOIN user_department ud ON ud.department_id = isd.department_id
+ LEFT OUTER JOIN department d ON d.id = isd.department_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)
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
@@ -65,6 +68,7 @@
OR priority.name like CONCAT('%',#{keyWord},'%')
OR severity.name like CONCAT('%',#{keyWord},'%')
OR issue_custom.use_value like CONCAT('%',#{keyWord},'%')
+ OR d.department_name like CONCAT('%',#{keyWord},'%')
</if>
<if test="title != null and !title.equals('')">
@@ -103,7 +107,13 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
- <if test="hideIssue != null and hideIssue == true">
+ <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
+ <if test="hideDownIssue != null and hideDownIssue == true">
+ AND issue.parent_issue_id IS NULL
+ </if>
+ </if>
+
+ <if test="hideCompleteIssue != null and hideCompleteIssue == true">
AND issue_status.issue_status_type != 'CLOSE'
</if>
@@ -171,6 +181,15 @@
</choose>
<choose>
+ <when test="departmentIds.size != 0 and myDepartmentIds != null and myDepartmentIds.size != 0">
+ AND isd.department_id IN
+ <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+
+ <choose>
<when test="registerIds.size != 0">
AND issue.register_id IN
<foreach collection="registerIds" item="item" index="index" separator="," open="(" close=")">
@@ -195,17 +214,16 @@
</foreach>
</when>
</choose>
- AND issue.parent_issue_id IS NULL
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
- ORDER BY issue.register_date DESC
+ ORDER BY issue.modify_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
</select>
- <select id="findByDepartment" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
+ <!--<select id="findByDepartment" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
DISTINCT issue.id as id,
issue.register_id as registerId,
@@ -251,7 +269,7 @@
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
temp_issue_comment on (temp_issue_comment.issue_id = issue.id)
WHERE 1=1
- <if test="keyWord != null and !keyWord.equals('') ">
+ <if test="keyWord != null and !keyWord.equals('')">
AND issue.title like CONCAT('%',#{keyWord},'%')
OR issue.description like CONCAT('%',#{keyWord},'%')
OR issue.start_date like CONCAT('%',#{keyWord},'%')
@@ -309,7 +327,7 @@
</if>
<choose>
- <when test="myDepartmentIds.size != 0">
+ <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
AND isd.department_id IN
<foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
#{item}
@@ -394,11 +412,11 @@
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
- ORDER BY issue.register_date DESC
+ ORDER BY issue.modify_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
- </select>
+ </select>-->
<!--<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
@@ -537,11 +555,42 @@
SELECT
COUNT(DISTINCT issue.id)
FROM issue issue
- LEFT OUTER JOIN issue_department isd ON issue.id = isd.issue_id
- LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
+ INNER JOIN project project FORCE INDEX(workspaceIdIndex) ON issue.project_id = project.id
+ INNER JOIN workspace workspace ON workspace.id = project.workspace_id
+ INNER JOIN issue_status issue_status FORCE INDEX(PRIMARY) ON issue.issue_status_id = issue_status.id
+ INNER JOIN issue_type issue_type FORCE INDEX(PRIMARY) ON issue.issue_type_id = issue_type.id
+ 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
+ LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON issue.id = issue_custom.issue_id
+ LEFT OUTER JOIN issue_department isd FORCE INDEX(issueIdIndex) ON issue.id = isd.issue_id
+ LEFT OUTER JOIN issue_user issue_user FORCE INDEX(issueIdIndex) ON issue.id = issue_user.issue_id
+ LEFT OUTER JOIN user_department ud ON ud.department_id = isd.department_id
+ LEFT OUTER JOIN department d ON d.id = isd.department_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)
+ LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
+ temp_issue_comment on (temp_issue_comment.issue_id = issue.id)
+ LEFT OUTER JOIN user user ON issue_user.user_id = user.id
WHERE 1=1
- AND issue.parent_issue_id IS NULL
- <if test="title != null and !title.equals('') ">
+ <if test="keyWord != null and !keyWord.equals('') ">
+ AND issue.title like CONCAT('%',#{keyWord},'%')
+ OR issue.description like CONCAT('%',#{keyWord},'%')
+ OR issue.start_date like CONCAT('%',#{keyWord},'%')
+ OR issue.complete_date like CONCAT('%',#{keyWord},'%')
+ OR issue.issue_number like CONCAT('%',#{keyWord},'%')
+ OR issue.register_date like CONCAT('%',#{keyWord},'%')
+ OR project.name like CONCAT('%',#{keyWord},'%')
+ OR project.project_key like CONCAT('%',#{keyWord},'%')
+ OR issue_type.name like CONCAT('%',#{keyWord},'%')
+ OR issue_status.issue_status_type like CONCAT('%',#{keyWord},'%')
+ OR issue_status.name like CONCAT('%',#{keyWord},'%')
+ OR priority.name like CONCAT('%',#{keyWord},'%')
+ OR severity.name like CONCAT('%',#{keyWord},'%')
+ OR issue_custom.use_value like CONCAT('%',#{keyWord},'%')
+ OR d.department_name like CONCAT('%',#{keyWord},'%')
+ </if>
+
+ <if test="title != null and !title.equals('')">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -577,8 +626,14 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
- <if test="hideIssue != null and hideIssue == true">
- AND iss.issue_status_type != 'CLOSE'
+ <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
+ <if test="hideDownIssue != null and hideDownIssue == true">
+ AND issue.parent_issue_id IS NULL
+ </if>
+ </if>
+
+ <if test="hideCompleteIssue != null and hideCompleteIssue == true">
+ AND issue_status.issue_status_type != 'CLOSE'
</if>
<choose>
@@ -636,6 +691,15 @@
</choose>
<choose>
+ <when test="departmentIds.size != 0 and myDepartmentIds != null and myDepartmentIds.size != 0">
+ AND isd.department_id IN
+ <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+
+ <choose>
<when test="registerIds.size != 0">
AND issue.register_id IN
<foreach collection="registerIds" item="item" index="index" separator="," open="(" close=")">
@@ -669,7 +733,6 @@
LEFT OUTER JOIN issue_department isd ON issue.id = isd.issue_id
LEFT OUTER JOIN issue_status iss ON iss.id = issue.issue_status_id
WHERE 1=1
- AND issue.parent_issue_id IS NULL
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -706,17 +769,26 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
- <if test="hideIssue != null and hideIssue == true">
+ <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
+ <if test="hideDownIssue != null and hideDownIssue == true">
+ AND issue.parent_issue_id IS NULL
+ </if>
+ </if>
+
+ <if test="hideCompleteIssue != null and hideCompleteIssue == true">
AND iss.issue_status_type != 'CLOSE'
</if>
<choose>
- <when test="myDepartmentIds.size != 0">
+ <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
AND isd.department_id IN
<foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
+ <otherwise>
+ AND 1 != 1
+ </otherwise>
</choose>
<choose>
@@ -804,11 +876,11 @@
<select id="findByIssueTypeId" resultType="java.util.HashMap"
parameterType="java.lang.Long">
SELECT
- i.id as issueId,
- iss.id as issueStatusId,
- iss.name as issueStatusName
+ i.id as issueId,
+ iss.id as issueStatusId,
+ iss.name as issueStatusName
FROM issue i
- INNER JOIN issue_status iss on iss.id = i.issue_status_id
+ INNER JOIN issue_status iss on iss.id = i.issue_status_id
WHERE i.issue_type_id = #{issueTypeId}
</select>
@@ -828,7 +900,7 @@
<select id="findByProjectId" resultType="java.util.HashMap"
parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- id
+ id
FROM issue
WHERE project_id = #{projectId}
</select>
@@ -951,55 +1023,57 @@
<!-- �씠�뒋 �쑀�삎�쓣 �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎 -->
<select id="countByIssueTypeId" resultType="java.lang.Long" parameterType="java.lang.Long">
- SELECT COUNT(DISTINCT id) FROM
- issue WHERE issue_type_id = #{issueTypeId};
+ SELECT COUNT(DISTINCT id) FROM
+ issue WHERE issue_type_id = #{issueTypeId};
</select>
<!-- �씠�뒋 �쑀�삎�쓣 �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎(湲곌컙) -->
<select id="countByIssueTypeIdAndDate" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.IssueTypeCondition">
SELECT
- COUNT(DISTINCT id)
+ COUNT(DISTINCT id)
FROM issue
WHERE issue_type_id = #{id}
- AND register_date BETWEEN #{startDate} AND #{endDate}
- AND is_api = #{isApi};
+ AND register_date BETWEEN #{startDate} AND #{endDate}
+ AND is_api = #{isApi};
</select>
-
-
<!-- �씠�뒋 �긽�깭瑜� �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎. -->
<select id="countByIssueStatusId" resultType="java.lang.Long" parameterType="java.lang.Long">
SELECT COUNT(DISTINCT id) FROM
- issue WHERE issue_status_id = #{issueStatusId};
+ issue WHERE issue_status_id = #{issueStatusId};
</select>
<!-- �듅�젙 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋瑜� 議고쉶 -->
<select id="findByCustomFieldValue" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
SELECT
- issue_custom.issue_id as id,
- iss.parent_issue_id as parentIssueId
- FROM issue_custom_field_value issue_custom
- INNER JOIN issue iss ON iss.id = issue_custom.issue_id
- WHERE 1=1
- AND issue_custom.use_value = #{useValue}
- <choose>
- <when test="useParentIssueId.equals(true)">
- AND iss.parent_issue_id IS NULL
- </when>
- <otherwise>
- AND iss.parent_issue_id IS NOT NULL
- </otherwise>
- </choose>
+ issue.id as id,
+ issue.title as title,
+ customFieldValue.customFieldType AS customFieldType,
+ GROUP_CONCAT(customFieldValue.useValue) AS concatUseValue
+ FROM issue issue FORCE INDEX(reverseIndex)
+ INNER JOIN issue_status as issStatus ON issue.issue_status_id = issStatus.id
+ LEFT OUTER JOIN (
+ SELECT cf.id AS customFieldId, cf.custom_field_type AS customFieldType, issue_custom.use_value AS useValue, issue_custom.issue_id AS issueId
+ FROM issue_custom_field_value issue_custom
+ INNER JOIN custom_field cf ON cf.id = issue_custom.custom_field_id
+ ORDER BY issue_custom.id ASC) customFieldValue ON customFieldValue.issueId = issue.id
+ WHERE issStatus.issue_status_type != 'CLOSE'
+ AND issue.issue_type_id = #{issueTypeId}
+ GROUP BY issue.id
+ HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%')
</select>
+
<!-- 醫낅즺 �븞�맂 �븯�쐞 �씠�뒋 媛��졇�삤湲� -->
- <select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="java.lang.Long">
+ <select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- iss.id as id
+ iss.id as id,
+ iss.title as title
FROM issue iss
- INNER JOIN issue_status issueStatus on iss.issue_status_id = issueStatus.id
+ INNER JOIN issue_status issueStatus on iss.issue_status_id = issueStatus.id
WHERE iss.parent_issue_id = #{parentIssueId}
- AND issueStatus.issue_status_type != 'CLOSE'
+ AND iss.id != #{id}
+ AND issueStatus.issue_status_type != 'CLOSE'
</select>
</mapper>
--
Gitblit v1.8.0