From dbcc95475a37625a8ba03ee8037df7e0871f7a9d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 24 12월 2021 16:46:04 +0900
Subject: [PATCH] 이슈타입 리스트 하위 프로젝트꺼까지 다 보이도록 수정
---
src/main/resources/mybatis/query-template/issueType-template.xml | 8 ++++++++
src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java | 10 +++++-----
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 2 ++
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
index ac67ca1..7d3c3f4 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -186,6 +186,8 @@
public List<IssueTypeVo> findIssueType(Map<String, Object> resJsonData,
IssueTypeCondition condition, Pageable pageable) {
+ List<Long> downProjectIds = Lists.newArrayList();
+
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
index dbd0698..78f8809 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IssueTypeCondition.java
@@ -29,7 +29,7 @@
private String isApi;
- private List<Long> projectIds = Lists.newArrayList();
+ private List<Long> downProjectIds = Lists.newArrayList();
public IssueTypeCondition(){}
@@ -145,12 +145,12 @@
this.endDate = endDate;
}
- public List<Long> getProjectIds() {
- return projectIds;
+ public List<Long> getDownProjectIds() {
+ return downProjectIds;
}
- public void setProjectIds(List<Long> projectIds) {
- this.projectIds = projectIds;
+ public void setDownProjectIds(List<Long> downProjectIds) {
+ this.downProjectIds = downProjectIds;
}
public String getIsApi() {
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index d10b62e..fdb9247 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -20,6 +20,14 @@
<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>
--
Gitblit v1.8.0