diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java index 42ec09f8..b72d93ff 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java @@ -10,4 +10,5 @@ public interface CreateHouseholdMapper { Integer createHousehold(CreateHouseholdOutCmd outCmd); void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); void createResearcherHasHousehold(CreateResearcherHasHouseholdCmd cmd); + void createHouseholdMonthlyInputStatus(); } 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 106f375b..5061a6bf 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,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } workbook.close(); - return new ExcelUploadResultVO(sheet.getLastRowNum() , success, errorList); + + createHouseholdMapper.createHouseholdMonthlyInputStatus(); + return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); } // 셀 값을 문자열로 변환 @@ -147,7 +149,6 @@ 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 -> { @@ -210,7 +211,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut private Boolean getIsPanel(Cell cell){ if (cell == null) return null; String[] isPanel = cell.getStringCellValue().trim().split("\\."); - return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]); + if(isPanel.length == 1 ) return "1".equals(isPanel[0]) || "유지".equals(isPanel[0]); + if(isPanel.length == 2 ) return "1".equals(isPanel[0]) || "유지".equals(isPanel[1]); + return false; } private Long getResearcherSeq(Cell cell){ diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index fc94174b..879f1f77 100644 --- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -93,4 +93,8 @@ ) + + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/monthly/monthlys.html b/front/src/main/resources/templates/info/monthly/monthlys.html index 69478689..82c1c293 100644 --- a/front/src/main/resources/templates/info/monthly/monthlys.html +++ b/front/src/main/resources/templates/info/monthly/monthlys.html @@ -13,7 +13,8 @@