From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 14:35:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/resources/mybatis/query-template/issue-template.xml | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index b44cb34..599bf68 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -15,6 +15,7 @@
issue.complete_date as completeDate,
issue.issue_number as issueNumber,
issue.register_date as registerDate,
+ issue.is_api as isApi,
SUBSTRING(issue.modify_date, 1, 19) as modifyDate,
project.id as projectId,
project.name as projectName,
@@ -192,6 +193,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
@@ -240,7 +242,7 @@
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
INNER JOIN issue_department isd ON isd.issue_id = issue.id
- INNER JOIN department d ON d.id = isd.department_id
+ INNER JOIN user_department ud ON ud.department_id = isd.department_id
LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON issue.id = issue_custom.issue_id
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as attachedFileCount FROM attached_file GROUP BY issue_id)
temp_attached_file on (temp_attached_file.issue_id = issue.id)
@@ -383,6 +385,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 +533,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 +659,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>
@@ -947,8 +954,6 @@
AND is_api = #{isApi};
</select>
-
-
<!-- �씠�뒋 �긽�깭瑜� �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎. -->
<select id="countByIssueStatusId" resultType="java.lang.Long" parameterType="java.lang.Long">
SELECT COUNT(DISTINCT id) FROM
@@ -959,29 +964,32 @@
<!-- �듅�젙 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋瑜� 議고쉶 -->
<select id="findByCustomFieldValue" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
SELECT
- 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 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>
+ issue.id as id,
+ issue.title as title,
+ customFieldValue.customFieldType AS customFieldType,
+ GROUP_CONCAT(customFieldValue.useValue) 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'
+ GROUP BY issue.id
+ HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%')
</select>
+
<!-- 醫낅즺 �븞�맂 �븯�쐞 �씠�뒋 媛��졇�삤湲� -->
- <select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="java.lang.Long">
+ <select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- iss.id as id
+ iss.id as id,
+ iss.title as title
FROM issue iss
INNER JOIN issue_status issueStatus on iss.issue_status_id = issueStatus.id
WHERE iss.parent_issue_id = #{parentIssueId}
+ AND iss.id != #{id}
AND issueStatus.issue_status_type != 'CLOSE'
</select>
</mapper>
--
Gitblit v1.8.0