From c88104169bc4fe457f98f33a91574c4dd33da573 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 03 12월 2021 20:08:01 +0900
Subject: [PATCH] - api 입력 오류 수정 - api 기본값 및 중복 설정 적용 수정
---
src/main/resources/mybatis/query-template/issue-template.xml | 72 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 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 00bff06..5344f9f 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>
@@ -171,8 +191,10 @@
</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
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
@@ -323,9 +345,21 @@
WHERE i.issue_type_id = #{issueTypeId}
</select>
+ <!-- �빐�떦 �씠�뒋 �쑀�삎�쓽 �엯�젰 �쁽�솴�쓣 議고쉶�븳�떎 -->
+ <select id="findByApiIssueHistory" resultType="java.util.HashMap"
+ parameterType="java.lang.Long">
+ SELECT
+ 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
+ WHERE i.issue_type_id = #{issueTypeId}
+ </select>
+
<!-- �봽濡쒖젥�듃�뿉 �엳�뒗 �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎 -->
<select id="findByProjectId" resultType="java.util.HashMap"
- parameterType="java.lang.Long">
+ parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
id
FROM issue
@@ -366,12 +400,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>
@@ -454,6 +488,17 @@
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)
+ FROM issue
+ WHERE issue_type_id = #{id}
+ AND register_date BETWEEN #{startDate} AND #{endDate}
+ AND is_api = #{isApi};
+ </select>
+
+
<!-- �씠�뒋 �긽�깭瑜� �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎. -->
<select id="countByIssueStatusId" resultType="java.lang.Long" parameterType="java.lang.Long">
@@ -462,4 +507,23 @@
</select>
+ <!-- �듅�젙 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋瑜� 議고쉶 -->
+ <select id="findByCustomFieldValue" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
+ SELECT
+ iss.id as id,
+ iss.title as title
+ FROM issue iss
+ LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON iss.id = issue_custom.issue_id
+ WHERE 1=1
+ AND iss.parent_issue_id IS NULL
+ <choose>
+ <when test="useValues.size != 0">
+ AND issue_custom.use_value IN
+ <foreach collection="useValues" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ </select>
+
</mapper>
--
Gitblit v1.8.0