Merge branch 'kangsun' into 'dev'

[BO] 임가현황 - 검색 수정, 조사원현황 - 임가상세로 이동 처리

See merge request korea-research/korea-research!50
This commit is contained in:
이강선 매니저/ST
2025-06-26 02:20:02 +00:00
2 changed files with 18 additions and 5 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>

View File

@@ -42,6 +42,8 @@
</section>
<section>
<form autocomplete="off" method="get" name="householdReqForm" th:object="${reqVO}">
<input type="hidden" name="currentMonth" th:value="${currentMonth}">
<div class="component-tab" data-active="tab1">
<div class="tab-head">
<button type="button" class="tab-label" data-tab-value="tab1">담당 임가 목록</button>
@@ -218,8 +220,8 @@
tbody.append(
`
<tr data-id="${ct.seq}">
<td><a href="#">${ct.householdNum}</a></td>
<td>${ct.ownerName || '-'}</td>
<td><a href="/households/${ct.seq}?recordMonth=${f.currentMonth.value}">${ct.householdNum}</a></td>
<td><a href="/households/${ct.seq}?recordMonth=${f.currentMonth.value}">${ct.ownerName || '-'}</a></td>
<td>${ct.phone || '-'}</td>
<td>${ct.regionMainCodeName || '-'}</td>
<td>${ct.regionSubCodeName || '-'}</td>
@@ -231,7 +233,6 @@
`
);
});
// TODO 임가번호 OR 경영주명 선택시 임가현황 상세화면으로 이동
if (!$(response.content).length) {
tbody.append(`