From 247dcf648bbceb4cc4f2fa405c1e331e9b901181 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 10:12:29 +0900
Subject: [PATCH] 이슈상세 - 업체/ISP/호스팅 백엔드 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 47 +++++------------------------------------------
1 files changed, 5 insertions(+), 42 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 d8c2d72..46fda1f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -227,26 +227,7 @@
}
}
}
- // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 ISP �젙蹂대�� �뀑�똿�븳�떎.
- private void setUseIssueTypeByIspField(List<IssueTypeVo> issueTypeVos) {
- for (IssueTypeVo issueTypeVo : issueTypeVos){
- IssueType issueType = this.getIssueType(issueTypeVo.getId());
- IspField ispField = issueType.getIspField();
- if(ispField != null){
- issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
- }
- }
- }
- // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �샇�뒪�똿 �젙蹂대�� �뀑�똿�븳�떎.
- private void setUseIssueTypeByHostingField(List<IssueTypeVo> issueTypeVos) {
- for (IssueTypeVo issueTypeVo : issueTypeVos){
- IssueType issueType = this.getIssueType(issueTypeVo.getId());
- HostingField hostingField = issueType.getHostingField();
- if(hostingField != null){
- issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
- }
- }
- }*/
+ */
// �씠�뒋 �쑀�삎 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@Override
@@ -268,31 +249,23 @@
if (project != null) {
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
- Integer use = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
+ Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
- for (Integer useCompany : UseCompany.useCompanies) {
- UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);
+ for (Integer useAbleCompany : UseCompany.useCompanies) {// 1 // 2 // 4
+ UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);//3, 1 / 3, 2 / 3, 4
if (useCompanyVo != null) {
useCompanyVos.add(useCompanyVo);
}
}
-
issueTypeVo.setUseCompanyVos(useCompanyVos);
/*CompanyField companyField = issueType.getCompanyField();
if(companyField != null){
issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
}
- IspField ispField = issueType.getIspField();
- if (ispField != null){
- issueTypeVo.setIspFieldVo(ConvertUtil.copyProperties(issueType.getIspField(), IspFieldVo.class));
- }
- HostingField hostingField = issueType.getHostingField();
- if (hostingField != null){
- issueTypeVo.setHostingFieldVo(ConvertUtil.copyProperties(issueType.getHostingField(), HostingFieldVo.class));
- }*/
+ */
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -326,18 +299,8 @@
/*if(issueTypeForm.getCompanyId() != null){
CompanyField companyField = this.companyFieldService.getCompany(issueTypeForm.getCompanyId());
issueType.setCompanyField(companyField);
- }
- if(issueTypeForm.getIspId() != null) {
- IspField ispField = this.ispFieldService.getIsp(issueTypeForm.getIspId());
- issueType.setIspField(ispField);
- }
- if(issueTypeForm.getHostingId() != null) {
- HostingField hostingField = this.hostingFieldService.getHosting(issueTypeForm.getHostingId());
- issueType.setHostingField(hostingField);
}*/
// issueType.setCompanyYn(issueTypeForm.getCompanyYn());
-// issueType.setIspYn(issueTypeForm.getIspYn());
-// issueType.setHostingYn(issueTypeForm.getHostingYn());
this.issueTypeRepository.saveAndFlush(issueType);
--
Gitblit v1.8.0