임가방문정보 방문 비율 추가
This commit is contained in:
@@ -121,9 +121,8 @@
|
||||
case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag,
|
||||
rhv.created_at
|
||||
from household_visit rhv
|
||||
join researcher_has_household rhh on rhh.household_seq = rhv.household_seq
|
||||
join household h on rhh.household_seq = h.seq
|
||||
join admin a on a.seq = rhh.admin_seq
|
||||
join household h on rhv.household_seq = h.seq
|
||||
join researcher_has_household rhh on rhh.household_seq = h.seq and rhh.is_deleted = false
|
||||
where rhv.is_deleted = false
|
||||
<if test="seq > 0">
|
||||
and rhh.admin_seq = #{seq}
|
||||
@@ -134,6 +133,66 @@
|
||||
LIMIT #{size} OFFSET #{page}*#{size}
|
||||
</select>
|
||||
|
||||
<select id="selectVisitHouseholdPercentage">
|
||||
with visit_ranking AS (
|
||||
select
|
||||
hv.household_seq,
|
||||
hv.visit_date,
|
||||
hv.is_gift_sent,
|
||||
ROW_NUMBER() OVER (PARTITION BY hv.household_seq ORDER BY hv.visit_date ASC) AS visit_rank
|
||||
from household_visit hv
|
||||
where TO_CHAR(hv.visit_date, 'YYYYMM') = #{searchMonth}
|
||||
and hv.is_deleted = FALSE
|
||||
),
|
||||
visit_counts AS (
|
||||
select
|
||||
COUNT(DISTINCT CASE WHEN vr.visit_rank = 1 THEN vr.household_seq END) AS first_visit_count,
|
||||
COUNT(DISTINCT CASE WHEN vr.visit_rank = 2 THEN vr.household_seq END) AS second_visit_count,
|
||||
COUNT(DISTINCT CASE WHEN vr.is_gift_sent = true THEN vr.household_seq END) AS gift_sent_count
|
||||
from researcher_has_household rhh
|
||||
left join visit_ranking vr ON rhh.household_seq = vr.household_seq
|
||||
where rhh.is_deleted = false
|
||||
and rhh.admin_seq = #{seq}
|
||||
),
|
||||
total_households AS (
|
||||
select COUNT(DISTINCT rhh.household_seq) AS total_household_count
|
||||
from researcher_has_household rhh
|
||||
where rhh.is_deleted = false
|
||||
AND rhh.admin_seq = #{seq}
|
||||
)
|
||||
SELECT
|
||||
th.total_household_count ,
|
||||
vc.first_visit_count,
|
||||
vc.second_visit_count,
|
||||
vc.gift_sent_count,
|
||||
ROUND(
|
||||
CASE
|
||||
WHEN th.total_household_count > 0
|
||||
THEN (vc.first_visit_count::NUMERIC / th.total_household_count) * 100
|
||||
ELSE 0
|
||||
END,
|
||||
2
|
||||
) AS first_visit_percentage,
|
||||
ROUND(
|
||||
CASE
|
||||
WHEN th.total_household_count > 0
|
||||
THEN (vc.second_visit_count::NUMERIC / th.total_household_count) * 100
|
||||
ELSE 0
|
||||
END,
|
||||
2
|
||||
) AS second_visit_percentage,
|
||||
ROUND(
|
||||
CASE
|
||||
WHEN th.total_household_count > 0
|
||||
THEN (vc.gift_sent_count::NUMERIC / th.total_household_count) * 100
|
||||
ELSE 0
|
||||
END,
|
||||
2
|
||||
) AS gift_sent_percentage
|
||||
FROM total_households th
|
||||
CROSS JOIN visit_counts vc
|
||||
</select>
|
||||
|
||||
<select id="visitHouseholdListCountAll">
|
||||
select count(*)
|
||||
from household_visit rhv
|
||||
|
||||
@@ -97,6 +97,22 @@
|
||||
</div>
|
||||
<div class="tab-content" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">
|
||||
<div class="content-inner">
|
||||
<article class="summary-area">
|
||||
<ul>
|
||||
<li>
|
||||
<p>당월 1차 방문</p>
|
||||
<span><strong id="firstVisitCount">6</strong>/<strong class="totalHouseholdCount">6</strong>(<strong id="firstVisitPercentage">6</strong>%)</span>
|
||||
</li>
|
||||
<li>
|
||||
<p>당월 2차 방문</p>
|
||||
<span><strong id="secondVisitCount">6</strong>/<strong class="totalHouseholdCount">6</strong>(<strong id="secondVisitPercentage">6</strong>%)</span>
|
||||
</li>
|
||||
<li>
|
||||
<p>답례품 전달</p>
|
||||
<span><strong id="giftSentCount">6</strong>/<strong class="totalHouseholdCount">6</strong>(<strong id="giftSentPercentage">6</strong>%)</span>
|
||||
</li>
|
||||
</ul>
|
||||
</article>
|
||||
<section class="table-group">
|
||||
<div class="table-tit-group">
|
||||
<h3>총 <strong id="household-visit-totalElements"></strong>건</h3>
|
||||
@@ -108,24 +124,25 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<input onchange="toggleCheckbox(this);" type="checkbox"/>
|
||||
</th>
|
||||
<th>임가번호</th>
|
||||
<th>경영주명</th>
|
||||
<th>방문일</th>
|
||||
<th>관리분야</th>
|
||||
<th>내용</th>
|
||||
<th>작성일</th>
|
||||
<th>답례품 전달</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="household-visit-list">
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<input onchange="toggleCheckbox(this);" type="checkbox"/>
|
||||
</th>
|
||||
<th>임가번호</th>
|
||||
<th>경영주명</th>
|
||||
<th>방문일</th>
|
||||
<th>관리분야</th>
|
||||
<th>내용</th>
|
||||
<th>작성일</th>
|
||||
<th>답례품 전달</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="household-visit-list">
|
||||
</tbody>
|
||||
</table>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
@@ -169,6 +186,7 @@
|
||||
if (!form.searchMonth.value) {
|
||||
form.searchMonth.value = '[[${currentMonth}]]'; // 기본값 복원
|
||||
}
|
||||
getVisitHouseholdPercentage();
|
||||
getHouseholdVisitList(0);
|
||||
}
|
||||
});
|
||||
@@ -241,6 +259,35 @@
|
||||
);
|
||||
}
|
||||
|
||||
// 임가 방문 퍼센트
|
||||
const getVisitHouseholdPercentage=()=>{
|
||||
const f = document.householdReqForm;
|
||||
|
||||
let dataObj = {
|
||||
seq: f.seq.value,
|
||||
searchMonth: f.searchMonth.value,
|
||||
};
|
||||
ajaxUtil._ajaxMethod(
|
||||
'/api/researcher/visitHousehold/percentage',
|
||||
dataObj,
|
||||
function (response) {
|
||||
$('#firstVisitCount').text(response.firstVisitCount);
|
||||
$('#secondVisitCount').text(response.secondVisitCount);
|
||||
$('#giftSentCount').text(response.giftSentCount);
|
||||
$('#firstVisitPercentage').text(response.firstVisitPercentage);
|
||||
$('#secondVisitPercentage').text(response.secondVisitPercentage);
|
||||
$('#giftSentPercentage').text(response.giftSentPercentage);
|
||||
$('.totalHouseholdCount').text(response.totalHouseholdCount);
|
||||
},
|
||||
function (code, rstData) {
|
||||
|
||||
},
|
||||
'get',
|
||||
'json',
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
// 임가 방문 정보
|
||||
const getHouseholdVisitList = (pageNo) => {
|
||||
const f = document.householdReqForm;
|
||||
@@ -346,7 +393,7 @@
|
||||
JSON.stringify(selectIds),
|
||||
function (response) {
|
||||
if(response > 0){
|
||||
alert('선택한 임가정보가 삭제되었습니다.');
|
||||
alert('선택한 임가 방문 정보가 삭제되었습니다.');
|
||||
getHouseholdVisitList(document.householdReqForm.page.value);
|
||||
} else {
|
||||
alert('삭제에 실패했습니다.');
|
||||
|
||||
Reference in New Issue
Block a user