From 8e7861e68cfba8f27d413437654f435a22f05cac Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 24 11월 2021 09:15:00 +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 | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 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 9e7f592..e2a058d 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -10,6 +10,7 @@
issue.reverse_index as reverseIndex,
issue.title as title,
issue.description as description,
+ issue.parent_issue_id as parentIssueId,
issue.start_date as startDate,
issue.complete_date as completeDate,
issue.issue_number as issueNumber,
@@ -39,6 +40,7 @@
INNER JOIN issue_type issue_type FORCE INDEX(PRIMARY) ON issue.issue_type_id = issue_type.id
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
+ LEFT OUTER JOIN issue_department issued FORCE INDEX(issueIdIndex) ON issue.id = issued.issue_id
LEFT OUTER JOIN issue_user issue_user FORCE INDEX(issueIdIndex) ON issue.id = issue_user.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)
@@ -131,6 +133,15 @@
<when test="userIds.size != 0">
AND issue_user.user_id IN
<foreach collection="userIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+
+ <choose>
+ <when test="departmentIds.size != 0">
+ AND issue_department.department_id IN
+ <foreach collection="departmentIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</when>
@@ -266,6 +277,15 @@
</choose>
<choose>
+ <when test="departmentIds.size != 0">
+ AND issue_department.department_id IN
+ <foreach collection="departmentIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+
+ <choose>
<when test="registerIds.size != 0">
AND issue.register_id IN
<foreach collection="registerIds" item="item" index="index" separator="," open="(" close=")">
@@ -347,12 +367,12 @@
<!-- �씠�뒋 由ъ뒪�겕 bulk insert, import �뿉�꽌 �궗�슜 -->
<insert id="insertIssueRiskBatch" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
parameterType="java.util.HashMap">
- INSERT INTO issue_risk(issue_id, workspace_id, change_assignee_count, change_issue_status_count,
+ INSERT INTO issue_risk(issue_id, workspace_id, change_assignee_count, change_department_count, change_issue_status_count,
issue_status_ids,
register_id, modify_id, register_date, modify_date)
VALUES
<foreach collection="list" item="map" index="index" separator="," open="" close="">
- (#{map.issueId}, #{map.workspaceId}, #{map.changeAssigneeCount}, #{map.changeIssueStatusCount},
+ (#{map.issueId}, #{map.workspaceId}, #{map.changeAssigneeCount}, #{map.changeDepartmentCount}, #{map.changeIssueStatusCount},
#{map.issueStatusIds},
#{map.registerId}, #{map.registerId}, NOW(), NOW())
</foreach>
@@ -409,6 +429,26 @@
</choose>
</select>
+ <select id="findIssueDepartment" resultType="java.util.HashMap"
+ parameterType="kr.wisestone.owl.web.condition.IssueCondition">
+ SELECT
+ i.id AS issueId,
+ d.id AS id,
+ d.department_name AS departmentName
+ FROM issue i
+ INNER JOIN issue_department issued ON issued.issue_id = i.id
+ INNER JOIN department d ON d.id = issued.department_id
+ WHERE 1=1
+ <choose>
+ <when test="issueIds.size != 0">
+ AND i.id IN
+ <foreach collection="issueIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ </select>
+
<!-- �씠�뒋 �쑀�삎�쓣 �궗�슜�븯�뒗 �씠�뒋 媛��닔瑜� 議고쉶�븳�떎 -->
<select id="countByIssueTypeId" resultType="java.lang.Long" parameterType="java.lang.Long">
SELECT COUNT(DISTINCT id) FROM
--
Gitblit v1.8.0