From b7dfb19b01f66a450126debb0590d20f2f71f2cc Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 24 11월 2021 14:34:45 +0900
Subject: [PATCH] 사용자정의필드도 검색 가능하도록 쿼리 수정
---
src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java | 10 +++++-----
src/main/resources/mybatis/query-template/issue-template.xml | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
index 0ecc5fb..177072d 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueCondition.java
@@ -34,6 +34,7 @@
private String projectType;
private String deep;
private Long parentIssueId; // �긽�쐞 �씪媛�
+ private String useValue;
private List<Long> projectIds = Lists.newArrayList();
private List<Long> issueStatusIds = Lists.newArrayList();
private List<Long> issueTypeIds = Lists.newArrayList();
@@ -43,7 +44,6 @@
private List<Long> departmentIds = Lists.newArrayList();
private List<Long> registerIds = Lists.newArrayList();
private List<String> issueIds = Lists.newArrayList(); // �씠�뒋 紐⑸줉 寃��깋�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶濡� 1李� 寃��깋�븳 寃곌낵瑜� �떞�쓣�븣 �궗�슜
- private List<String> userCustomFields = Lists.newArrayList();
private List<Map<String, Object>> issueCustomFields = Lists.newArrayList();
private List<Map<String, Object>> issueCompanyField = Lists.newArrayList();
private List<Map<String, Object>> issueIspField = Lists.newArrayList();
@@ -455,11 +455,11 @@
this.parentIssueId = parentIssueId;
}
- public List<String> getUserCustomFields() {
- return userCustomFields;
+ public String getUseValue() {
+ return useValue;
}
- public void setUserCustomFields(List<String> userCustomFields) {
- this.userCustomFields = userCustomFields;
+ public void setUseValue(String useValue) {
+ this.useValue = useValue;
}
}
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 7f2c8b5..ab13365 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -31,7 +31,7 @@
severity.id as severityId,
severity.name as severityName,
severity.color as severityColor,
- issue_custom.use_value AS useValue,
+ GROUP_CONCAT(issue_custom.use_value) AS useValue,
IFNULL(temp_attached_file.attachedFileCount, 0) as attachedFileCount,
IFNULL(temp_issue_comment.issueCommentCount, 0) as issueCommentCount
FROM issue issue FORCE INDEX(reverseIndex)
@@ -189,6 +189,7 @@
</choose>
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
+ GROUP BY issue.id
ORDER BY issue.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
--
Gitblit v1.8.0