diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java index 2e46555c..0849dc7e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java @@ -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() ) ); diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index 667c3457..b053fb15 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -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(), diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 45390b05..4e078b48 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -31,16 +31,22 @@ ), visit_summary AS ( /* 임가별 1차임가방문, 2차임가방문, 답례품전달여부 */ - SELECT - rhh.household_seq, - MIN(v.visit_date) AS first_visit_date, - MAX(v.visit_date) AS second_visit_date, - BOOL_OR(v.is_gift_sent) AS is_gift_sent - FROM household_visit v - JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq - WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth} - AND rhh.is_deleted = false - GROUP BY rhh.household_seq + SELECT household_seq, + MAX(CASE WHEN rn = 1 THEN visit_date END) AS first_visit_date, + MAX(CASE WHEN rn = 2 THEN visit_date END) AS second_visit_date, + BOOL_OR(is_gift_sent) AS is_gift_sent + FROM ( + SELECT rhh.household_seq, + v.visit_date, + v.is_gift_sent, + ROW_NUMBER() OVER (PARTITION BY rhh.household_seq ORDER BY v.visit_date ASC) AS rn + FROM household_visit v + JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq + WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth} + AND rhh.is_deleted = false + ) sub + WHERE rn <= 2 + GROUP BY household_seq ) SELECT hvr.*, diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index fb8b9667..1d8dd70c 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -364,10 +364,10 @@ ${ct.regionDetailName} ${ifNullHyphen(ct.industryLargeName)} ${ifNullHyphen(ct.industryMiddleName)} + ${ct.progressPercent}% ${ifNullHyphen(ct.firstVisitDate)} ${ifNullHyphen(ct.secondVisitDate)} ${ct.isGiftSent ? "전달" : "미전달"} - ${ct.progressPercent}% ${ifNullHyphen(ct.researcherName)} ${ifNullHyphen(ct.researcherPhone)}