diff --git a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java index 27913667..abf4900b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/checkHouseholdNum/adapters/persistence/CheckHouseholdNumMapper.java @@ -9,4 +9,5 @@ import java.util.Optional; @Mapper public interface CheckHouseholdNumMapper { Optional checkHouseholdNum(CheckHouseholdNumCmd cmd); + Optional checkHouseholdNumExcel(CheckHouseholdNumCmd cmd); } 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 178cdd28..63a3b477 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 @@ -74,6 +74,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.time.LocalDate; +import java.time.YearMonth; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -134,13 +135,28 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut Row row = sheet.getRow(i); if (row == null) continue; - CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null); + CheckHouseholdNum checkHouseholdNum = null; + try { + checkHouseholdNum = checkHouseholdNumMapper + .checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))) + .orElse(null); + } catch (Exception e) { + System.out.println("❌ 예외 발생 위치: checkHouseholdNumMapper.checkHouseholdNum()"); + e.printStackTrace(); // 예외 전체 스택 트레이스 출력 + } + + ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3)); ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명 - household.setOwnerAge(getCellNumberValue(row.getCell(2))); // 연령 + if ("".equals(getCellValue(row.getCell(2)))) { // 연령 + household.setOwnerAge(99); + } else { + household.setOwnerAge(getCellNumberValue(row.getCell(2))); + } + //household.setOwnerAge(getCellNumberValue(row.getCell(2))); // 연령 household.setTel(contactVO.getTel()); // 가구 연락처 household.setPhone(contactVO.getPhone()); // 연락처 household.setEncodedPassword(passwordEncoder.encode(contactVO.getPhoneLast())); // 비밀번호 @@ -279,7 +295,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut month = getCellValue(row.getCell(2)); // 등록되어있는 임가번호인지 조회 - CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum( + CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNumExcel( new CheckHouseholdNumCmd(getCellValue(row.getCell(5)).toString()) ).orElse(null); @@ -492,9 +508,13 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut //'날' null check requireCellValue(row.getCell(7), 7, sheetRow); + //날/짜 오류인 경우 강제 변환 + int startDay = Integer.parseInt(getCellValue(row.getCell(7))); + int endDay = getEndDay(startDay); + String[] validDays = getValidStartEndDates(Integer.parseInt(month), startDay, endDay); //daily_record(일계부 일별 작성상태) 등록 - Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), getCellValue(row.getCell(7)), getCellValue(row.getCell(8))); + Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), validDays[0], validDays[1]); //코드값 매핑 AbstractMap.SimpleEntry unitCode = resolveUnit(unitCodeMap, getCellValue(row.getCell(16)), "code.record.unit"); @@ -609,8 +629,14 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut //'날' null check requireCellValue(row.getCell(7), 7, sheetRow); + + //날/짜 오류인 경우 강제 변환 + int startDay = Integer.parseInt(getCellValue(row.getCell(7))); + int endDay = getEndDay(startDay); + String[] validDays = getValidStartEndDates(Integer.parseInt(month), startDay, endDay); + //daily_record(일계부 일별 작성상태) 등록 - Long dailyRecordSeq = createDailyRecordFromExcel(getCellValue(row.getCell(2)), checkHouseholdNum.getHouseholdSeq(), getCellValue(row.getCell(7)), getCellValue(row.getCell(8))); + Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), validDays[0], validDays[1]); //코드값 매핑 AbstractMap.SimpleEntry unitCode = resolveUnit(unitCodeMap, getCellValue(row.getCell(16)), "code.record.unit"); @@ -696,8 +722,14 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut //'날' null check requireCellValue(row.getCell(7), 7, sheetRow); + + //날/짜 오류인 경우 강제 변환 + int startDay = Integer.parseInt(getCellValue(row.getCell(7))); + int endDay = getEndDay(startDay); + String[] validDays = getValidStartEndDates(Integer.parseInt(month), startDay, endDay); + //daily_record(일계부 일별 작성상태) 등록 - Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), getCellValue(row.getCell(7)), getCellValue(row.getCell(8))); + Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), validDays[0], validDays[1]); SaveDailyPowerExcelCmd dailyPowerCmd = new SaveDailyPowerExcelCmd( null, @@ -758,8 +790,14 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut //'날' null check requireCellValue(row.getCell(7), 7, sheetRow); + + //날/짜 오류인 경우 강제 변환 + int startDay = Integer.parseInt(getCellValue(row.getCell(7))); + int endDay = getEndDay(startDay); + String[] validDays = getValidStartEndDates(Integer.parseInt(month), startDay, endDay); + //daily_record(일계부 일별 작성상태) 등록 - Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), getCellValue(row.getCell(7)), getCellValue(row.getCell(8))); + Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), validDays[0], validDays[1]); //코드값 매핑 AbstractMap.SimpleEntry unitCode = resolveUnit(unitCodeMap, getCellValue(row.getCell(14)), "code.record.unit"); @@ -847,7 +885,13 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut tmpExcelEndDate = "31"; } - Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), tmpExcelStartDate, tmpExcelEndDate); + //날/짜 오류인 경우 강제 변환 + int startDay = Integer.parseInt(tmpExcelStartDate); + int endDay = Integer.parseInt(tmpExcelEndDate); + String[] validDays = getValidStartEndDates(Integer.parseInt(month), startDay, endDay); + + //daily_record(일계부 일별 작성상태) 등록 + Long dailyRecordSeq = createDailyRecordFromExcel(month, checkHouseholdNum.getHouseholdSeq(), validDays[0], validDays[1]); //코드값 매핑 AbstractMap.SimpleEntry unitCode = resolveUnit(unitCodeMap, getCellValue(row.getCell(14)), "code.record.unit"); @@ -895,7 +939,10 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } } else { - throw new IllegalArgumentException(sheetNum + "번 Sheet의 임가번호(" + householdNum + ")는 없습니다.\n임가를 먼저 등록해주세요."); + // ❗ 예외 발생 시 insert 메소드 호출 + updateMonthlyInputStatusMapper.createExcelUploadLog( + AuditUtil.update(new SaveExcelUploadLogCmd(originalFileName, getCellValue(row.getCell(2)), sheetNum + "번 Sheet의 임가번호(" + householdNum + ")는 없습니다. 임가를 먼저 등록해주세요.", null, loginUser))); + erroeCnt++; } } } @@ -1018,7 +1065,6 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut // 필수 필드 검사: 임가번호, 경영주명, 연령, 연락처(tel 또는 phone), 실사, 지역, 세부지역, 전체 주소 return household.getHouseholdNum() != null && !household.getHouseholdNum().isEmpty() && household.getOwnerName() != null && !household.getOwnerName().isEmpty() && - household.getOwnerAge() != null && (household.getTel() != null && !household.getTel().isEmpty() || household.getPhone() != null && !household.getPhone().isEmpty()) && household.getRegionMainCode() != null && !household.getRegionMainCode().isEmpty() && @@ -1248,4 +1294,110 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut throw new IllegalArgumentException(cellDescription + " 은(는) 문자열이어야 합니다. 현재 값: " + value); } } + + + /** + * 주어진 년월, 시작일, 종료일에 대해 유효한 시작일과 종료일을 반환하는 메소드 + * @param yearMonth 년월 (YYYYMM 형식) + * @param startDay 시작일 + * @param endDay 종료일 + * @return 유효한 시작일과 종료일을 String 형식으로 반환 + */ + public String[] getValidStartEndDates(int yearMonth, int startDay, int endDay) { + // 년월을 이용해 YearMonth 객체 생성 + int year = yearMonth / 100; + int month = yearMonth % 100; + YearMonth ym = YearMonth.of(year, month); + + // 월별 최대일 계산 + int maxDay = ym.lengthOfMonth(); // 해당 월의 최대 일자 (예: 31일, 28일 등) + + // 종료일이 해당 월의 최대일보다 크면 종료일을 월의 최대일로 조정 + if (endDay > maxDay) { + endDay = maxDay; + } + + // 2월에 대해 특별 처리 + if (month == 2) { + // 2월일 경우 시작일은 26일, 종료일은 27일로 설정 + startDay = 26; + endDay = 27; + } else { + // 2월 외의 경우, 31일이 없는 월은 28일/29일로 설정 + if (!ym.isValidDay(31)) { + startDay = 28; + endDay = 29; + } + } + + // 유효한 시작일과 종료일을 String 형식으로 반환 + return new String[]{String.valueOf(startDay), String.valueOf(endDay)}; + } + + /** + * 주어진 startDay에 대해 규칙에 맞는 endDay를 반환하는 메소드 + * @param startDay 시작일 + * @return 규칙에 맞는 종료일 + */ + public int getEndDay(int startDay) { + int endDay = 0; + + switch (startDay) { + case 1: + endDay = 2; + break; + case 3: + endDay = 4; + break; + case 5: + endDay = 6; + break; + case 7: + endDay = 7; + break; + case 8: + endDay = 9; + break; + case 10: + endDay = 11; + break; + case 12: + endDay = 13; + break; + case 14: + endDay = 14; + break; + case 15: + endDay = 16; + break; + case 17: + endDay = 18; + break; + case 19: + endDay = 20; + break; + case 21: + endDay = 21; + break; + case 22: + endDay = 23; + break; + case 24: + endDay = 25; + break; + case 26: + endDay = 27; + break; + case 28: + endDay = 29; + break; + case 30: + endDay = 31; + break; + default: + throw new IllegalArgumentException("Invalid startDay: " + startDay); + } + + return endDay; + } } \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml b/admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml index 545db6c1..133cf7fa 100644 --- a/admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml +++ b/admin/src/main/resources/mappers/household/CheckHouseholdNumMapper.xml @@ -3,11 +3,19 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - + + \ No newline at end of file