From d8b90cea2b95f8aedd7a213e71908b44c1df6728 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 29 11월 2021 14:37:02 +0900
Subject: [PATCH] - api 기본값 설정 기능 완료 - api 중복 필드 설정 기능 완료
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 6514898..d1b2243 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -6,7 +6,7 @@
import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.constant.ElasticSearchConstants;
import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.constant.UseCompany;
+import kr.wisestone.owl.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.EmailType;
@@ -868,35 +868,24 @@
this.setDownIssues(issue, issueVo);
IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
- Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
- List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
- for (Integer useAbleCompany : UseCompany.useCompanies) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
- UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);
- if (useCompanyVo != null) {
- useCompanyVos.add(useCompanyVo);
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
//useCompanyVo.setValues();
}
- issueVo.setUseCompanyVo(useCompanyVos);
+ issueVo.setUsePartnerVos(usePartnerVos);
}
-
-// List<UseCompanyVo> useCompanyVoList =issueVo.getIssueTypeVo().getUseCompanyVos();
-// for (Integer useCompany : UseCompany.useCompanies) {
-// UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);
-//
-// if (useCompanyVo != null) {
-// useCompanyVoList.add(useCompanyVo);
-// }
-// }
this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
-
this.setParentIssue(issue,issueVo); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿
-
}
// �긽�쐞�씪媛� �젙蹂� 異붽�
@@ -2695,4 +2684,20 @@
this.issueRepository.saveAndFlush(issue);
}
+
+ @Override
+ public void findPartner(Map<String, Object> resJsonData, Map<String, Object> params) {
+ Long issueTypeId = MapUtil.getLong(params, "issueTypeId");
+ IssueType issueType = this.issueTypeService.getIssueType(issueTypeId); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
+
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
+ }
+ resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
+ }
+ }
}
--
Gitblit v1.8.0