From 2c2bfee88ea7cc96ae9e0825dd26dc63db15454f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 21 Jul 2025 12:22:45 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EC=82=B0=EB=AC=BC=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20class=EC=B6=94=EA=B0=80=20=EB=B0=8F=20fn=5Fmonthly?= =?UTF-8?q?=5Finput=5Fstatus=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/CreateHouseholdMapper.java | 1 + .../adapters/persistence/ExcelUploadCreateHouseholdDao.java | 6 +++++- .../resources/mappers/household/CreateHouseholdMapper.xml | 4 ++++ .../src/main/resources/templates/info/monthly/monthlys.html | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) 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 29156be3..8bf4c352 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,6 +131,8 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } workbook.close(); + + createHouseholdMapper.createHouseholdMonthlyInputStatus(); return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); } @@ -195,7 +197,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 @@