From 9cdb1242b6b717430ac04a843392fc9733d50bdb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 21:47:35 +0900
Subject: [PATCH] 이슈 상세 유형별 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 77 ++++++++++----------------------------
1 files changed, 21 insertions(+), 56 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 ae2e65f..0c425db 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -3,7 +3,9 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.common.ExcelConditionCheck;
import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.constant.MngPermission;
import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.constant.UseCompany;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
@@ -123,18 +125,7 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- 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.setUseCompany(issueTypeForm.getUseCompany());
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -194,9 +185,9 @@
}
this.setUseIssueTypeByProject(issueTypeVos);
- this.setUseIssueTypeByCompanyField(issueTypeVos);
+ /*this.setUseIssueTypeByCompanyField(issueTypeVos);
this.setUseIssueTypeByIspField(issueTypeVos);
- this.setUseIssueTypeByHostingField(issueTypeVos);
+ this.setUseIssueTypeByHostingField(issueTypeVos);*/
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -226,7 +217,7 @@
}
}
- // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뾽泥� �젙蹂대�� �뀑�똿�븳�떎.
+ /*// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뾽泥� �젙蹂대�� �뀑�똿�븳�떎.
private void setUseIssueTypeByCompanyField(List<IssueTypeVo> issueTypeVos) {
for (IssueTypeVo issueTypeVo : issueTypeVos){
IssueType issueType = this.getIssueType(issueTypeVo.getId());
@@ -236,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
@@ -277,19 +249,17 @@
if (project != null) {
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
+ Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
- CompanyField companyField = issueType.getCompanyField();
- if(companyField != null){
- issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
+ List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
+ 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);
+ }
}
- 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));
- }
+ issueTypeVo.setUseCompanyVos(useCompanyVos);
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -318,18 +288,13 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- if(issueTypeForm.getCompanyId() != null){
+ issueType.setUseCompany(issueTypeForm.getUseCompany());
+
+ /*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());
this.issueTypeRepository.saveAndFlush(issueType);
--
Gitblit v1.8.0