이슈 임포트 코드 수정

이민희

2022-02-08 e2b9ee4f143ac97c63a5c19ae9424944322c70ad

 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));
                }
            }
        }