From 351e832cb2c0201ea3124a67944760bcb48a82f4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 16:57:32 +0900
Subject: [PATCH] 사용자정의필드 프론트 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java |   84 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 84 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..5e457e9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueTypeServiceImpl.java
@@ -49,6 +49,15 @@
     private WorkspaceService workspaceService;
 
     @Autowired
+    private CompanyFieldService companyFieldService;
+
+    @Autowired
+    private IspFieldService ispFieldService;
+
+    @Autowired
+    private HostingFieldService hostingFieldService;
+
+    @Autowired
     private IssueTypeMapper issueTypeMapper;
 
     @Autowired
@@ -114,6 +123,18 @@
         Project project = this.projectService.getProject(issueTypeForm.getProjectId());
         issueType.setProject(project);
 
+        String Yes = "Y";
+        String No = "N";
+
+        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);
     }
 
@@ -172,6 +193,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 +225,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 +276,19 @@
             if (project != null) {
                 issueTypeVo.setProjectVo(ConvertUtil.copyProperties(issueType.getProject(), ProjectVo.class));
             }
+
+            /*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 +317,22 @@
         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.setCompanyYn(issueTypeForm.getCompanyYn());
+        issueType.setIspYn(issueTypeForm.getIspYn());
+        issueType.setHostingYn(issueTypeForm.getHostingYn());
+
         this.issueTypeRepository.saveAndFlush(issueType);
 
         return issueType;

--
Gitblit v1.8.0