From 55480603f392704352492b3ba99cd7198f44cc8a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 14:54:15 +0900
Subject: [PATCH] * 업체,ISP,호스팅 - url(도메인) 항목 추가 * 이슈상태가 완료인 이슈는 리스트에서 제외
---
src/main/resources/mybatis/query-template/issue-template.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index bbf5ef7..55d1396 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -192,6 +192,7 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
+ AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -383,6 +384,7 @@
</when>
</choose>
AND issue.parent_issue_id IS NULL
+ AND issue_status.issue_status_type != 'CLOSE'
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
@@ -530,8 +532,10 @@
COUNT(DISTINCT issue.id)
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
WHERE 1=1
AND issue.parent_issue_id IS NULL
+ AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -654,8 +658,10 @@
COUNT(DISTINCT issue.id)
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
WHERE 1=1
AND issue.parent_issue_id IS NULL
+ AND iss.issue_status_type != 'CLOSE'
<if test="title != null and !title.equals('') ">
AND issue.title like CONCAT('%',#{title},'%')
</if>
@@ -959,12 +965,20 @@
<!-- �듅�젙 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋瑜� 議고쉶 -->
<select id="findByCustomFieldValue" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
SELECT
- issue_custom.issue_id as id
+ issue_custom.issue_id as id,
+ iss.parent_issue_id as parentIssueId
FROM issue_custom_field_value issue_custom
INNER JOIN issue iss ON iss.id = issue_custom.issue_id
WHERE 1=1
- AND iss.parent_issue_id IS NULL
AND issue_custom.use_value = #{useValue}
+ <choose>
+ <when test="useParentIssueId.equals(true)">
+ AND iss.parent_issue_id IS NULL
+ </when>
+ <otherwise>
+ AND iss.parent_issue_id IS NOT NULL
+ </otherwise>
+ </choose>
</select>
</mapper>
--
Gitblit v1.8.0