diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 29156be3..106f375b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -131,7 +131,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } workbook.close(); - return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); + return new ExcelUploadResultVO(sheet.getLastRowNum() , success, errorList); } // 셀 값을 문자열로 변환 @@ -147,8 +147,23 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut // 셀 값을 문자열로 변환 private Integer getCellNumberValue(Cell cell) { if (cell == null) return null; + return switch (cell.getCellType()) { case NUMERIC -> (int) cell.getNumericCellValue(); + case STRING -> { + try { + yield Integer.parseInt(cell.getStringCellValue().trim()); + } catch (NumberFormatException e) { + yield null; + } + } + case FORMULA -> { + try { + yield (int) cell.getNumericCellValue(); + } catch (Exception e) { + yield null; + } + } default -> null; }; } diff --git a/admin/src/main/resources/templates/households/modal/modal-excel-household.html b/admin/src/main/resources/templates/households/modal/modal-excel-household.html index f696c277..01b3839d 100644 --- a/admin/src/main/resources/templates/households/modal/modal-excel-household.html +++ b/admin/src/main/resources/templates/households/modal/modal-excel-household.html @@ -74,6 +74,7 @@ ajaxUtil._hideWaiting(); // 로딩바 hide alert("총 "+res.total+"건 중에 "+res.success+"건 등록되었습니다."); + document.querySelector(".modal-excel-household").ui.close(); }, statusCode: { 422: (res) => {