From 57b7f271f8bba85ea161a609ed5e01dd9495fed7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 18:01:54 +0900
Subject: [PATCH] - 이슈 상태명 특수문자 입력 가능하도록 수정 - 이슈유형 리스트에서 파트너 정보 보여주기
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 561db3a..b6df835 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -247,9 +247,6 @@
Long totalCount = this.issueTypeMapper.count(condition);
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
List<IssueTypeVo> issueTypeVos = ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
-// for (IssueTypeVo issueTypeVo : issueTypeVos) {
-//
-// }
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
if (condition.getDeep() != null) {
@@ -261,6 +258,7 @@
/*this.setUseIssueTypeByCompanyField(issueTypeVos);
this.setUseIssueTypeByIspField(issueTypeVos);
this.setUseIssueTypeByHostingField(issueTypeVos);*/
+ this.setUsePartner(issueTypeVos);
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -287,6 +285,22 @@
}
}
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뙆�듃�꼫 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUsePartner(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos) {
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ if (issueTypeVo.getUsePartners() != null) {
+ for (Integer usePartner : UsePartner.partners) {// 1 // 2 // 4
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(issueTypeVo.getUsePartners(), usePartner);//3, 1 / 3, 2 / 3, 4
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
+ }
+ }
+ issueTypeVo.setUsePartnerVos(usePartnerVos);
+ }
+ }
+ }
+
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �봽濡쒖젥�듃 �젙蹂대�� �뀑�똿�븳�떎.
private void setUseIssueTypeByProject(List<IssueTypeVo> issueTypeVos) {
for (IssueTypeVo issueTypeVo : issueTypeVos) {
--
Gitblit v1.8.0