diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 7c7dff51..270c1f79 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -83,9 +83,15 @@ 1=1 - + /* 경영주 검색 */ + + AND ( + hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%' + OR hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%' + ) + AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%' @@ -95,9 +101,15 @@ - + /* 조사원 검색 */ + + AND ( + hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%' + OR hvr.researcherPhone ILIKE '%' || #{cmd.researcherValue} || '%' + ) + AND hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%' diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index c920931a..6c7a201f 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -42,6 +42,8 @@
+ +
@@ -218,8 +220,8 @@ tbody.append( ` - ${ct.householdNum} - ${ct.ownerName || '-'} + ${ct.householdNum} + ${ct.ownerName || '-'} ${ct.phone || '-'} ${ct.regionMainCodeName || '-'} ${ct.regionSubCodeName || '-'} @@ -231,7 +233,6 @@ ` ); }); - // TODO 임가번호 OR 경영주명 선택시 임가현황 상세화면으로 이동 if (!$(response.content).length) { tbody.append(`