세부 지역 엑셀 추가

This commit is contained in:
주수현
2025-07-30 16:44:41 +09:00
parent 5adbff0226
commit 3bb1e244b9
2 changed files with 49 additions and 109 deletions

View File

@@ -80,9 +80,10 @@ class ChartApiController {
List<List<String>> rows2 = new ArrayList<>();
for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) {
rows2.add(List.of(
StringUtils.defaultString(item.getRegionName()),
StringUtils.defaultString(item.getRegionDetailName()),
StringUtils.defaultString(item.getHouseholdCount()),
StringUtils.defaultString(item.getAvgCompletionRate()) + "%",
StringUtils.defaultString(item.getAvgCompletionRate()),
StringUtils.defaultString(item.getVisitCount()),
StringUtils.defaultString(item.getGiftSentCount())
));
@@ -91,7 +92,7 @@ class ChartApiController {
// 시트 2: 세부지역
ExcelSheetDto sheet2 = new ExcelSheetDto(
"세부지역",
List.of("세부지역", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"),
List.of("지역","세부지역", "할당 임가 수", "일계부 진행률(%)", "현장 방문 수", "답례품 전달 임가 수"),
rows2,
null,
Map.of(0, IndexedColors.LIGHT_YELLOW)

View File

@@ -117,7 +117,8 @@
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto">
/* selectRegionMainExcel : 대시보드 엑셀다운로드 (실사) */
SELECT
u.code_text AS region_name,
COALESCE(u.code_text, '전체') AS region_name,
COALESCE( detail_region.code_text,'-') AS region_detail_name,
COUNT(DISTINCT a.seq) AS researcher_count,
COUNT(DISTINCT rhh.household_seq) AS household_count,
CASE
@@ -125,8 +126,7 @@
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
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count
FROM uicode u
LEFT JOIN admin a
ON a.region_main_code = u.id
@@ -149,48 +149,16 @@
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
LEFT JOIN uicode detail_region
ON detail_region.id =h.region_detail_code
AND detail_region.is_deleted =false
WHERE u.parent_id = 'code.region.main' and u.is_deleted = false
<if test="'prod'.equals(activeProfiles)">
and u.in_use = true
</if>
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.current_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
AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
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' and u.is_deleted = false
<if test="'prod'.equals(activeProfiles)">
and u.in_use = true
</if>
ORDER BY order_no
GROUP BY ROLLUP(u.code_text, detail_region.code_text)
ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 0 ELSE 1 END,
MIN(u.order_no) NULLS LAST,detail_region.code_text
</select>
<select id="selectRegionDetailExcel"
@@ -198,74 +166,45 @@
/* selectRegionDetailExcel : 대시보드 엑셀다운로드 (세부지역) */
-- 세부 지역별 데이터
SELECT
detail_uicode.code_text AS region_detail_name,
parent_uicode.code_text AS region_name,
COALESCE(u.code_text, '전체') AS region_name,
COALESCE(detail_region.code_text, '-') AS region_detail_name,
COUNT(DISTINCT a.seq) AS researcher_count,
COUNT(DISTINCT rhh.household_seq) AS household_count,
CASE
WHEN AVG(v.current_completion_rate) > 0 THEN ROUND(AVG(v.current_completion_rate), 1)
WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0 THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 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 researcher_has_household rhh
ON rhh.household_seq = h.seq
AND rhh.is_deleted = false
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
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
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 rhh.household_seq) AS household_count,
COALESCE(ROUND(AVG(v.current_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 researcher_has_household rhh
ON rhh.household_seq = h.seq
AND rhh.is_deleted = false
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
AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
WHERE h.is_deleted = false AND h.is_panel = true
order by
region_order ASC,
region_detail_order ASC
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,
COALESCE(u.order_no, -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
AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
LEFT JOIN uicode detail_region
ON detail_region.id = h.region_detail_code
AND u.parent_id = 'code.region.detail'
AND detail_region.is_deleted = false
WHERE u.parent_id = 'code.region.main' AND u.is_deleted = false
GROUP BY ROLLUP((u.code_text, u.order_no, detail_region.code_text, detail_region.order_no))
ORDER BY COALESCE(u.order_no, -1), COALESCE(detail_region.order_no, 10) NULLS LAST
</select>
</mapper>