Merge branch 'susu' into dev

# Conflicts:
#	admin/src/main/resources/static/assets/styles/style.css
#	admin/src/main/resources/templates/home.html
This commit is contained in:
주수현
2025-07-09 15:56:03 +09:00
18 changed files with 747 additions and 845 deletions

View File

@@ -0,0 +1,106 @@
<?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.dashboard.chart.adapters.persistence.ChartMapper">
<select id="selectTotalPercentage">
SELECT
COUNT(DISTINCT h.seq) as total_household_count,
COALESCE(ROUND(AVG(cr.completion_rate), 1), 0) AS daily_percent,
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS total_visit_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq end) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1) , 0 ) as visit_percent,
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1) , 0 ) as gift_sent_percent
FROM household h
LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth}
LEFT join household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false
WHERE h.is_deleted = false
<if test="usageType != null and usageType != ''">
and h.usage_type = #{usageType}
</if>
<if test="regionMainCode != null and regionMainCode != ''">
and h.region_main_code = #{regionMainCode}
</if>
</select>
<select id="selectTotalPercentageResearcher">
SELECT
COUNT(DISTINCT rhh.household_seq) as total_household_count,
COALESCE(ROUND(AVG(cr.completion_rate), 1), 0) AS daily_percent,
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS total_visit_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq end) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq), 0), 1),0) as visit_percent,
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq), 0), 1),0) as gift_sent_percent
FROM household h
JOIN researcher_has_household rhh on rhh.household_seq = h.seq and rhh.admin_seq = #{adminSeq} and rhh.is_deleted = false
LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth}
LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false
WHERE h.is_deleted = false
<if test="usageType != null and usageType != ''">
and h.usage_type = #{usageType}
</if>
<if test="regionMainCode != null and regionMainCode != ''">
and h.region_main_code = #{regionMainCode}
</if>
</select>
<select id="selectLocalRegionPercentage">
SELECT
COALESCE(u.code_text, '전체') AS region_name,
COUNT(DISTINCT a.seq) AS researcher_count,
COUNT(DISTINCT rhh.household_seq) AS total_household_count,
COALESCE(ROUND(AVG(v.completion_rate), 1), 0) AS daily_percent,
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS total_visit_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq end) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq),0), 1),0) as visit_percent,
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq),0), 1),0) as gift_sent_percent
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
<if test="usageType != null and usageType != ''">
and h.usage_type = #{usageType}
</if>
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' and u.in_use = true
GROUP BY ROLLUP(u.code_text)
ORDER BY CASE WHEN COALESCE(u.code_text, '전체') = '전체' THEN 1 ELSE 0 END,
MIN(u.order_no) NULLS LAST,
u.code_text
</select>
<select id="selectLocalRegionResearcherPercentage">
SELECT
NULLIF(a.name,'-') AS researcher_name,
u.code_text AS region_main_code_name,
COUNT(DISTINCT h.seq) AS total_household_count,
COALESCE(ROUND(AVG(cr.completion_rate), 1), 0) AS daily_percent,
COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) AS total_visit_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.id IS NOT NULL THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1),0) AS visit_percent,
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1), 0) AS gift_sent_percent
FROM admin a
JOIN uicode u ON a.region_main_code = u.id and u.parent_id = 'code.region.main' and u.in_use = true
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 = ahr.admin_seq
LEFT JOIN household h on h.seq = rhh.household_seq
<if test="usageType != null and usageType != ''">
and h.usage_type = #{usageType}
</if>
LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth}
LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth}
WHERE a.is_deleted = false and a.account_disabled = false
<if test="regionMainCode != null and regionMainCode != ''">
and a.region_main_code = #{regionMainCode}
</if>
GROUP BY a.seq,u.id
</select>
</mapper>

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff