From 49a02aa2071bcaf94f0f8c19e2578cd7650160a4 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 19:22:13 +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 | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index d6d1ee8..a86525d 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -200,7 +200,7 @@
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
- ORDER BY issue.register_date DESC
+ ORDER BY issue.modify_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -252,7 +252,7 @@
LEFT OUTER JOIN (SELECT issue_id, COUNT(id) as issueCommentCount FROM issue_comment GROUP BY issue_id)
temp_issue_comment on (temp_issue_comment.issue_id = issue.id)
WHERE 1=1
- <if test="keyWord != null and !keyWord.equals('') ">
+ <if test="keyWord != null and !keyWord.equals('') and myDepartmentIds.size != 0">
AND issue.title like CONCAT('%',#{keyWord},'%')
OR issue.description like CONCAT('%',#{keyWord},'%')
OR issue.start_date like CONCAT('%',#{keyWord},'%')
@@ -395,7 +395,7 @@
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
- ORDER BY issue.register_date DESC
+ ORDER BY issue.modify_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -808,11 +808,11 @@
<select id="findByIssueTypeId" resultType="java.util.HashMap"
parameterType="java.lang.Long">
SELECT
- i.id as issueId,
- iss.id as issueStatusId,
- iss.name as issueStatusName
+ 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
+ INNER JOIN issue_status iss on iss.id = i.issue_status_id
WHERE i.issue_type_id = #{issueTypeId}
</select>
@@ -832,7 +832,7 @@
<select id="findByProjectId" resultType="java.util.HashMap"
parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- id
+ id
FROM issue
WHERE project_id = #{projectId}
</select>
@@ -955,24 +955,24 @@
<!-- �씠�뒋 �쑀�삎�쓣 �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎 -->
<select id="countByIssueTypeId" resultType="java.lang.Long" parameterType="java.lang.Long">
- SELECT COUNT(DISTINCT id) FROM
- issue WHERE issue_type_id = #{issueTypeId};
+ SELECT COUNT(DISTINCT id) FROM
+ 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)
+ COUNT(DISTINCT id)
FROM issue
WHERE issue_type_id = #{id}
- AND register_date BETWEEN #{startDate} AND #{endDate}
- AND is_api = #{isApi};
+ AND register_date BETWEEN #{startDate} AND #{endDate}
+ AND is_api = #{isApi};
</select>
<!-- �씠�뒋 �긽�깭瑜� �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎. -->
<select id="countByIssueStatusId" resultType="java.lang.Long" parameterType="java.lang.Long">
SELECT COUNT(DISTINCT id) FROM
- issue WHERE issue_status_id = #{issueStatusId};
+ issue WHERE issue_status_id = #{issueStatusId};
</select>
@@ -985,12 +985,13 @@
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 (
+ 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}
GROUP BY issue.id
HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%')
</select>
@@ -999,12 +1000,12 @@
<!-- 醫낅즺 �븞�맂 �븯�쐞 �씠�뒋 媛��졇�삤湲� -->
<select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
SELECT
- iss.id as id,
- iss.title as title
+ iss.id as id,
+ iss.title as title
FROM issue iss
- INNER JOIN issue_status issueStatus on iss.issue_status_id = issueStatus.id
+ 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'
+ AND iss.id != #{id}
+ AND issueStatus.issue_status_type != 'CLOSE'
</select>
</mapper>
--
Gitblit v1.8.0