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/IssueServiceImpl.java | 27 +++++++++++++
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 20 +++-------
src/main/java/kr/wisestone/owl/constant/UseCompany.java | 11 ++---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 47 ++---------------------
4 files changed, 43 insertions(+), 62 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/UseCompany.java b/src/main/java/kr/wisestone/owl/constant/UseCompany.java
index 59a8406..ba349f2 100644
--- a/src/main/java/kr/wisestone/owl/constant/UseCompany.java
+++ b/src/main/java/kr/wisestone/owl/constant/UseCompany.java
@@ -15,15 +15,14 @@
public static String[] Names = {"�뾽泥�", "ISP", "�샇�뒪�똿"};
public static int[] useCompanies = {USE_COMPANY_COMPANY, USE_COMPANY_ISP, USE_COMPANY_HOSTING};
- // 沅뚰븳 泥댄겕�썑 HostingFieldVo 媛��졇�삤湲�
- public static UseCompanyVo checkUseCompany(int userPermission, int typePermission)
+ // �뾽泥�/ISP/�샇�뒪�똿 �젙蹂� �쑀臾� 泥댄겕 �썑 UseCompanyVo.Create
+ public static UseCompanyVo checkUseCompany(int using, int useAbleCompany) //using - DB�뿉 ���옣�맂 媛�, useAbleCompany - 媛� �뾽泥대뱾�쓽 �떎�젣 媛�
{
- if (((userPermission & typePermission) != 0)) {
+ if (((using & useAbleCompany) != 0)) {
Long Id = 0L;
- if (typePermission != USE_COMPANY_COMPANY) {
- Id = typePermission / 2L;
+ if (useAbleCompany != USE_COMPANY_COMPANY) {
+ Id = useAbleCompany / 2L;
}
-
return UseCompanyVo.Create(Id, Names[Id.intValue()]);
}
return null;
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 c87e482..6514898 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -6,6 +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.domain.*;
import kr.wisestone.owl.domain.enumType.CustomFieldType;
import kr.wisestone.owl.domain.enumType.EmailType;
@@ -865,9 +866,35 @@
this.setIssueHistory(issue, issueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setRelationIssue(issue, issueVo); //�뿰愿� �씪媛� �뀑�똿
this.setDownIssues(issue, issueVo);
+
+ IssueType issueType = this.issueTypeService.getIssueType(issueVo.getIssueTypeVo().getId()); // �씠�뒋�쓽 �씠�뒋�쑀�삎 媛앹껜
+ Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0; // �씠�뒋�쑀�삎蹂꾨줈 �궗�슜以묒씤 �뾽泥�/ISP/�샇�뒪�똿 媛�
+
+ List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
+ for (Integer useAbleCompany : UseCompany.useCompanies) { //1(�뾽泥�), 2(ISP), 4(�샇�뒪�똿)
+ UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(using, useAbleCompany);
+
+ if (useCompanyVo != null) {
+ useCompanyVos.add(useCompanyVo);
+ //useCompanyVo.setValues();
+ }
+ issueVo.setUseCompanyVo(useCompanyVos);
+ }
+
+// 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); //�긽�쐞 �씠�뒋 �젙蹂� �꽭�똿
}
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);
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index ebf9514..0d975f9 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -54,12 +54,12 @@
private WorkflowStatusVo workflowStatusVo;
//private Long parentIssueId; // �긽�쐞 �씪媛�
private IssueVo parentIssueVo;
+
private List<IssueCompanyVo> issueCompanyVos;
private List<IssueIspVo> issueIspVos;
private List<IssueHostingVo> issueHostingVos;
- private IssueTableConfig issueRelTableConfig;
- private IssueTableConfig issueDownTableConfig;
+ private List<UseCompanyVo> useCompanyVo = Lists.newArrayList();
public IssueVo(){}
@@ -431,19 +431,11 @@
this.parentIssueVo = parentIssueVo;
}
- public IssueTableConfig getIssueRelTableConfig() {
- return issueRelTableConfig;
+ public List<UseCompanyVo> getUseCompanyVo() {
+ return useCompanyVo;
}
- public void setIssueRelTableConfig(IssueTableConfig issueRelTableConfig) {
- this.issueRelTableConfig = issueRelTableConfig;
- }
-
- public IssueTableConfig getIssueDownTableConfig() {
- return issueDownTableConfig;
- }
-
- public void setIssueDownTableConfig(IssueTableConfig issueDownTableConfig) {
- this.issueDownTableConfig = issueDownTableConfig;
+ public void setUseCompanyVo(List<UseCompanyVo> useCompanyVo) {
+ this.useCompanyVo = useCompanyVo;
}
}
--
Gitblit v1.8.0