From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/resources/mybatis/query-template/issue-template.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 88e0bfe..bcb5c7b 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -345,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
@@ -476,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">
@@ -483,6 +506,7 @@
issue WHERE issue_status_id = #{issueStatusId};
</select>
+
<!-- �듅�젙 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 媛숈� �씠�뒋瑜� 議고쉶 -->
<select id="findByCustomFieldValue" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
SELECT
--
Gitblit v1.8.0