Merge branch 'kangsun' into 'dev'
[BO] 임가현황 - 검색 수정, 조사원현황 - 임가상세로 이동 처리 See merge request korea-research/korea-research!50
This commit is contained in:
@@ -83,9 +83,15 @@
|
|||||||
<where>
|
<where>
|
||||||
1=1
|
1=1
|
||||||
|
|
||||||
<if test="cmd.ownerField != null and cmd.ownerField != '' and cmd.ownerValue != ''">
|
<if test="cmd.ownerValue != null and cmd.ownerValue != ''">
|
||||||
/* 경영주 검색 */
|
/* 경영주 검색 */
|
||||||
<choose>
|
<choose>
|
||||||
|
<when test="cmd.ownerField == ''">
|
||||||
|
AND (
|
||||||
|
hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
|
||||||
|
OR hvr.householdPhone ILIKE '%' || #{cmd.ownerValue} || '%'
|
||||||
|
)
|
||||||
|
</when>
|
||||||
<when test="cmd.ownerField eq 'name'">
|
<when test="cmd.ownerField eq 'name'">
|
||||||
AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
|
AND hvr.householdName ILIKE '%' || #{cmd.ownerValue} || '%'
|
||||||
</when>
|
</when>
|
||||||
@@ -95,9 +101,15 @@
|
|||||||
</choose>
|
</choose>
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<if test="cmd.researcherField != null and cmd.researcherField != '' and cmd.researcherValue != ''">
|
<if test="cmd.researcherValue != null and cmd.researcherValue != ''">
|
||||||
/* 조사원 검색 */
|
/* 조사원 검색 */
|
||||||
<choose>
|
<choose>
|
||||||
|
<when test="cmd.researcherField == ''">
|
||||||
|
AND (
|
||||||
|
hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%'
|
||||||
|
OR hvr.researcherPhone ILIKE '%' || #{cmd.researcherValue} || '%'
|
||||||
|
)
|
||||||
|
</when>
|
||||||
<when test="cmd.researcherField eq 'name'">
|
<when test="cmd.researcherField eq 'name'">
|
||||||
AND hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%'
|
AND hvr.researcherName ILIKE '%' || #{cmd.researcherValue} || '%'
|
||||||
</when>
|
</when>
|
||||||
|
|||||||
@@ -42,6 +42,8 @@
|
|||||||
</section>
|
</section>
|
||||||
<section>
|
<section>
|
||||||
<form autocomplete="off" method="get" name="householdReqForm" th:object="${reqVO}">
|
<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="component-tab" data-active="tab1">
|
||||||
<div class="tab-head">
|
<div class="tab-head">
|
||||||
<button type="button" class="tab-label" data-tab-value="tab1">담당 임가 목록</button>
|
<button type="button" class="tab-label" data-tab-value="tab1">담당 임가 목록</button>
|
||||||
@@ -218,8 +220,8 @@
|
|||||||
tbody.append(
|
tbody.append(
|
||||||
`
|
`
|
||||||
<tr data-id="${ct.seq}">
|
<tr data-id="${ct.seq}">
|
||||||
<td><a href="#">${ct.householdNum}</a></td>
|
<td><a href="/households/${ct.seq}?recordMonth=${f.currentMonth.value}">${ct.householdNum}</a></td>
|
||||||
<td>${ct.ownerName || '-'}</td>
|
<td><a href="/households/${ct.seq}?recordMonth=${f.currentMonth.value}">${ct.ownerName || '-'}</a></td>
|
||||||
<td>${ct.phone || '-'}</td>
|
<td>${ct.phone || '-'}</td>
|
||||||
<td>${ct.regionMainCodeName || '-'}</td>
|
<td>${ct.regionMainCodeName || '-'}</td>
|
||||||
<td>${ct.regionSubCodeName || '-'}</td>
|
<td>${ct.regionSubCodeName || '-'}</td>
|
||||||
@@ -231,7 +233,6 @@
|
|||||||
`
|
`
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
// TODO 임가번호 OR 경영주명 선택시 임가현황 상세화면으로 이동
|
|
||||||
|
|
||||||
if (!$(response.content).length) {
|
if (!$(response.content).length) {
|
||||||
tbody.append(`
|
tbody.append(`
|
||||||
|
|||||||
Reference in New Issue
Block a user