From f2ad0cefdd2fc83040a5d915a2c7dd37783f4395 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 금, 26 11월 2021 22:44:24 +0900 Subject: [PATCH] useCompany -> usePartner 명칭 변경 * DB 초기화 필요 --- src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 27 ++++++++------------------- 1 files changed, 8 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..cdcc647 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); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿 - } // �긽�쐞�씪媛� �젙蹂� 異붽� -- Gitblit v1.8.0