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 | 11 ++++++-----
src/main/java/kr/wisestone/owl/util/CommonUtil.java | 2 ++
src/main/java/kr/wisestone/owl/constant/MsgConstants.java | 3 ++-
src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties | 1 +
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index ba87674..7a9959e 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -177,7 +177,8 @@
public static final String EXCEL_IMPORT_PRIORITY_NOT_EXIST = "EXCEL_IMPORT_PRIORITY_NOT_EXIST"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 �슦�꽑�닚�쐞 紐낆쑝濡� 寃��깋�릺�뒗 �슦�꽑�닚�쐞媛� �뾾�뒿�땲�떎.
public static final String EXCEL_IMPORT_SEVERITY_IS_NULL = "EXCEL_IMPORT_SEVERITY_IS_NULL"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 以묒슂�룄 紐낆씠 �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
public static final String EXCEL_IMPORT_SEVERITY_NOT_EXIST = "EXCEL_IMPORT_SEVERITY_NOT_EXIST"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�맂 以묒슂�룄 紐낆쑝濡� 寃��깋�릺�뒗 �슦�꽑�닚�쐞媛� �뾾�뒿�땲�떎.
- public static final String EXCEL_IMPORT_PERIOD_NOT_VALIDITY = "EXCEL_IMPORT_PERIOD_NOT_VALIDITY"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �떆�옉�씪, 醫낅즺�씪�뿉 臾몄젣媛� �엳�뒿�땲�떎. �떆�옉�씪�� 醫낅즺�씪蹂대떎 鍮⑤씪�빞 �빀�땲�떎.
+ public static final String EXCEL_IMPORT_PERIOD_NOT_VALIDITY = "EXCEL_IMPORT_PERIOD_NOT_VALIDITY"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �떆�옉�씪, 醫낅즺�씪�뿉 臾몄젣媛� �엳�뒿�땲�떎. 怨듬갚�씠 �룷�븿�릺�뼱 �엳�뒗吏� �솗�씤 �썑 怨듬갚�쓣 �젣嫄고븯�꽭�슂.
+ public static final String EXCEL_IMPORT_PERIOD_NOT_VALID = "EXCEL_IMPORT_PERIOD_NOT_VALID"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �떆�옉�씪, 醫낅즺�씪�뿉 臾몄젣媛� �엳�뒿�땲�떎. �삎�떇�뿉 留욊쾶 �엯�젰 �뻽�뒗吏� �솗�씤 �빐二쇱꽭�슂.
public static final String EXCEL_IMPORT_PERIOD_NOT_VALIDITY_EMPTY_START = "EXCEL_IMPORT_PERIOD_NOT_VALIDITY_EMPTY_START"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 醫낅즺�씪�� �엯�젰 �릺�뼱�엳�쑝�굹, �떆�옉�씪�� �엯�젰�릺吏� �븡�븯�뒿�땲�떎.
public static final String EXCEL_IMPORT_PERIOD_NOT_VALIDITY_EMPTY = "EXCEL_IMPORT_PERIOD_NOT_VALIDITY_EMPTY"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �떆�옉�씪, 醫낅즺�씪�뿉 臾몄젣媛� �엳�뒿�땲�떎. 怨듬갚�씠 �룷�븿�릺�뼱 �엳�뒗吏� �솗�씤 �썑 怨듬갚�쓣 �젣嫄고븯�꽭�슂.
public static final String EXCEL_IMPORT_PERIOD_NOT_DASH = "EXCEL_IMPORT_PERIOD_NOT_DASH"; // �떎�쓬 �뿊�� �씪�씤�뿉�꽌 �엯�젰�븳 �떆�옉�씪, 醫낅즺�씪�뿉 臾몄젣媛� �엳�뒿�땲�떎. '-'�씠 �룷�븿�릺�뼱 �엳�뒗吏� �솗�씤 �썑 '-'瑜� �룷�븿 �떆耳쒖＜�꽭�슂. ex) 2022-01-01
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 78e3448..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,7 +3465,7 @@
/**
* cell NULL 泥댄겕 �븿�닔
- * 臾몄옄�삎�떇 cell 泥댄겕
+ * 鍮� 媛믪씠 �븘�땶 cell 泥댄겕
* @param cell Cell
* @return boolean
*/
@@ -3475,8 +3475,9 @@
if (cellType < Cell.CELL_TYPE_BLANK) {
if (cellType == Cell.CELL_TYPE_STRING)
{
- if (cell.getStringCellValue() != null)
+ if (cell.getStringCellValue() != null) {
return false;
+ }
} else {
return false;
}
@@ -3708,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) {
@@ -3723,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));
}
}
}
diff --git a/src/main/java/kr/wisestone/owl/util/CommonUtil.java b/src/main/java/kr/wisestone/owl/util/CommonUtil.java
index 801fff6..22f87bb 100644
--- a/src/main/java/kr/wisestone/owl/util/CommonUtil.java
+++ b/src/main/java/kr/wisestone/owl/util/CommonUtil.java
@@ -961,6 +961,8 @@
switch (cell.getCellType()) {
case Cell.CELL_TYPE_NUMERIC :
+
+ // �궇吏� �삎�떇�씤 寃쎌슦 �궇吏쒕줈 蹂��솚
if (HSSFDateUtil.isCellDateFormatted(cell)) {
Date date = cell.getDateCellValue();
cellValue = DateUtil.convertDateToStr(date, "yyyy-MM-dd hh:mm:ss");
diff --git a/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
index 7313108..4a090e3 100644
--- a/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/messages_ko_KR.properties
@@ -178,6 +178,7 @@
EXCEL_IMPORT_PRIORITY_NOT_EXIST=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uB41C \uC6B0\uC120\uC21C\uC704 \uBA85\uC73C\uB85C \uAC80\uC0C9\uB418\uB294 \uC6B0\uC120\uC21C\uC704\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
EXCEL_IMPORT_SEVERITY_IS_NULL=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC911\uC694\uB3C4 \uBA85\uC774 \uC785\uB825\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
EXCEL_IMPORT_SEVERITY_NOT_EXIST=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uB41C \uC911\uC694\uB3C4 \uBA85\uC73C\uB85C \uAC80\uC0C9\uB418\uB294 \uC6B0\uC120\uC21C\uC704\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
+EXCEL_IMPORT_PERIOD_NOT_VALID=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC2DC\uC791\uC77C, \uC885\uB8CC\uC77C\uC5D0 \uBB38\uC81C\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uD615\uC2DD\uC5D0 \uB9DE\uAC8C \uC785\uB825 \uD588\uB294\uC9C0 \uD655\uC778 \uD574\uC8FC\uC138\uC694. \n \uB77C\uC778 \uC815\uBCF4 : {0}
EXCEL_CUSTOM_FIELD_VALUE_NOT_VALIDITY=\uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uAC12\uC774 \uC720\uD6A8\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
EXCEL_IMPORT_HEADER_CUSTOM_FIELD_NOT_EXIST=\uB4F1\uB85D\uD558\uB824\uB294 \uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uD574\uB2F9 \uC0AC\uC6A9\uC790 \uC815\uC758\uD544\uB4DC\uC758 \uC774\uB984\uC774 \uBCC0\uACBD\uB418\uC5C8\uAC70\uB098 \uC0AD\uC81C\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
EXCEL_IMPORT_PERIOD_NOT_VALIDITY= \uB2E4\uC74C \uC5D1\uC140 \uB77C\uC778\uC5D0\uC11C \uC785\uB825\uD55C \uC2DC\uC791\uC77C, \uC885\uB8CC\uC77C\uC5D0 \uBB38\uC81C\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uC2DC\uC791\uC77C\uC740 \uC885\uB8CC\uC77C\uBCF4\uB2E4 \uBE68\uB77C\uC57C \uD569\uB2C8\uB2E4. \n \uB77C\uC778 \uC815\uBCF4 : {0}
--
Gitblit v1.8.0