From 4ab15ca2bb74d0d33d1325d849422635b9d415b1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 2월 2022 15:31:39 +0900
Subject: [PATCH] 업체 임포트 시 코드 보완

---
 src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 21 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 56499a8..eda71d1 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -442,19 +442,34 @@
      * @param cell Cell
      * @return boolean
      */
-    private Boolean cellNullCheck (Cell cell) {
-        if (cell != null && cell.getStringCellValue() != null) {
-            cell.setCellValue(cell.getStringCellValue().trim());//�� 媛� 怨듬갚 �젣嫄�
+    private Boolean cellNullCheck (Cell cell, int rowIndex) {
+        boolean result = false;
+        
+        //  臾몄옄�삎�떇�씤吏� 泥댄겕
+        if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK && cell.getCellType() != cell.CELL_TYPE_STRING) {
+            throw new OwlRuntimeException(
+                    this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_NOT_STRING_TYPE, rowIndex));
         }
-        return cell != null && cell.getStringCellValue() != null && !cell.getStringCellValue().equals("") && cell.getCellType() != Cell.CELL_TYPE_BLANK;
+
+        //  怨듬갚 �젣嫄�
+        if (cell != null && cell.getCellType() == cell.CELL_TYPE_STRING && cell.getStringCellValue() != null) {
+            cell.setCellValue(cell.getStringCellValue().trim());
+        }
+
+        if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK && cell.getCellType() == cell.CELL_TYPE_STRING
+                && cell.getStringCellValue() != null && !cell.getStringCellValue().equals("")) {
+            result = true;
+        }
+
+        return result;
     }
 
-    private void telTypeCheck (Cell cell, int rowIndex) {
-        if (cell.getCellType() != cell.CELL_TYPE_STRING) {
+    /*private void telTypeCheck (Cell cell, int rowIndex) {
+        if (cell != null && cell.getCellType() != cell.CELL_TYPE_STRING) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_TEL_NOT_STRING_TYPE, rowIndex));
         }
-    }
+    }*/
 
     //  �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �뾽泥� form �쑝濡� �삷湲대떎.
     private CompanyFieldForm setCompanyFieldFormToExcelField(Row row, int rowIndex, Map<String, IspField> ispFieldMaps, Map<String, HostingField> hostingFieldMaps,
@@ -474,85 +489,85 @@
 
                 case 1:
                     //  url
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormUrl(cell, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 2:
                     // isp紐�
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormIspName(cell, ispFieldMaps, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 3:
                     // �샇�뒪�똿紐�
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormHostingName(cell, hostingFieldMaps, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 4:
                     // �뿰�씫泥�
-                    if (cellNullCheck(cell)) {
-                        this.telTypeCheck(cell, rowIndex); // �뀓�뒪�듃 �삎�떇 泥댄겕
+                    if (cellNullCheck(cell, rowIndex)) {
+                        //this.telTypeCheck(cell, rowIndex);
                         this.setCompanyFormTel(cell, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 5:
                     // �씠硫붿씪
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormEmail(cell, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 6:
                     // �떞�떦�옄
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormManager(cell, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 7:
                     // 湲곗뾽援щ텇
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormCompanyType(cell, companyTypeMaps, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 8:
                     // �뾽醫�(��遺꾨쪟)
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormParentSector(cell, parentSectorMaps, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 9:
                     // �뾽醫�(以묐텇瑜�)
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormChildSector(cell, childSectorMaps, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 10:
                     // 吏��뿭
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormRegion(cell, regionMaps, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 11:
                     // �긽�깭
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormStatus(cell, statusMaps, companyFieldForm, rowIndex);
                     }
                     break;
 
                 case 12:
                     // 鍮꾧퀬
-                    if (cellNullCheck(cell)) {
+                    if (cellNullCheck(cell, rowIndex)) {
                         this.setCompanyFormMemo(cell, companyFieldForm, rowIndex);
                     }
                     break;
@@ -683,7 +698,7 @@
     }
 
     private void setCompanyFormName(Cell cell, CompanyFieldForm companyFieldForm, int rowIndex) {
-        if (!cellNullCheck(cell)) {
+        if (!cellNullCheck(cell, rowIndex)) {
             throw new OwlRuntimeException(
                     this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_COMPANY_NAME_IS_NULL, rowIndex));
         }

--
Gitblit v1.8.0