From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 76 ++++++++++---------------------------
1 files changed, 21 insertions(+), 55 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..1e14323 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -3,9 +3,8 @@
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.constant.UsePartner;
import kr.wisestone.owl.domain.*;
import kr.wisestone.owl.domain.enumType.ProjectType;
import kr.wisestone.owl.exception.OwlRuntimeException;
@@ -125,7 +124,7 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- issueType.setUseCompany(issueTypeForm.getUseCompany());
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -174,6 +173,7 @@
condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
condition.setPageSize(pageable.getPageSize());
condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+
List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
Long totalCount = this.issueTypeMapper.count(condition);
int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
@@ -195,6 +195,15 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVos);
return issueTypeVos;
+ }
+
+ // �씠�뒋 �쑀�삎 紐⑸줉�쓣 議고쉶�븳�떎.
+ @Override
+ @Transactional(readOnly = true)
+ public List<IssueTypeVo> findIssueType(IssueTypeCondition condition) {
+ condition.setWorkspaceId(this.userService.getUser(this.webAppUtil.getLoginId()).getLastWorkspaceId());
+ List<Map<String, Object>> results = this.issueTypeMapper.find(condition);
+ return ConvertUtil.convertListToListClass(results, IssueTypeVo.class);
}
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� �뀑�똿�븳�떎.
@@ -227,26 +236,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 +258,17 @@
if (project != null) {
issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
}
- Integer use = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
+ Integer using = issueType.getUsePartner() != null ? issueType.getUsePartner().intValue() : 0;
- List<UseCompanyVo> useCompanyVos = Lists.newArrayList();
- for (Integer useCompany : UseCompany.useCompanies) {
- UseCompanyVo useCompanyVo = UseCompany.checkUseCompany(use, useCompany);
+ List<UsePartnerVo> usePartnerVos = Lists.newArrayList();
+ for (Integer usePartner : UsePartner.partners) {// 1 // 2 // 4
+ UsePartnerVo usePartnerVo = UsePartner.checkUsePartner(using, usePartner);//3, 1 / 3, 2 / 3, 4
- if (useCompanyVo != null) {
- useCompanyVos.add(useCompanyVo);
+ if (usePartnerVo != null) {
+ usePartnerVos.add(usePartnerVo);
}
}
-
- 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));
- }*/
+ issueTypeVo.setUsePartnerVos(usePartnerVos);
}
resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -321,23 +297,13 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- issueType.setUseCompany(issueTypeForm.getUseCompany());
+ issueType.setUsePartner(issueTypeForm.getUsePartner());
/*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