From dea4bb128425e06684bf95e8e97613a20cf3bcfa Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 24 1월 2022 18:10:31 +0900
Subject: [PATCH] 이슈 테이블 표시 설정 10 이상 정렬 오류 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 ce55b1b..a772639 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -46,7 +46,11 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.*;
+
+import static kr.wisestone.owl.domain.enumType.CustomFieldType.DATETIME;
+import static kr.wisestone.owl.domain.enumType.CustomFieldType.INPUT;
@Service
public class IssueServiceImpl extends AbstractServiceImpl<Issue, Long, JpaRepository<Issue, Long>> implements IssueService {
@@ -809,7 +813,7 @@
useValues.add(issueCustomFieldValueVo.getUseValue());
customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), useValues);
} else {
- if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(CustomFieldType.INPUT.toString())) {
+ if (issueCustomFieldValueVo.getCustomFieldVo().getCustomFieldType().equals(INPUT.toString())) {
customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), issueCustomFieldValueVo.getUseValue());
} else {
customField.put(issueCustomFieldValueVo.getCustomFieldVo().getName(), Lists.newArrayList(issueCustomFieldValueVo.getUseValue()));
@@ -3336,6 +3340,15 @@
}
}
+ /**
+ * cell NULL 泥댄겕 �븿�닔
+ * @param cell Cell
+ * @return boolean
+ */
+ private Boolean cellNullCheck (Cell cell) {
+ return cell != null && cell.getStringCellValue() != null && cell.getCellType() != Cell.CELL_TYPE_BLANK;
+ }
+
// �뿊�� �븘�뱶�뿉 �엳�뒗 �젙蹂대�� �씠�뒋 form �쑝濡� �삷湲대떎.
private IssueForm setIssueFormToExcelField(Row row, int rowIndex, Map<String, Priority> priorityMaps,
Map<String, Severity> severityMaps, Map<String, DepartmentVo> departmentMaps,
@@ -3354,7 +3367,7 @@
break;
case 1: // �궡�슜
- if (cell != null) {
+ if (cellNullCheck(cell)) {
issueForm.setDescription(CommonUtil.convertExcelStringToCell(cell));
} else {
// null �엯�젰 諛⑹�
@@ -3378,13 +3391,13 @@
break;*/
case 4:
// �떆�옉�씪�쓣 IssueForm �뿉 ���옣�븳�떎.
- if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK) {
+ if (cellNullCheck(cell)) {
this.setIssueFormPeriod(cell, issueForm, true, rowIndex);
}
break;
case 5:
// 醫낅즺�씪�쓣 IssueForm �뿉 ���옣�븳�떎.
- if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK) {
+ if (cellNullCheck(cell)) {
this.setIssueFormPeriod(cell, issueForm, false, rowIndex);
}
break;
@@ -3555,11 +3568,16 @@
case EMAIL:
case SITE:
case TEL:
- if (cellValue.length() > 100) {
+ if (customField.getCustomFieldType() != INPUT && cellValue.length() > 100) { //INPUT ���엯�� 100�옄 �젣�븳 �뾾�쓬
throw new OwlRuntimeException(
this.messageAccessor.getMessage(MsgConstants.CUSTOM_FIELD_TEXT_TYPE_MAX_LENGTH_OUT));
}
+ if (customField.getCustomFieldType() == DATETIME) { //DATETIME�씪 寃쎌슦 format 蹂�寃�
+ Date date = cell.getDateCellValue();
+ cellValue = new SimpleDateFormat("yyyy-MM-dd H:mm:ss").format(date);
+ }
+
issueCustomFieldMap.put("customFieldId", customField.getId());
issueCustomFieldMap.put("useValue", cellValue);
issueForm.addIssueCustomFields(issueCustomFieldMap);
--
Gitblit v1.8.0