From ec1290e99bd572a443582cd177f8352d952fce89 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 10:12:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java |   80 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 80 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 c32c1ee..46fda1f 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;
@@ -43,7 +45,19 @@
     private WorkflowService workflowService;
 
     @Autowired
+    private ProjectService projectService;
+
+    @Autowired
     private WorkspaceService workspaceService;
+
+    @Autowired
+    private CompanyFieldService companyFieldService;
+
+    @Autowired
+    private IspFieldService ispFieldService;
+
+    @Autowired
+    private HostingFieldService hostingFieldService;
 
     @Autowired
     private IssueTypeMapper issueTypeMapper;
@@ -108,6 +122,10 @@
         issueType.setWorkspace(workspace);
         Workflow workflow = this.workflowService.getWorkflow(issueTypeForm.getWorkflowId());
         issueType.setWorkflow(workflow);
+        Project project = this.projectService.getProject(issueTypeForm.getProjectId());
+        issueType.setProject(project);
+
+        issueType.setUseCompany(issueTypeForm.getUseCompany());
 
         return this.issueTypeRepository.saveAndFlush(issueType);
     }
@@ -166,6 +184,11 @@
             this.setUseIssueTypeByWorkflow(issueTypeVos);
         }
 
+        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));
 
@@ -182,6 +205,30 @@
         }
     }
 
+    //  �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �봽濡쒖젥�듃 �젙蹂대�� �뀑�똿�븳�떎.
+    private void setUseIssueTypeByProject(List<IssueTypeVo> issueTypeVos) {
+        for (IssueTypeVo issueTypeVo : issueTypeVos) {
+            IssueType issueType = this.getIssueType(issueTypeVo.getId());
+
+            Project project = issueType.getProject();
+            if (project != null) {
+                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
+            }
+        }
+    }
+
+    /*//  �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �뾽泥� �젙蹂대�� �뀑�똿�븳�떎.
+    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));
+            }
+        }
+    }
+    */
+
     //  �씠�뒋 �쑀�삎 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
     @Override
     @Transactional(readOnly = true)
@@ -197,6 +244,28 @@
                     issueTypeVo.setWorkflowVo(ConvertUtil.copyProperties(issueType.getWorkflow(), WorkflowVo.class));
                     break;
             }
+
+            Project project = issueType.getProject();
+            if (project != null) {
+                issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
+            }
+            Integer using = issueType.getUseCompany() != null ? issueType.getUseCompany().intValue() : 0;
+
+            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);
+                }
+            }
+            issueTypeVo.setUseCompanyVos(useCompanyVos);
+
+            /*CompanyField companyField = issueType.getCompanyField();
+            if(companyField != null){
+                issueTypeVo.setCompanyFieldVo(ConvertUtil.copyProperties(issueType.getCompanyField(), CompanyFieldVo.class));
+            }
+            */
         }
 
         resJsonData.put(Constants.RES_KEY_CONTENTS, issueTypeVo);
@@ -222,6 +291,17 @@
         ConvertUtil.copyProperties(issueTypeForm, issueType, "id", "issueTypeType");
         issueType.setWorkflow(workflow);
 
+        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);
+        }*/
+//        issueType.setCompanyYn(issueTypeForm.getCompanyYn());
+
         this.issueTypeRepository.saveAndFlush(issueType);
 
         return issueType;

--
Gitblit v1.8.0