From 043881b72c7c18ce29d7227da149541a4fa18c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 8 Jul 2025 16:30:16 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20/=20=EC=A7=80?= =?UTF-8?q?=EB=A5=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/ExcelUploadCreateHouseholdDao.java | 12 ++++++++++-- .../adapters/web/model/ExcelCreateHouseholdVO.java | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) 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 68825df8..99d7f34b 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 @@ -82,7 +82,8 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목 household.setResearcherSeq(getResearcherSeq(row.getCell(12))); // 조사원 household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부 - household.setMemo(getCellValue(row.getCell(14))); // 비고 + household.setUsageType(getUsageType(row.getCell(14))); // 구분 + household.setMemo(getCellValue(row.getCell(15))); // 비고 CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd( null, @@ -102,7 +103,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.getIndustryDetail(), household.getResearcherSeq(), household.getIsPanel(), - null, + household.getUsageType(), null, household.getMemo(), List.of("ROLE_GENERAL") @@ -188,4 +189,11 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut return researcherMapper.selectResearcherId(cell.getStringCellValue()); } + private String getUsageType(Cell cell){ + if (cell == null) return "MOBILE"; + String usageType = cell.getStringCellValue().trim(); + if("모바일".equals(usageType) ) return "MOBILE"; + if("지류".equals(usageType) ) return "PAPER"; + return "MOBILE"; + } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java index fd3cef9b..d655fb8a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java @@ -24,5 +24,6 @@ public class ExcelCreateHouseholdVO { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private String usageType; private String memo; }