Merge branch 'bo_excel_download' into 'dev'

Bo excel download

See merge request korea-research/korea-research!93
This commit is contained in:
이강선 매니저/ST
2025-07-11 00:34:34 +00:00
41 changed files with 1182 additions and 777 deletions

View File

@@ -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>

View File

@@ -0,0 +1,153 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
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">
/* 엑셀 다운로드 - 임가 현황 (임가 목록) 조회 */
SELECT
vha.household_num
, vha.owner_name AS household_name
, vha.owner_age AS household_age
, vha.phone AS household_phone
, vha.region_main_code_text
, vha.region_sub_code_text
, vha.region_detail_code_text
, vha.address
, vha.industry_large_code_text
, vha.industry_middle_code_text
, vha.industry_sub_middle
, vha.industry_detail
, vha.researcher_name
, vha.researcher_phone
, 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
, vha.usage_type
, vha.is_panel
FROM v_household_all vha
LEFT OUTER JOIN v_household_visit_summary vhvs ON vha.seq = vhvs.household_seq and vhvs.visit_month = #{recordMonth}
LEFT OUTER JOIN v_monthly_completion_rate vmcr ON vha.seq = vmcr.household_seq and vmcr.record_month = #{recordMonth}
WHERE vha.seq IN
<foreach collection="householdSeqs" item="seq" open="(" separator="," close=")">
#{seq}
</foreach>
ORDER BY vha.household_num ASC
</select>
<select id="dailyRecords"
resultType="app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetDailyRecords">
/* 엑셀 다운로드 - 임가 현황 (02. 일계부 등록 현황) 조회 */
WITH data_counts AS (
SELECT
dr.id,
COUNT(DISTINCT di.id) AS income_cnt,
COUNT(DISTINCT dw.id) AS work_cnt,
COUNT(DISTINCT de.id) AS expense_cnt,
COUNT(DISTINCT dp.id) AS power_cnt,
COUNT(DISTINCT dfs.id) AS forestry_cnt,
COUNT(DISTINCT dfm.id) AS farming_cnt
FROM daily_record dr
LEFT JOIN daily_income di ON di.daily_record_seq = dr.id AND di.is_deleted = false
LEFT JOIN daily_work dw ON dw.daily_record_seq = dr.id AND dw.is_deleted = false
LEFT JOIN daily_expense de ON de.daily_record_seq = dr.id AND de.is_deleted = false
LEFT JOIN daily_power dp ON dp.daily_record_seq = dr.id AND dp.is_deleted = false
LEFT JOIN daily_forestry dfs ON dfs.daily_record_seq = dr.id AND dfs.is_deleted = false
LEFT JOIN daily_farming dfm ON dfm.daily_record_seq = dr.id AND dfm.is_deleted = false
WHERE dr.record_month = #{recordMonth}
AND dr.is_deleted = false
GROUP BY dr.id
),
month_check AS (
SELECT
#{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month,
EXTRACT(DAY FROM (TO_DATE(#{recordMonth}, 'YYYYMM') + INTERVAL '1 MONTH - 1 day')) AS month_last_day
)
SELECT
h.seq,
h.household_num,
h.owner_name,
h.owner_age,
h.phone AS householdPhone,
h.region_main_code_text,
h.region_sub_code_text,
h.region_detail_code_text,
h.researcher_name,
h.researcher_phone,
ddg.group_no AS day_group_no,
ddg.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)
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_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,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status,
fn_get_farming_status(
ddg.start_day,
dr.record_month,
mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE),
dr.farming_status,
dc.farming_cnt
) AS farming_status
FROM v_household_all h
CROSS JOIN daily_day_group ddg
CROSS JOIN month_check mc
LEFT JOIN daily_record dr ON dr.day_group_no = ddg.group_no
AND dr.household_seq = h.seq
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
LEFT JOIN data_counts dc ON dc.id = dr.id
WHERE ddg.start_day &lt;= mc.month_last_day
AND h.seq IN
<foreach collection="householdSeqs" item="seq" open="(" separator="," close=")">
#{seq}
</foreach>
ORDER by h.household_num, ddg.start_day
</select>
<select id="visitInfos"
resultType="app.module.admin.usecase.household.excelDownload.getHouseholdsExcel.ports.application.domain.GetVisitInfos">
/* 엑셀 다운로드 - 임가 현황 (03. 임가방문정보) 조회 */
SELECT household_num,
owner_name,
owner_age,
phone AS household_phone,
region_main_code_text,
region_sub_code_text,
region_detail_code_text,
researcher_name,
researcher_phone,
visit_date,
management_type,
content,
is_gift_sent,
updated_by,
TO_CHAR(created_at, 'YYYY-MM-DD HH24:MI') AS created_at
FROM v_household_all_visit
WHERE visit_month = #{recordMonth}
AND seq IN
<foreach collection="householdSeqs" item="seq" open="(" separator="," close=")">
#{seq}
</foreach>
ORDER BY household_num
</select>
</mapper>

File diff suppressed because one or more lines are too long

View File

@@ -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>

View File

@@ -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,21 +485,6 @@
}
</script>
<script>
// 엑셀 다운로드
const goExcel = () => {
const url = '/api/households/excel';
const f = document.reqForm;
const data = $(f).serializeObject();
if (url !== '') {
excelDownload(url, data);
} else {
console.warn('엑셀 다운르도 경로 없음.');
}
}
</script>
<script>
// 체크박스 전체 선택
document.getElementById('checkedAll').addEventListener('change', function () {

View File

@@ -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>

View File

@@ -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">
임가 등록 엑셀업로드

View File

@@ -603,7 +603,7 @@
$('#expenseCount').text(data.length);
if(data.length === 0) {
noDataDaily(tbody, status, 9);
noDataDaily(tbody, status, 10);
return;
}

View File

@@ -158,26 +158,12 @@
</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>
</div>
</section>
@@ -428,36 +414,6 @@
}
}
</script>
<script>
// 엑셀 다운로드
const goExcel = (el) => {
let url = '';
if (el.dataset.tabValue === 'tab1') {
url = $('.tab-content .daily-record-list').is(':hidden') ? '/api/household/dailyRecordStatus/excel' : '/api/household/dailyRecordsStatus/excel';
} else if (el.dataset.tabValue === 'tab2') {
url = $('.tab-content .forest-product').is(':hidden') ? '' : '/api/household/forestProduct/excel';
} else if (el.dataset.tabValue === 'tab3') {
url = $('.tab-content .bank-auto-transfer').is(':hidden') ? '' : '/api/household/bankAutoTransfer/excel';
} else if (el.dataset.tabValue === 'tab4') {
url = $('.tab-content .household-visit').is(':hidden') ? '' : '/api/household/visitInfos/excel';
}
console.log('goExcel', el.dataset.tabValue, url);
const f = document.reqForm;
const data = $(f).serializeObject();
// size 를 제거하면 전체 목록을 가져온다.
delete data.size;
if (url !== '') {
location.href = url + '?' + new URLSearchParams(data).toString();
} else {
console.warn('엑셀 다운르도 경로 없음.')
}
}
</script>
</section>
</html>

View File

@@ -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>
@@ -355,31 +350,6 @@
);
}
function goExcel() {
const selectedTab = document.querySelector('.tab-label[aria-selected="true"]');
let url = '';
if (selectedTab.dataset.tabValue === 'tab1') {
url = '/api/researcher/mappingHouseholdList/excel';
} else if (selectedTab.dataset.tabValue === 'tab2') {
url = '/api/researcher/visitHousehold/list/excel';
}
const f = document.householdReqForm;
f.isPaging.value = false;
const data = $(f).serializeObject();
// size 를 제거하면 전체 목록을 가져온다.
delete data.size;
if (url !== '') {
location.href = url + '?' + new URLSearchParams(data).toString();
} else {
console.warn('엑셀 다운르도 경로 없음.')
}
}
// 체크박스 선택/해제
function toggleCheckbox(oj) {
$('input[name=selectIds]').prop("checked", oj.checked);