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 | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index ab13365..5344f9f 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -50,21 +50,25 @@
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},'%')
- OR issue.description like CONCAT('%',#{title},'%')
- OR issue.start_date like CONCAT('%',#{title},'%')
- OR issue.complete_date like CONCAT('%',#{title},'%')
- OR issue.issue_number like CONCAT('%',#{title},'%')
- OR issue.register_date like CONCAT('%',#{title},'%')
- OR project.name like CONCAT('%',#{title},'%')
- OR project.project_key like CONCAT('%',#{title},'%')
- OR issue_type.name like CONCAT('%',#{title},'%')
- OR issue_status.issue_status_type like CONCAT('%',#{title},'%')
- OR issue_status.name like CONCAT('%',#{title},'%')
- OR priority.name like CONCAT('%',#{title},'%')
- OR severity.name like CONCAT('%',#{title},'%')
- OR issue_custom.use_value like CONCAT('%',#{title},'%')
</if>
<if test="description != null and !description.equals('')">
@@ -187,6 +191,7 @@
</foreach>
</when>
</choose>
+ AND issue.parent_issue_id IS NULL
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -340,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
@@ -471,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">
@@ -479,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