[BO] 임가현황 - 엑셀 다운로드 작업 중 (3)
This commit is contained in:
@@ -103,4 +103,144 @@
|
||||
</if>
|
||||
GROUP BY a.seq,u.id
|
||||
</select>
|
||||
|
||||
<select id="selectRegionMainExcel"
|
||||
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto">
|
||||
/* selectRegionMainExcel : 대시보드 엑셀다운로드 (실사) */
|
||||
SELECT
|
||||
u.code_text AS region_name,
|
||||
COUNT(DISTINCT a.seq) AS researcher_count,
|
||||
COUNT(DISTINCT rhh.household_seq) AS household_count,
|
||||
CASE
|
||||
WHEN COALESCE(AVG(v.completion_rate), 0) > 0 THEN ROUND(COALESCE(AVG(v.completion_rate), 0), 1)
|
||||
ELSE 0
|
||||
END AS avg_completion_rate,
|
||||
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS visit_count,
|
||||
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count,
|
||||
u.order_no
|
||||
FROM uicode u
|
||||
LEFT JOIN admin a
|
||||
ON a.region_main_code = u.id
|
||||
AND a.is_deleted = false
|
||||
LEFT JOIN admin_has_role ahr
|
||||
ON a.seq = ahr.admin_seq
|
||||
AND ahr.is_deleted = false
|
||||
AND ahr.role_id = 'ROLE_RESEARCHER'
|
||||
LEFT JOIN researcher_has_household rhh
|
||||
ON rhh.admin_seq = a.seq
|
||||
AND rhh.is_deleted = false
|
||||
LEFT JOIN household h
|
||||
ON h.seq = rhh.household_seq
|
||||
AND h.is_deleted = false
|
||||
AND h.is_panel = true
|
||||
LEFT JOIN household_visit hv
|
||||
ON hv.household_seq = h.seq
|
||||
AND hv.is_deleted = false
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
WHERE u.parent_id = 'code.region.main'
|
||||
GROUP BY u.code_text, u.order_no
|
||||
UNION ALL
|
||||
-- 전체 합계 행
|
||||
SELECT
|
||||
'전체' AS region_name,
|
||||
COUNT(DISTINCT a.seq),
|
||||
COUNT(DISTINCT rhh.household_seq),
|
||||
COALESCE(ROUND(AVG(v.completion_rate), 1), 0),
|
||||
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END),
|
||||
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END),
|
||||
-1 as order_no
|
||||
FROM uicode u
|
||||
LEFT JOIN admin a
|
||||
ON a.region_main_code = u.id
|
||||
AND a.is_deleted = false
|
||||
LEFT JOIN admin_has_role ahr
|
||||
ON a.seq = ahr.admin_seq
|
||||
AND ahr.is_deleted = false
|
||||
AND ahr.role_id = 'ROLE_RESEARCHER'
|
||||
LEFT JOIN researcher_has_household rhh
|
||||
ON rhh.admin_seq = a.seq
|
||||
AND rhh.is_deleted = false
|
||||
LEFT JOIN household h
|
||||
ON h.seq = rhh.household_seq
|
||||
AND h.is_deleted = false
|
||||
AND h.is_panel = true
|
||||
LEFT JOIN household_visit hv
|
||||
ON hv.household_seq = h.seq
|
||||
AND hv.is_deleted = false
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
WHERE u.parent_id = 'code.region.main'
|
||||
ORDER BY order_no
|
||||
</select>
|
||||
|
||||
<select id="selectRegionDetailExcel"
|
||||
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto">
|
||||
/* selectRegionDetailExcel : 대시보드 엑셀다운로드 (세부지역) */
|
||||
-- 세부 지역별 데이터
|
||||
SELECT
|
||||
detail_uicode.code_text AS region_detail_name,
|
||||
parent_uicode.code_text AS region_name,
|
||||
COUNT(DISTINCT h.seq) AS household_count,
|
||||
CASE
|
||||
WHEN AVG(v.completion_rate) > 0 THEN ROUND(AVG(v.completion_rate), 1)
|
||||
ELSE 0
|
||||
END AS avg_completion_rate,
|
||||
COUNT(DISTINCT hv_visit.household_seq) AS visit_count,
|
||||
COUNT(DISTINCT hv_gift.household_seq) AS gift_sent_count,
|
||||
parent_uicode.order_no AS region_order,
|
||||
detail_uicode.order_no AS region_detail_order
|
||||
FROM uicode detail_uicode
|
||||
LEFT JOIN uicode parent_uicode ON parent_uicode.id = detail_uicode.parent_id
|
||||
LEFT JOIN household h
|
||||
ON h.region_detail_code = detail_uicode.id
|
||||
AND h.is_deleted = false
|
||||
AND h.is_panel = true
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_visit
|
||||
ON hv_visit.household_seq = h.seq
|
||||
AND hv_visit.is_deleted = false
|
||||
AND TO_CHAR(hv_visit.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_gift
|
||||
ON hv_gift.household_seq = h.seq
|
||||
AND hv_gift.is_deleted = false
|
||||
AND hv_gift.is_gift_sent = true
|
||||
WHERE detail_uicode.id LIKE 'code.region.detail.%'
|
||||
GROUP BY
|
||||
detail_uicode.code_text,
|
||||
parent_uicode.code_text,
|
||||
parent_uicode.order_no,
|
||||
detail_uicode.order_no
|
||||
UNION ALL
|
||||
-- 전체 합계 행
|
||||
SELECT
|
||||
'전체' AS region_detail_name,
|
||||
'전체' AS region_name,
|
||||
COUNT(DISTINCT h.seq) AS household_count,
|
||||
COALESCE(ROUND(AVG(v.completion_rate), 1), 0),
|
||||
COUNT(DISTINCT hv_visit.household_seq),
|
||||
COUNT(DISTINCT hv_gift.household_seq),
|
||||
-1 AS region_order,
|
||||
-1 AS region_detail_order
|
||||
FROM household h
|
||||
LEFT JOIN v_monthly_completion_rate v
|
||||
ON v.household_seq = h.seq
|
||||
AND v.record_month = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_visit
|
||||
ON hv_visit.household_seq = h.seq
|
||||
AND hv_visit.is_deleted = false
|
||||
AND TO_CHAR(hv_visit.visit_date, 'YYYYMM') = #{recordMonth}
|
||||
LEFT JOIN household_visit hv_gift
|
||||
ON hv_gift.household_seq = h.seq
|
||||
AND hv_gift.is_deleted = false
|
||||
AND hv_gift.is_gift_sent = true
|
||||
WHERE h.is_deleted = false AND h.is_panel = true
|
||||
order by
|
||||
region_order ASC,
|
||||
region_detail_order ASC
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -5,7 +5,7 @@
|
||||
namespace="app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.adapters.persistence.GetHouseholdsExcelMapper">
|
||||
<select id="households"
|
||||
resultType="app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetHouseholds">
|
||||
/* 엑셀 다운로드 - 임가 현황 (01. 임가 목록) 조회 */
|
||||
/* 엑셀 다운로드 - 임가 현황 (임가 목록) 조회 */
|
||||
SELECT
|
||||
vha.household_num
|
||||
, vha.owner_name AS household_name
|
||||
@@ -21,7 +21,10 @@
|
||||
, vha.industry_detail
|
||||
, vha.researcher_name
|
||||
, vha.researcher_phone
|
||||
, vmcr.completion_rate
|
||||
, CASE
|
||||
WHEN vmcr.completion_rate = 0 THEN 0
|
||||
ELSE ROUND(vmcr.completion_rate, 1)
|
||||
END AS completion_rate
|
||||
, vhvs.first_visit_date
|
||||
, vhvs.second_visit_date
|
||||
, CASE WHEN vhvs.gift_send = true THEN '전달' ELSE '' END AS gift_send
|
||||
@@ -70,7 +73,7 @@
|
||||
h.household_num,
|
||||
h.owner_name,
|
||||
h.owner_age,
|
||||
h.phone,
|
||||
h.phone AS householdPhone,
|
||||
h.region_main_code_text,
|
||||
h.region_sub_code_text,
|
||||
h.region_detail_code_text,
|
||||
@@ -82,12 +85,17 @@
|
||||
WHEN ddg.start_day = LEAST(ddg.end_day, mc.month_last_day) THEN ''
|
||||
ELSE '-' || LEAST(ddg.end_day, mc.month_last_day)
|
||||
END AS day_group,
|
||||
ddg.start_day AS start_day,
|
||||
CASE
|
||||
WHEN ddg.start_day = LEAST(ddg.end_day, mc.month_last_day) THEN ''
|
||||
ELSE LEAST(ddg.end_day, mc.month_last_day)::TEXT
|
||||
END AS end_day,
|
||||
CASE
|
||||
WHEN mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING'
|
||||
WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE'
|
||||
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE'
|
||||
ELSE 'EMPTY'
|
||||
END AS all_status,
|
||||
END AS all_status_type,
|
||||
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status,
|
||||
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status,
|
||||
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status,
|
||||
@@ -133,7 +141,7 @@
|
||||
content,
|
||||
is_gift_sent,
|
||||
updated_by,
|
||||
created_at
|
||||
TO_CHAR(created_at, 'YYYY-MM-DD HH24:MI') AS created_at
|
||||
FROM v_household_all_visit
|
||||
WHERE visit_month = #{recordMonth}
|
||||
AND seq IN
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -136,6 +136,15 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<div class="btns-col-2">
|
||||
<button type="button" class="btn" onclick="goExcel();">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<div class="component-input sms-check" th:if="${loginUserRoles.id == 'ROLE_ADMIN'}">
|
||||
<label class="switch-inner">
|
||||
@@ -446,6 +455,11 @@
|
||||
{ handle422Type: 'alert' }
|
||||
);
|
||||
}
|
||||
|
||||
// 엑셀 다운로드
|
||||
const goExcel = () => {
|
||||
excelDownload('/api/dashboard/chart/excel', null);
|
||||
}
|
||||
</script>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -275,7 +275,7 @@
|
||||
<button type="button" class="btn" onclick="showExcelHouseholdModal();">
|
||||
<span class="btn-txt">엑셀 업로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
<button type="button" class="btn" onclick="goExcel();">
|
||||
<button type="button" class="btn" onclick="showExcelDownloadModal();">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
<!-- 관리자만 노출 -->
|
||||
@@ -294,6 +294,7 @@
|
||||
|
||||
<div th:replace="common/modal-researcher-mapping :: modalFragment"></div>
|
||||
<div th:replace="households/modal/modal-excel-household :: modalFragment"></div>
|
||||
<div th:replace="households/modal/modal-excel-download :: modalFragment"></div>
|
||||
</section>
|
||||
|
||||
<section layout:fragment="script">
|
||||
@@ -484,24 +485,6 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// 엑셀 다운로드
|
||||
const goExcel = () => {
|
||||
const url = '/api/excel/household';
|
||||
const f = document.reqForm;
|
||||
const data = $(f).serializeObject();
|
||||
|
||||
// 선택된 엑셀 템플릿 파일 항목
|
||||
data.templateType = '';
|
||||
|
||||
if (url !== '') {
|
||||
excelDownload(url, data);
|
||||
} else {
|
||||
console.warn('엑셀 다운르도 경로 없음.');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<script>
|
||||
// 체크박스 전체 선택
|
||||
document.getElementById('checkedAll').addEventListener('change', function () {
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
|
||||
layout:decorate="~{layout/layout}">
|
||||
|
||||
<div class="layer-wrap" th:fragment="modalFragment">
|
||||
<div class="component-modal mypage-wrap modal01 modal-excel-download" data-props-dimm-click="true" data-state="close">
|
||||
<div class="modal-dimm"></div>
|
||||
<div class="modal-frame">
|
||||
<div class="modal-container type-small">
|
||||
<div class="modal-header">
|
||||
<h3 class="modal-tit">
|
||||
엑셀 다운로드
|
||||
</h3>
|
||||
</div>
|
||||
<div class="modal-content">
|
||||
<div class="modal-content-inner">
|
||||
<div class="form-area">
|
||||
<!-- 파일선택 -->
|
||||
<div class="input-group">
|
||||
<div class="input-label">
|
||||
<p class="label-txt">
|
||||
파일선택
|
||||
</p>
|
||||
</div>
|
||||
<div class="component-select">
|
||||
<select class="select-list" name="templateType" required>
|
||||
<option value="" disabled hidden selected>선택</option>
|
||||
<option value="HOUSEHOLD">임가목록</option>
|
||||
<option value="DAILY_STATUS">일계부 등록 현황</option>
|
||||
<option value="VISIT">임가방문정보</option>
|
||||
<option value="DAILY_RECORD">일계부 등록 데이터</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn btn-primary" onclick="goExcel();">
|
||||
<span class="btn-txt">다운로드</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<button class="modal-close"></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// 엑셀 다운로드 팝업 띄우기
|
||||
const showExcelDownloadModal= () => {
|
||||
document.querySelector(".modal-excel-download").ui.open();
|
||||
}
|
||||
|
||||
// 엑셀 다운로드
|
||||
const goExcel = () => {
|
||||
const templateType = $('select[name=templateType]').val();
|
||||
console.log("templateType", templateType);
|
||||
const url = '/api/excel/household';
|
||||
const f = document.reqForm;
|
||||
const data = $(f).serializeObject();
|
||||
|
||||
if(templateType === null) {
|
||||
alert('파일을 선택해주세요.');
|
||||
return;
|
||||
}
|
||||
|
||||
// 선택된 엑셀 템플릿 파일 항목
|
||||
data.templateType = templateType;
|
||||
|
||||
if (url !== '') {
|
||||
excelDownload(url, data);
|
||||
} else {
|
||||
console.warn('엑셀 다운르도 경로 없음.');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</div>
|
||||
</html>
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="component-modal mypage-wrap modal01 modal-excel-household" data-props-dimm-click="true" data-state="close">
|
||||
<div class="modal-dimm"></div>
|
||||
<div class="modal-frame">
|
||||
<div class="modal-container">
|
||||
<div class="modal-container type-small">
|
||||
<div class="modal-header">
|
||||
<h3 class="modal-tit">
|
||||
임가 등록 엑셀업로드
|
||||
|
||||
@@ -603,7 +603,7 @@
|
||||
|
||||
$('#expenseCount').text(data.length);
|
||||
if(data.length === 0) {
|
||||
noDataDaily(tbody, status, 9);
|
||||
noDataDaily(tbody, status, 10);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -158,26 +158,26 @@
|
||||
</div>
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row two-col">
|
||||
<div class="btns-row align-right">
|
||||
<div class="btns-col-1">
|
||||
<button type="button" class="btn" onclick="location.href='/households'">
|
||||
<span class="btn-txt">목록</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="btns-col-2 align-right _excelDownload" th:unless="${activeProfile != 'local'}">
|
||||
<button type="button" class="btn" data-tab-type="daily-record" data-tab-value="tab1" onclick="goExcel(this)">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
<button type="button" class="btn" data-tab-type="forest-product" data-tab-value="tab2" onclick="goExcel(this)">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
<button type="button" class="btn" data-tab-type="bank-auto-transfer" data-tab-value="tab3" onclick="goExcel(this)">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
<button type="button" class="btn" data-tab-type="household-visit" data-tab-value="tab4" onclick="goExcel(this)">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
<!-- <div class="btns-col-2 align-right _excelDownload" th:unless="${activeProfile != 'local'}">-->
|
||||
<!-- <button type="button" class="btn" data-tab-type="daily-record" data-tab-value="tab1" onclick="goExcel(this)">-->
|
||||
<!-- <span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>-->
|
||||
<!-- </button>-->
|
||||
<!-- <button type="button" class="btn" data-tab-type="forest-product" data-tab-value="tab2" onclick="goExcel(this)">-->
|
||||
<!-- <span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>-->
|
||||
<!-- </button>-->
|
||||
<!-- <button type="button" class="btn" data-tab-type="bank-auto-transfer" data-tab-value="tab3" onclick="goExcel(this)">-->
|
||||
<!-- <span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>-->
|
||||
<!-- </button>-->
|
||||
<!-- <button type="button" class="btn" data-tab-type="household-visit" data-tab-value="tab4" onclick="goExcel(this)">-->
|
||||
<!-- <span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>-->
|
||||
<!-- </button>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -161,17 +161,12 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row two-col">
|
||||
<div class="btns-row align-right">
|
||||
<div class="btns-col-1">
|
||||
<button type="button" class="btn" onclick="location.href='/researcher/researchers'">
|
||||
<span class="btn-txt">목록</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="btns-col-2 align-right" th:unless="${activeProfile != 'local'}">
|
||||
<button type="button" class="btn" onclick="goExcel();">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user