From 82c9cd27283723d014e0ae9e6c251f46deae7ef1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 03 12월 2021 21:41:07 +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 |   36 +++++++++++++++++++++++++++++++-----
 1 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index fb6f2c4..5344f9f 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -191,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
@@ -344,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
@@ -475,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">
@@ -482,14 +506,16 @@
         issue WHERE issue_status_id = #{issueStatusId};
     </select>
 
+
     <!--    �듅�젙 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋瑜� 議고쉶 -->
     <select id="findByCustomFieldValue" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
         SELECT
-        id
-        FROM issue
-        LEFT OUTER JOIN issue_custom_field_value issue_custom FORCE INDEX(issueIdIndex) ON issue.id = issue_custom.issue_id
+        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 issue.parent_issue_id IS NULL
+        AND iss.parent_issue_id IS NULL
         <choose>
             <when test="useValues.size != 0">
                 AND issue_custom.use_value IN

--
Gitblit v1.8.0