From 063c9018e421f4ae8726f527b6568318f6533436 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 26 Jun 2025 11:19:36 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20-?= =?UTF-8?q?=20=EA=B2=80=EC=83=89=20=EC=88=98=EC=A0=95,=20=EC=A1=B0?= =?UTF-8?q?=EC=82=AC=EC=9B=90=ED=98=84=ED=99=A9=20-=20=EC=9E=84=EA=B0=80?= =?UTF-8?q?=EC=83=81=EC=84=B8=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../household/GetHouseholdsStatusMapper.xml | 16 ++++++++++++++-- .../resources/templates/researcher/detail.html | 7 ++++--- 2 files changed, 18 insertions(+), 5 deletions(-) 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(`