From 5996786ac1e76645be752a9971ad75ee2fe730d7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 15 2월 2022 10:40:00 +0900
Subject: [PATCH] - 탐지일시가 제대로 검색되지 않는 문제 해결 - 이슈 테이블 표시 설정 시 팝업 타이밍 수정
---
src/main/resources/mybatis/query-template/issueType-template.xml | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index fef510b..1d387f4 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -8,7 +8,9 @@
DISTINCT it.id as id,
it.name as name,
it.description as description,
- it.color as color
+ it.color as color,
+ it.project_id as projectId,
+ it.use_partner AS usePartners
FROM
issue_type it
INNER JOIN workspace ws on it.workspace_id = ws.id
@@ -16,13 +18,30 @@
<if test="name != '' and name != null">
AND it.name like CONCAT('%',#{name},'%')
</if>
+ <choose>
+ <when test="allProjectIds != null and allProjectIds.size != 0">
+ AND it.project_id IN
+ <foreach collection="allProjectIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
<if test="projectId != '' and projectId != null">
AND it.project_id like CONCAT('%',#{projectId},'%')
</if>
+ <choose>
+ <when test="downProjectIds != null and downProjectIds.size != 0">
+ OR it.project_id IN
+ <foreach collection="downProjectIds" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
<if test="useProject != '' and useProject != null and useProject == true">
AND it.project_id IS NOT NULL
</if>
AND ws.id = #{workspaceId}
+ ORDER BY it.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
--
Gitblit v1.8.0