Merge branch 'bo_fixes' into 'dev'

Bo fixes

See merge request korea-research/korea-research!104
This commit is contained in:
이강선 매니저/ST
2025-07-14 04:23:34 +00:00
4 changed files with 30 additions and 19 deletions

View File

@@ -52,8 +52,8 @@ class UpdateHouseholdController {
reqVO.getIndustryDetail(),
reqVO.getResearcherSeq(),
reqVO.getIsPanel(),
reqVO.getUsageType().name(),
reqVO.getEmploymentType().name(),
reqVO.getUsageType() != null ? reqVO.getUsageType().name() : null,
reqVO.getEmploymentType() != null ? reqVO.getEmploymentType().name() : null,
reqVO.getMemo()
)
);

View File

@@ -52,6 +52,11 @@ class UpdateHouseholdStatusUIController {
GetHouseholdStatus result =
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null);
String tel = StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel() : "";
String[] telParts = tel.split("-");
String phone = StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone() : "";
String[] phoneParts = phone.split("-");
if (result != null) {
model.addAttribute("householdInfo",
new UpdateHouseholdStatusUIResVO(
@@ -59,12 +64,12 @@ class UpdateHouseholdStatusUIController {
result.getHouseholdNum(),
result.getHouseholdName(),
result.getHouseholdAge(),
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[0] : "",
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[1] : "",
StringUtils.hasText(result.getHouseholdTel()) ? result.getHouseholdTel().split("-")[2] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[0] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[1] : "",
StringUtils.hasText(result.getHouseholdPhone()) ? result.getHouseholdPhone().split("-")[2] : "",
telParts.length > 0 ? telParts[0] : "",
telParts.length > 1 ? telParts[1] : "",
telParts.length > 2 ? telParts[2] : "",
phoneParts.length > 0 ? phoneParts[0] : "",
phoneParts.length > 1 ? phoneParts[1] : "",
phoneParts.length > 2 ? phoneParts[2] : "",
result.getRegionMainCode(),
result.getRegionSubCode(),
result.getRegionDetailCode(),