From fd8fdf9441329845ff78d3ae4274f107e3e6ba4d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 17:59:00 +0900
Subject: [PATCH] 이슈 목록 - '이슈 제목' 검색 조건 추가
---
src/main/resources/mybatis/query-template/issue-template.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 00bff06..c11a20c 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -10,6 +10,7 @@
issue.reverse_index as reverseIndex,
issue.title as title,
issue.description as description,
+ issue.parent_issue_id as parentIssueId,
issue.start_date as startDate,
issue.complete_date as completeDate,
issue.issue_number as issueNumber,
@@ -30,6 +31,7 @@
severity.id as severityId,
severity.name as severityName,
severity.color as severityColor,
+ GROUP_CONCAT(issue_custom.use_value) AS useValue,
IFNULL(temp_attached_file.attachedFileCount, 0) as attachedFileCount,
IFNULL(temp_issue_comment.issueCommentCount, 0) as issueCommentCount
FROM issue issue FORCE INDEX(reverseIndex)
@@ -39,6 +41,7 @@
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 issued FORCE INDEX(issueIdIndex) ON issue.id = issued.issue_id
LEFT OUTER JOIN issue_user issue_user FORCE INDEX(issueIdIndex) ON issue.id = issue_user.issue_id
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as attachedFileCount FROM attached_file GROUP BY issue_id)
@@ -47,7 +50,24 @@
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
- <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},'%')
+ </if>
+
+ <if test="title != null and !title.equals('')">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -173,6 +193,7 @@
</choose>
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
+ GROUP BY issue.id
ORDER BY issue.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
@@ -366,12 +387,12 @@
<!-- �씠�뒋 由ъ뒪�겕 bulk insert, import �뿉�꽌 �궗�슜 -->
<insert id="insertIssueRiskBatch" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
parameterType="java.util.HashMap">
- INSERT INTO issue_risk(issue_id, workspace_id, change_assignee_count, change_issue_status_count,
+ INSERT INTO issue_risk(issue_id, workspace_id, change_assignee_count, change_department_count, change_issue_status_count,
issue_status_ids,
register_id, modify_id, register_date, modify_date)
VALUES
<foreach collection="list" item="map" index="index" separator="," open="" close="">
- (#{map.issueId}, #{map.workspaceId}, #{map.changeAssigneeCount}, #{map.changeIssueStatusCount},
+ (#{map.issueId}, #{map.workspaceId}, #{map.changeAssigneeCount}, #{map.changeDepartmentCount}, #{map.changeIssueStatusCount},
#{map.issueStatusIds},
#{map.registerId}, #{map.registerId}, NOW(), NOW())
</foreach>
--
Gitblit v1.8.0