From e7c0ff25749d77b25fdad019861c1a5a444b21dd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 26 11월 2021 00:36:48 +0900
Subject: [PATCH] 언어팩 수정, 간단한 오류 수정 [프론트]
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 insertions(+), 0 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 2b81ab9..d8c2d72 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;
@@ -47,6 +49,15 @@
@Autowired
private WorkspaceService workspaceService;
+
+ @Autowired
+ private CompanyFieldService companyFieldService;
+
+ @Autowired
+ private IspFieldService ispFieldService;
+
+ @Autowired
+ private HostingFieldService hostingFieldService;
@Autowired
private IssueTypeMapper issueTypeMapper;
@@ -114,6 +125,8 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
+ issueType.setUseCompany(issueTypeForm.getUseCompany());
+
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -172,6 +185,9 @@
}
this.setUseIssueTypeByProject(issueTypeVos);
+ /*this.setUseIssueTypeByCompanyField(issueTypeVos);
+ this.setUseIssueTypeByIspField(issueTypeVos);
+ this.setUseIssueTypeByHostingField(issueTypeVos);*/
resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
totalPage, totalCount));
@@ -201,6 +217,37 @@
}
}
+ /*// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뾽泥� �젙蹂대�� �뀑�똿�븳�떎.
+ private void setUseIssueTypeByCompanyField(List<IssueTypeVo> issueTypeVos) {
+ for (IssueTypeVo issueTypeVo : issueTypeVos){
+ IssueType issueType = this.getIssueType(issueTypeVo.getId());
+ CompanyField companyField = issueType.getCompanyField();
+ if(companyField != null){
+ issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
+ }
+ }
+ }
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 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
@Transactional(readOnly = true)
@@ -221,6 +268,31 @@
if (project != null) {
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
+ Integer use = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
+
+ List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
+ for (Integer useCompany : UseCompany.useCompanies) {
+ UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);
+
+ 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);
@@ -249,6 +321,24 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
+ 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());
+// issueType.setIspYn(issueTypeForm.getIspYn());
+// issueType.setHostingYn(issueTypeForm.getHostingYn());
+
this.issueTypeRepository.saveAndFlush(issueType);
return issueType;
--
Gitblit v1.8.0