From 41c8f3c976c0d8ec4b0a6ad3d7f4ce90a9de03c7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 21:19:22 +0900
Subject: [PATCH] 프로젝트 담당부서 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 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 5e457e9..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;
@@ -123,18 +125,8 @@
Project project = this.projectService.getProject(issueTypeForm.getProjectId());
issueType.setProject(project);
- String Yes = "Y";
- String No = "N";
+ issueType.setUseCompany(issueTypeForm.getUseCompany());
- if(!issueTypeForm.getCompanyYn().equals(No)){
- issueType.setCompanyYn(Yes);
- }
- if(!issueTypeForm.getHostingYn().equals(No)){
- issueType.setHostingYn(Yes);
- }
- if(!issueTypeForm.getIspYn().equals(No)){
- issueType.setIspYn(Yes);
- }
return this.issueTypeRepository.saveAndFlush(issueType);
}
@@ -276,6 +268,18 @@
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){
@@ -317,6 +321,8 @@
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);
@@ -329,9 +335,9 @@
HostingField hostingField = this.hostingFieldService.getHosting(issueTypeForm.getHostingId());
issueType.setHostingField(hostingField);
}*/
- issueType.setCompanyYn(issueTypeForm.getCompanyYn());
- issueType.setIspYn(issueTypeForm.getIspYn());
- issueType.setHostingYn(issueTypeForm.getHostingYn());
+// issueType.setCompanyYn(issueTypeForm.getCompanyYn());
+// issueType.setIspYn(issueTypeForm.getIspYn());
+// issueType.setHostingYn(issueTypeForm.getHostingYn());
this.issueTypeRepository.saveAndFlush(issueType);
--
Gitblit v1.8.0