임가방문정보 방문 비율 추가
This commit is contained in:
@@ -54,6 +54,11 @@ public class ResearcherDao implements ResearcherPortOut {
|
|||||||
return new PageImpl<>(result, pageable, total);
|
return new PageImpl<>(result, pageable, total);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) {
|
||||||
|
return researcherMapper.selectVisitHouseholdPercentage(reqVO);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO) {
|
public Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO) {
|
||||||
List<ResearchersHouseholdVisitDto> result = researcherMapper.visitHouseholdList(reqVO);
|
List<ResearchersHouseholdVisitDto> result = researcherMapper.visitHouseholdList(reqVO);
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public interface ResearcherMapper {
|
|||||||
ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id);
|
ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id);
|
||||||
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
|
||||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||||
|
VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO);
|
||||||
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> selectIds,@Param("deletedBy") String deletedBy);
|
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> selectIds,@Param("deletedBy") String deletedBy);
|
||||||
void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy);
|
void deleteHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("deletedBy") String deletedBy);
|
||||||
Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy);
|
Integer insertHouseholdResearcherMapping(@Param("researcherSeq") Integer researcherSeq, @Param("householdSeq") Integer householdSeq, @Param("createdBy") String createdBy);
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package app.module.admin.usecase.researcher.adpaters.persistence.model;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class VisitHouseholdPercentageDto {
|
||||||
|
private Integer totalHouseholdCount;
|
||||||
|
private Integer firstVisitCount;
|
||||||
|
private Integer secondVisitCount;
|
||||||
|
private Integer giftSentCount;
|
||||||
|
private Double firstVisitPercentage;
|
||||||
|
private Double secondVisitPercentage;
|
||||||
|
private Double giftSentPercentage;
|
||||||
|
}
|
||||||
@@ -29,6 +29,11 @@ class ResearcherApiController {
|
|||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.mappingHouseholdList(reqVO));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping(path = "/visitHousehold/percentage")
|
||||||
|
ResponseEntity<?> selectVisitHouseholdPercentage( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.selectVisitHouseholdPercentage(reqVO));
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping(path = "/visitHousehold/list")
|
@GetMapping(path = "/visitHousehold/list")
|
||||||
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
ResponseEntity<?> visitHouseholdList( @ModelAttribute ResearchersDetailReqVO reqVO) {
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO));
|
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.visitHouseholdList(reqVO));
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ public interface ResearcherPortIn {
|
|||||||
ResearchersDto detail(Integer adminSeq);
|
ResearchersDto detail(Integer adminSeq);
|
||||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO);
|
||||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||||
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||||
Integer visitHouseholdDelete(List<Integer> selectIds);
|
Integer visitHouseholdDelete(List<Integer> selectIds);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ public interface ResearcherPortOut {
|
|||||||
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
|
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
|
||||||
ResearchersDto detail(Integer adminSeq);
|
ResearchersDto detail(Integer adminSeq);
|
||||||
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
|
VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO);
|
||||||
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
Page<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
|
||||||
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
|
||||||
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
ResearchersHouseholdVisitPopUpDto visitHouseholdDetail(Integer id);
|
||||||
|
|||||||
@@ -35,6 +35,11 @@ class ResearcherService implements ResearcherPortIn {
|
|||||||
return portOut.visitHouseholdList(reqVO);
|
return portOut.visitHouseholdList(reqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO) {
|
||||||
|
return portOut.selectVisitHouseholdPercentage(reqVO);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) {
|
public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) {
|
||||||
return portOut.updateVisitHousehold(reqVO);
|
return portOut.updateVisitHousehold(reqVO);
|
||||||
|
|||||||
@@ -121,9 +121,8 @@
|
|||||||
case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag,
|
case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag,
|
||||||
rhv.created_at
|
rhv.created_at
|
||||||
from household_visit rhv
|
from household_visit rhv
|
||||||
join researcher_has_household rhh on rhh.household_seq = rhv.household_seq
|
join household h on rhv.household_seq = h.seq
|
||||||
join household h on rhh.household_seq = h.seq
|
join researcher_has_household rhh on rhh.household_seq = h.seq and rhh.is_deleted = false
|
||||||
join admin a on a.seq = rhh.admin_seq
|
|
||||||
where rhv.is_deleted = false
|
where rhv.is_deleted = false
|
||||||
<if test="seq > 0">
|
<if test="seq > 0">
|
||||||
and rhh.admin_seq = #{seq}
|
and rhh.admin_seq = #{seq}
|
||||||
@@ -134,6 +133,66 @@
|
|||||||
LIMIT #{size} OFFSET #{page}*#{size}
|
LIMIT #{size} OFFSET #{page}*#{size}
|
||||||
</select>
|
</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 id="visitHouseholdListCountAll">
|
||||||
select count(*)
|
select count(*)
|
||||||
from household_visit rhv
|
from household_visit rhv
|
||||||
|
|||||||
@@ -97,6 +97,22 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="tab-content" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">
|
<div class="tab-content" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">
|
||||||
<div class="content-inner">
|
<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">
|
<section class="table-group">
|
||||||
<div class="table-tit-group">
|
<div class="table-tit-group">
|
||||||
<h3>총 <strong id="household-visit-totalElements"></strong>건</h3>
|
<h3>총 <strong id="household-visit-totalElements"></strong>건</h3>
|
||||||
@@ -108,24 +124,25 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<table>
|
|
||||||
<thead>
|
<table>
|
||||||
<tr>
|
<thead>
|
||||||
<th>
|
<tr>
|
||||||
<input onchange="toggleCheckbox(this);" type="checkbox"/>
|
<th>
|
||||||
</th>
|
<input onchange="toggleCheckbox(this);" type="checkbox"/>
|
||||||
<th>임가번호</th>
|
</th>
|
||||||
<th>경영주명</th>
|
<th>임가번호</th>
|
||||||
<th>방문일</th>
|
<th>경영주명</th>
|
||||||
<th>관리분야</th>
|
<th>방문일</th>
|
||||||
<th>내용</th>
|
<th>관리분야</th>
|
||||||
<th>작성일</th>
|
<th>내용</th>
|
||||||
<th>답례품 전달</th>
|
<th>작성일</th>
|
||||||
</tr>
|
<th>답례품 전달</th>
|
||||||
</thead>
|
</tr>
|
||||||
<tbody id="household-visit-list">
|
</thead>
|
||||||
</tbody>
|
<tbody id="household-visit-list">
|
||||||
</table>
|
</tbody>
|
||||||
|
</table>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -169,6 +186,7 @@
|
|||||||
if (!form.searchMonth.value) {
|
if (!form.searchMonth.value) {
|
||||||
form.searchMonth.value = '[[${currentMonth}]]'; // 기본값 복원
|
form.searchMonth.value = '[[${currentMonth}]]'; // 기본값 복원
|
||||||
}
|
}
|
||||||
|
getVisitHouseholdPercentage();
|
||||||
getHouseholdVisitList(0);
|
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 getHouseholdVisitList = (pageNo) => {
|
||||||
const f = document.householdReqForm;
|
const f = document.householdReqForm;
|
||||||
@@ -346,7 +393,7 @@
|
|||||||
JSON.stringify(selectIds),
|
JSON.stringify(selectIds),
|
||||||
function (response) {
|
function (response) {
|
||||||
if(response > 0){
|
if(response > 0){
|
||||||
alert('선택한 임가정보가 삭제되었습니다.');
|
alert('선택한 임가 방문 정보가 삭제되었습니다.');
|
||||||
getHouseholdVisitList(document.householdReqForm.page.value);
|
getHouseholdVisitList(document.householdReqForm.page.value);
|
||||||
} else {
|
} else {
|
||||||
alert('삭제에 실패했습니다.');
|
alert('삭제에 실패했습니다.');
|
||||||
|
|||||||
Reference in New Issue
Block a user