From e2b9ee4f143ac97c63a5c19ae9424944322c70ad Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 08 2월 2022 10:36:08 +0900
Subject: [PATCH] 이슈 임포트 코드 수정

---
 src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 45418f0..40f9cf2 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3465,14 +3465,20 @@
 
     /**
      * cell NULL 泥댄겕 �븿�닔
-     * 臾몄옄�삎�떇 cell 泥댄겕
+     * 鍮� 媛믪씠 �븘�땶 cell 泥댄겕
      * @param cell Cell
      * @return boolean
      */
     private Boolean cellNullCheck (Cell cell) {
         if (cell != null ) {
-            if (cell.getCellType() != Cell.CELL_TYPE_BLANK) {
-                if (cell.getCellType() == Cell.CELL_TYPE_STRING && cell.getStringCellValue() != null) {
+            int cellType = cell.getCellType();
+            if (cellType < Cell.CELL_TYPE_BLANK) {
+                if (cellType == Cell.CELL_TYPE_STRING)
+                {
+                    if (cell.getStringCellValue() != null) {
+                        return false;
+                    }
+                } else {
                     return false;
                 }
             }
@@ -3499,6 +3505,7 @@
             boolean isNull = cellNullCheck(cell);
 
             String cellStr = "";
+
             if (!isNull) {
                 cellStr = CommonUtil.convertExcelStringToCell(cell);
 
@@ -3702,9 +3709,9 @@
             }
 
             if (checkStartDate) {
-                issueForm.setStartDate(periodDate);
+                issueForm.setStartDate(DateUtil.convertDateToStr(startDate, "yyyy-MM-dd"));
             } else {
-                issueForm.setCompleteDate(periodDate);
+                issueForm.setCompleteDate(DateUtil.convertDateToStr(startDate, "yyyy-MM-dd"));
                 
                 //  醫낅즺�씪留� �엯�젰 �뻽�쓣 寃쎌슦
                 if (issueForm.getCompleteDate() != null && issueForm.getStartDate() == null) {
@@ -3717,7 +3724,7 @@
                     this.checkStartCompleteDate(issueForm.getStartDate(), issueForm.getCompleteDate());
                 } catch (OwlRuntimeException e) {
                     throw new OwlRuntimeException(
-                            this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PERIOD_NOT_VALIDITY, rowIndex));
+                            this.messageAccessor.getMessage(MsgConstants.EXCEL_IMPORT_PERIOD_NOT_VALID, rowIndex));
                 }
             }
         }

--
Gitblit v1.8.0