From 2a505f9dd1dffdba10876c9e33aae5f79561f342 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 06 1월 2022 10:28:36 +0900
Subject: [PATCH] - api 추가/수정 기능 분리 - api 문서 제작용 swagger 추가
---
src/main/resources/mybatis/query-template/issue-template.xml | 23 +++++++++++++++++++----
1 files changed, 19 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 32d6e66..8685b96 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -32,6 +32,9 @@
severity.id as severityId,
severity.name as severityName,
severity.color as severityColor,
+ ic.name AS companyName,
+ ii.name AS ispName,
+ ih.name AS hostingName,
GROUP_CONCAT(issue_custom.use_value) AS useValue,
IFNULL(temp_attached_file.attachedFileCount, 0) as attachedFileCount,
IFNULL(temp_issue_comment.issueCommentCount, 0) as issueCommentCount
@@ -1096,16 +1099,28 @@
issue.id as id,
issue.title as title,
customFieldValue.customFieldType AS customFieldType,
- GROUP_CONCAT(customFieldValue.useValue) AS concatUseValue
+ GROUP_CONCAT(customFieldValue.useValue ORDER BY customFieldValue.customFieldId ASC) 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}
+ <choose>
+ <when test="useValues.size != 0">
+ WHERE issue_custom.use_value IN
+ <foreach collection="useValues" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ ) customFieldValue ON customFieldValue.issueId = issue.id
+ WHERE issue.issue_type_id = #{issueTypeId}
+ <choose>
+ <when test="issueStatusType != null">
+ AND issStatus.issue_status_type != #{issueStatusType}
+ </when>
+ </choose>
GROUP BY issue.id
HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%')
</select>
--
Gitblit v1.8.0