엑셀 업로드 필수값 유효성 수정

This commit is contained in:
주수현
2025-07-21 14:21:27 +09:00
parent 2e6164cddc
commit 7f87ca4b33
2 changed files with 63 additions and 28 deletions

View File

@@ -60,6 +60,8 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
List<UICodeElement> IndustryMiddleCodeList = uiCodeListMapper.findByLikeId("code.industry.middle"); List<UICodeElement> IndustryMiddleCodeList = uiCodeListMapper.findByLikeId("code.industry.middle");
List<String> errorList = new ArrayList<>(); List<String> errorList = new ArrayList<>();
int flag = 0;
// 첫 번째 행은 헤더로 간주하고 스킵 // 첫 번째 행은 헤더로 간주하고 스킵
for (int i = 1; i <= sheet.getLastRowNum(); i++) { for (int i = 1; i <= sheet.getLastRowNum(); i++) {
Row row = sheet.getRow(i); Row row = sheet.getRow(i);
@@ -68,30 +70,29 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null); CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null);
ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3)); ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3));
if(checkHouseholdNum != null && !checkHouseholdNum.getIsDuplicated() && contactVO != null) { ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO();
int flag = 0; household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호
ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명
household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 household.setOwnerAge(getCellNumberValue(row.getCell(2))); // 연령
household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명 household.setTel(contactVO.getTel()); // 가구 연락처
household.setOwnerAge(getCellNumberValue(row.getCell(2))); // 연령 household.setPhone(contactVO.getPhone()); // 연락처
household.setTel(contactVO.getTel()); // 가구 연락처 household.setEncodedPassword(passwordEncoder.encode(contactVO.getPhoneLast())); // 비밀번호
household.setPhone(contactVO.getPhone()); // 연락처 household.setRegionMainCode(getUiCode(row.getCell(4),RegionMainCodeList,"code.region.main")); // 실사
household.setEncodedPassword(passwordEncoder.encode(contactVO.getPhoneLast())); // 비밀번호 household.setRegionSubCode(getUiCode(row.getCell(5),RegionSubCodeList,"code.region.sub")); // 지역
household.setRegionMainCode(getUiCode(row.getCell(4),RegionMainCodeList,"code.region.main")); // 실사 household.setRegionDetailCode(getUiCode(row.getCell(6),RegionDetailCodeList,"code.region.detail")); // 세부지역
household.setRegionSubCode(getUiCode(row.getCell(5),RegionSubCodeList,"code.region.sub")); // 지역 household.setAddress(getCellValue(row.getCell(7))); // 전체주소
household.setRegionDetailCode(getUiCode(row.getCell(6),RegionDetailCodeList,"code.region.detail")); // 세부지역 household.setIndustryLargeCode(getUiCode(row.getCell(8),IndustryLargeCodeList,"code.industry.large")); // 업종 대분류
household.setAddress(getCellValue(row.getCell(7))); // 전체주소 household.setIndustryMiddleCode(getUiCode(row.getCell(9),IndustryMiddleCodeList,"code.industry.middle")); // 업종 중분류
household.setIndustryLargeCode(getUiCode(row.getCell(8),IndustryLargeCodeList,"code.industry.large")); // 업종 대분류 household.setIndustrySubMiddle(getCellValue(row.getCell(10))); // 업종 중분류2
household.setIndustryMiddleCode(getUiCode(row.getCell(9),IndustryMiddleCodeList,"code.industry.middle")); // 업종 중분류 household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목
household.setIndustrySubMiddle(getCellValue(row.getCell(10))); // 업종 중분류2 household.setResearcherSeq(getResearcherSeq(row.getCell(12))); // 조사원
household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목 household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부
household.setResearcherSeq(getResearcherSeq(row.getCell(12))); // 조사원 household.setUsageType(getUsageType(row.getCell(14))); // 구분
household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부 household.setMemo(getCellValue(row.getCell(15))); // 비고
household.setUsageType(getUsageType(row.getCell(14))); // 구분
household.setMemo(getCellValue(row.getCell(15))); // 비고
if (isValidHousehold(household, checkHouseholdNum, contactVO)) {
CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd( CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd(
null, null,
household.getHouseholdNum(), household.getHouseholdNum(),
household.getOwnerName(), household.getOwnerName(),
household.getOwnerAge(), household.getOwnerAge(),
@@ -118,22 +119,38 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
success += flag; success += flag;
if(cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) { if (cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) {
createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds()))); createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds())));
} }
if(cmd.getResearcherSeq() != null) { if (cmd.getResearcherSeq() != null) {
createHouseholdMapper.createResearcherHasHousehold(AuditUtil.create(new CreateResearcherHasHouseholdCmd(cmd.getSeq(), cmd.getResearcherSeq()))); createHouseholdMapper.createResearcherHasHousehold(AuditUtil.create(new CreateResearcherHasHouseholdCmd(cmd.getSeq(), cmd.getResearcherSeq())));
} }
} else { } else {
errorList.add(getCellValue(row.getCell(0))); errorList.add(household.getHouseholdNum());
safeLogger.warn("[ EXCEL 누락 ] 임가번호={} 핸드폰번호={}", getCellValue(row.getCell(0)),getCellValue(row.getCell(3))); safeLogger.warn(
"[EXCEL 누락] 임가번호={} 필수 필드 누락: checkHouseholdNum={}, isDuplicated={}, contactVO={}, householdNum={}, ownerName={}, ownerAge={}, tel={}, phone={}, regionMainCode={}, regionSubCode={}, regionDetailCode={}, address={}",
household.getHouseholdNum(),
checkHouseholdNum != null,
checkHouseholdNum != null ? checkHouseholdNum.getIsDuplicated() : null,
contactVO != null?contactVO:null,
household.getHouseholdNum(),
household.getOwnerName(),
household.getOwnerAge(),
household.getTel(),
household.getPhone(),
household.getRegionMainCode(),
household.getRegionSubCode(),
household.getRegionDetailCode(),
household.getAddress()
);
} }
} }
workbook.close(); workbook.close();
createHouseholdMapper.createHouseholdMonthlyInputStatus(); createHouseholdMapper.createHouseholdMonthlyInputStatus();
return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); return new ExcelUploadResultVO(sheet.getLastRowNum() , success, errorList);
} }
// 셀 값을 문자열로 변환 // 셀 값을 문자열로 변환
@@ -228,4 +245,22 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
if("지류".equals(usageType) ) return "PAPER"; if("지류".equals(usageType) ) return "PAPER";
return "MOBILE"; return "MOBILE";
} }
private boolean isValidHousehold(ExcelCreateHouseholdVO household, CheckHouseholdNum checkHouseholdNum, ExcelUploadContactVO contactVO) {
// checkHouseholdNum과 contactVO 유효성 검사
if (checkHouseholdNum == null || checkHouseholdNum.getIsDuplicated() || contactVO == null) {
return false;
}
// 필수 필드 검사: 임가번호, 경영주명, 연령, 연락처(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() &&
household.getRegionSubCode() != null && !household.getRegionSubCode().isEmpty() &&
household.getRegionDetailCode() != null && !household.getRegionDetailCode().isEmpty() &&
household.getAddress() != null && !household.getAddress().isEmpty();
}
} }

View File

@@ -94,7 +94,7 @@
) )
</insert> </insert>
<select id="createHouseholdMonthlyInputStatus"> <select id="createHouseholdMonthlyInputStatus" resultType="java.lang.String">
select fn_monthly_input_status() select fn_monthly_input_status()
</select> </select>
</mapper> </mapper>