[BO] 대시보드 엑셀다운로드 쿼리 수정

This commit is contained in:
kangsunlee
2025-07-31 13:59:54 +09:00
parent 3bb1e244b9
commit c6de18850b
3 changed files with 161 additions and 72 deletions

View File

@@ -4,12 +4,10 @@ import lombok.Data;
@Data
public class RegionDetailExcelDto {
private String regionMainName;
private String regionDetailName;
private String regionName;
private String householdCount;
private String avgCompletionRate;
private String visitCount;
private String giftSentCount;
private String regionOrder;
private String regionDetailOrder;
}

View File

@@ -1,12 +1,18 @@
package app.module.admin.usecase.dashboard.chart.adapters.web;
import app.module.admin.config.application.util.DateUiUtil;
import app.module.admin.config.application.util.ExcelWriterUtil;
import app.module.admin.config.application.util.model.ExcelSheetDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.DashboardExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto;
import app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto;
import app.module.admin.usecase.dashboard.chart.ports.ChartPortIn;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -20,14 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j
@RestController
@RequiredArgsConstructor
@@ -62,7 +60,7 @@ class ChartApiController {
StringUtils.defaultString(item.getRegionName()),
StringUtils.defaultString(item.getResearcherCount()),
StringUtils.defaultString(item.getHouseholdCount()),
StringUtils.defaultString(item.getAvgCompletionRate()) + "%",
StringUtils.defaultString(item.getAvgCompletionRate()),
StringUtils.defaultString(item.getVisitCount()),
StringUtils.defaultString(item.getGiftSentCount())
));
@@ -71,7 +69,7 @@ class ChartApiController {
// 시트 1: 실사
ExcelSheetDto sheet1 = new ExcelSheetDto(
"실사",
List.of("실사", "할당 조사원 수", "할당 임가 수", "일계부 진행률", "현장 방문 수", "답례품 전달 임가 수"),
List.of("실사", "할당 조사원 수", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"),
rows1,
null,
Map.of(0, IndexedColors.LIGHT_YELLOW)
@@ -80,7 +78,7 @@ class ChartApiController {
List<List<String>> rows2 = new ArrayList<>();
for (RegionDetailExcelDto item : dashboardExcel.getRegionDetail()) {
rows2.add(List.of(
StringUtils.defaultString(item.getRegionName()),
StringUtils.defaultString(item.getRegionMainName()),
StringUtils.defaultString(item.getRegionDetailName()),
StringUtils.defaultString(item.getHouseholdCount()),
StringUtils.defaultString(item.getAvgCompletionRate()),
@@ -92,7 +90,7 @@ class ChartApiController {
// 시트 2: 세부지역
ExcelSheetDto sheet2 = new ExcelSheetDto(
"세부지역",
List.of("지역","세부지역", "할당 임가 수", "일계부 진행률(%)", "현장 방문 수", "답례품 전달 임가 수"),
List.of("실사", "세부지역", "할당 임가 수", "당월 일계부 현황(%)", "현장 방문 수", "답례품 전달 임가 수"),
rows2,
null,
Map.of(0, IndexedColors.LIGHT_YELLOW)

View File

@@ -116,18 +116,29 @@
<select id="selectRegionMainExcel"
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionMainExcelDto">
/* selectRegionMainExcel : 대시보드 엑셀다운로드 (실사) */
WITH filtered_uicode AS (
SELECT *
FROM uicode
WHERE parent_id = 'code.region.main'
AND is_deleted = false
<if test="'prod'.equals(activeProfiles)">
AND u.in_use = true
</if>
)
-- 전체 합계
SELECT
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,
'전체' AS region_name,
COUNT(DISTINCT ahr.admin_seq) AS researcher_count,
COUNT(DISTINCT h.seq) AS household_count,
CASE
WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0 THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 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 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
FROM uicode u
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS gift_sent_count,
-1 AS sort_order
FROM filtered_uicode u
LEFT JOIN admin a
ON a.region_main_code = u.id
AND a.is_deleted = false
@@ -139,7 +150,7 @@
ON rhh.admin_seq = a.seq
AND rhh.is_deleted = false
LEFT JOIN household h
ON h.seq = rhh.household_seq
ON u.id = h.region_main_code
AND h.is_deleted = false
AND h.is_panel = true
LEFT JOIN household_visit hv
@@ -149,62 +160,144 @@
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 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
WHERE u.parent_id = 'code.region.main' AND u.is_deleted = false
UNION ALL
-- 지역별 집계
SELECT
u.code_text AS region_name,
COUNT(DISTINCT ahr.admin_seq) AS researcher_count,
COUNT(DISTINCT h.seq) AS household_count,
CASE
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 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 AS sort_order
FROM filtered_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 u.id = h.region_main_code
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
GROUP BY u.id, u.code_text, u.order_no
ORDER BY sort_order
</select>
<select id="selectRegionDetailExcel"
resultType="app.module.admin.usecase.dashboard.chart.adapters.persistence.model.RegionDetailExcelDto">
/* selectRegionDetailExcel : 대시보드 엑셀다운로드 (세부지역) */
-- 세부 지역별 데이터
SELECT
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,
WITH detail_region AS (
SELECT *
FROM uicode
WHERE id LIKE 'code.region.detail.%'
AND is_deleted = false
),
sub_region AS (
SELECT *
FROM uicode
WHERE parent_id = 'code.region.sub'
AND is_deleted = false
),
main_region AS (
SELECT *
FROM uicode
WHERE parent_id = 'code.region.main'
AND is_deleted = false
),
-- 지역별 통계 + 전체합계
region_stats AS (
SELECT
COALESCE(main.code_text, '-') AS region_main_name,
COALESCE(detail.code_text, '-') AS region_detail_name,
COUNT(DISTINCT h.seq) AS household_count,
CASE
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,
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 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
COALESCE(main.order_no, 9999) AS main_order,
COALESCE(sub.order_no, 9999) AS sub_order,
COALESCE(detail.order_no, 9999) AS detail_order
FROM detail_region detail
INNER JOIN household h
ON h.region_detail_code = detail.id
AND h.is_deleted = false
AND h.is_panel = true
LEFT JOIN main_region main
ON main.id = h.region_main_code
LEFT JOIN sub_region sub
ON sub.id = h.region_sub_code
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}
<if test="'prod'.equals(activeProfiles)">
WHERE main.in_use IS DISTINCT FROM false
</if>
GROUP BY
main.code_text, main.order_no,
sub.order_no,
detail.code_text, detail.order_no
UNION ALL
SELECT
'전체' AS region_main_name,
'전체' AS region_detail_name,
COUNT(DISTINCT h.seq),
CASE
WHEN COALESCE(AVG(v.current_completion_rate), 0) > 0
THEN ROUND(COALESCE(AVG(v.current_completion_rate), 0), 1)
ELSE 0
END,
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 main_order, -- 전체합계가 맨 위로 오도록
-1 AS sub_order,
-1 AS detail_order
FROM household h
LEFT JOIN main_region main
ON main.id = h.region_main_code
LEFT JOIN sub_region sub
ON sub.id = h.region_sub_code
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 h.is_deleted = false
AND h.is_panel = true
<if test="'prod'.equals(activeProfiles)">
AND main.in_use IS DISTINCT FROM false
</if>
)
SELECT *
FROM region_stats
ORDER BY main_order, sub_order, detail_order
</select>
</mapper>