From 5aeb1fd2d825392fb0b2ac00e6edf16a2cdbc5b7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 13 12월 2021 14:53:07 +0900
Subject: [PATCH] 이슈 검색시 하위 이슈도 검색되는 오류수정
---
src/main/resources/mybatis/query-template/issue-template.xml | 73 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index d6d1ee8..d4dea19 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -45,6 +45,7 @@
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 (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)
@@ -172,6 +173,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=")">
@@ -196,17 +206,19 @@
</foreach>
</when>
</choose>
- AND issue.parent_issue_id IS NULL
+ <if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
+ AND issue.parent_issue_id IS NULL
+ </if>
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,
@@ -252,7 +264,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},'%')
@@ -310,7 +322,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}
@@ -395,11 +407,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
@@ -540,6 +552,7 @@
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
+ LEFT OUTER JOIN user_department ud ON ud.department_id = isd.department_id
WHERE 1=1
AND issue.parent_issue_id IS NULL
<if test="title != null and !title.equals('') ">
@@ -637,6 +650,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=")">
@@ -712,7 +734,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}
@@ -808,11 +830,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>
@@ -832,7 +854,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>
@@ -955,24 +977,24 @@
<!-- �씠�뒋 �쑀�삎�쓣 �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎 -->
<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>
@@ -985,12 +1007,13 @@
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 (
+ 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>
@@ -999,12 +1022,12 @@
<!-- 醫낅즺 �븞�맂 �븯�쐞 �씠�뒋 媛��졇�삤湲� -->
<select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- iss.id as id,
- iss.title as title
+ 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 iss.id != #{id}
- AND issueStatus.issue_status_type != 'CLOSE'
+ AND iss.id != #{id}
+ AND issueStatus.issue_status_type != 'CLOSE'
</select>
</mapper>
--
Gitblit v1.8.0