Merge remote-tracking branch 'origin/dev' into bo_daily

This commit is contained in:
김현주
2025-06-26 13:49:53 +09:00
17 changed files with 180 additions and 142 deletions

View File

@@ -83,9 +83,15 @@
<where>
1=1
<if test="cmd.ownerField != null and cmd.ownerField != '' and cmd.ownerValue != ''">
<if test="cmd.ownerValue != null and cmd.ownerValue != ''">
/* 경영주 검색 */
<choose>
<when test="cmd.ownerField == ''">
AND (
hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
OR hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%'
)
</when>
<when test="cmd.ownerField eq 'name'">
AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
</when>
@@ -95,9 +101,15 @@
</choose>
</if>
<if test="cmd.researcherField != null and cmd.researcherField != '' and cmd.researcherValue != ''">
<if test="cmd.researcherValue != null and cmd.researcherValue != ''">
/* 조사원 검색 */
<choose>
<when test="cmd.researcherField == ''">
AND (
hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%'
OR hvr.researcherPhone ILIKE '%' || #{cmd.researcherValue} || '%'
)
</when>
<when test="cmd.researcherField eq 'name'">
AND hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%'
</when>