From c71e4956a3d7e15e3ca7425194f34e515d348bb2 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 14:51:44 +0900
Subject: [PATCH] 전체이슈 메뉴에서 이슈 수정 시 issueTypeId 못 가져오는 문제 해결

---
 src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java |   84 +++++++++++++++++++++++++++---------------
 1 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index dcb513d..d1512ee 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -142,6 +142,40 @@
         return this.companyFieldMapper.find(condition);
     }
 
+    /**
+     * companyFieldCategory Name �꽕�젙
+     * @param companyFieldVo CompanyFieldVo
+     * @param companyField CompanyField
+     */
+    @Override
+    public CompanyFieldVo CreateCompanyFieldCategory(CompanyFieldVo companyFieldVo, CompanyField companyField) {
+        if (companyField.getCompanyTypeId() != null && companyField.getCompanyTypeId() != -1) {
+            CompanyFieldCategory companyType = this.companyFieldCategoryService.find(companyField.getCompanyTypeId());
+            if (companyType != null) {
+                companyFieldVo.setCompanyTypeName(companyType.getUseValue());
+            }
+        }
+        if (companyField.getParentSectorId() != null && companyField.getParentSectorId() != -1) {
+            CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(companyField.getParentSectorId());
+            if (parentSector != null) {
+                companyFieldVo.setParentSectorName(parentSector.getUseValue());
+            }
+        }
+        if (companyField.getChildSectorId() != null && companyField.getChildSectorId() != -1) {
+            CompanyFieldCategory childSector = this.companyFieldCategoryService.find(companyField.getChildSectorId());
+            if (childSector != null) {
+                companyFieldVo.setChildSectorName(childSector.getUseValue());
+            }
+        }
+        if (companyField.getRegionId() != null && companyField.getRegionId() != -1) {
+            CompanyFieldCategory region = this.companyFieldCategoryService.find(companyField.getRegionId());
+            if (region != null) {
+                companyFieldVo.setRegionName(region.getUseValue());
+            }
+        }
+        return companyFieldVo;
+    }
+
     // �뾽泥� �긽�꽭 議고쉶�븳�떎.
     @Override
     @Transactional
@@ -166,36 +200,7 @@
             ispFieldVo = ConvertUtil.copyProperties(ispField, IspFieldVo.class);
             hostingFieldVo = ConvertUtil.copyProperties(hostingField, HostingFieldVo.class);
 
-            if (companyField.getCompanyTypeId() != null && companyField.getCompanyTypeId() != -1) {
-                CompanyFieldCategory companyType = this.companyFieldCategoryService.find(companyField.getCompanyTypeId());
-                if (companyType != null) {
-                    companyFieldVo.setCompanyTypeName(companyType.getUseValue());
-                }
-            }
-            if (companyField.getParentSectorId() != null && companyField.getParentSectorId() != -1) {
-                CompanyFieldCategory parentSector = this.companyFieldCategoryService.find(companyField.getParentSectorId());
-                if (parentSector != null) {
-                    companyFieldVo.setParentSectorName(parentSector.getUseValue());
-                }
-            }
-            if (companyField.getChildSectorId() != null && companyField.getChildSectorId() != -1) {
-                CompanyFieldCategory childSector = this.companyFieldCategoryService.find(companyField.getChildSectorId());
-                if (childSector != null) {
-                    companyFieldVo.setChildSectorName(childSector.getUseValue());
-                }
-            }
-            if (companyField.getRegionId() != null && companyField.getRegionId() != -1) {
-                CompanyFieldCategory region = this.companyFieldCategoryService.find(companyField.getRegionId());
-                if (region != null) {
-                    companyFieldVo.setRegionName(region.getUseValue());
-                }
-            }
-            /*if (companyField.getStatusId() != null && companyField.getStatusId() != -1) {
-                CompanyFieldCategory status = this.companyFieldCategoryService.find(companyField.getStatusId());
-                if (status != null) {
-                    companyFieldVo.setStatusName(status.getUseValue());
-                }
-            }*/
+            CreateCompanyFieldCategory(companyFieldVo, companyField);
 
             companyFieldVo.setIspFieldVo(ispFieldVo);
             companyFieldVo.setHostingFieldVo(hostingFieldVo);
@@ -222,6 +227,12 @@
                 emails = emails.substring(1, emails.indexOf("]"));
             }
             companyFieldForm.setEmail(emails.trim());
+        }
+
+        CompanyFieldCategory companyFieldCategory = this.companyFieldCategoryService.find(companyFieldForm.getChildSectorId());
+        if (!companyFieldCategory.getParentId().equals(companyFieldForm.getParentSectorId())) {
+            throw new OwlRuntimeException(
+                    this.messageAccessor.getMessage(MsgConstants.PARENT_SECTOR_NOT_EQUAL));
         }
 
         CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
@@ -667,6 +678,19 @@
 
         CompanyFieldCondition companyFieldCondition = CompanyFieldCondition.make(conditions);
         List<Map<String, Object>> results = this.companyFieldMapper.find(companyFieldCondition);
+        CompanyFieldVo companyFieldVo = new CompanyFieldVo();
+
+        if (results != null && results.size() > 0) {
+            for (Map<String, Object> result : results) {
+                CompanyField companyField = ConvertUtil.convertMapToClass(result, CompanyField.class);
+                CompanyFieldVo companyFieldVo2 = CreateCompanyFieldCategory(companyFieldVo, companyField);
+
+                result.put("companyTypeName", companyFieldVo2.getCompanyTypeName());
+                result.put("parentSectorName", companyFieldVo2.getParentSectorName());
+                result.put("childSectorName", companyFieldVo2.getChildSectorName());
+                result.put("regionName", companyFieldVo2.getRegionName());
+            }
+        }
         List<CompanyFieldVo> companyFieldVos = ConvertUtil.convertListToListClass(results, CompanyFieldVo.class);
 
         // code_ko_KR �뿉 code紐� �꽕�젙

--
Gitblit v1.8.0