[BO] 임가현황 리스트, 상세 작업 중 (2)

This commit is contained in:
kangsunlee
2025-06-13 19:15:58 +09:00
parent 4df2e17ab2
commit 1891ce5541
42 changed files with 644 additions and 86 deletions

View File

@@ -0,0 +1,58 @@
<?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.getDailyRecordsCount.adapters.persistence.GetDailyRecordsCountMapper">
<select id="getDailyRecordsCount"
resultType="app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount">
/* getDailyRecordsCount : 일계부 상태 요약 및 진행률 조회 */
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 dfs.id) AS forestry_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_forestry dfs ON dfs.daily_record_seq = dr.id AND dfs.is_deleted = false
WHERE dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
GROUP BY dr.id
),
record_status AS (
SELECT
CASE
WHEN ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */
WHEN dr.all_status = 'DONE' THEN 'DONE' /* 작성완료 */
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */
WHEN dr.all_status = 'TODAY_NONE' THEN 'NONE' /* 등록없음 */
ELSE 'EMPTY' /* 미작성 */
END AS all_status
FROM daily_day_group ddg
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
)
SELECT
COUNT(*) FILTER (WHERE all_status = 'DONE') AS done_count,
COUNT(*) FILTER (WHERE all_status = 'EMPTY') AS empty_count,
COUNT(*) FILTER (WHERE all_status = 'INCOMPLETE') AS incomplete_count,
COUNT(*) FILTER (WHERE all_status = 'WAITING') AS waiting_count,
ROUND(
100.0 *
COUNT(*) FILTER (WHERE all_status = 'DONE')
/ NULLIF(
(SELECT COUNT(*)
FROM daily_day_group
WHERE end_day &lt;= EXTRACT(DAY FROM CURRENT_DATE)), 0
),
2
) AS progress_percent
FROM record_status
</select>
</mapper>

View File

@@ -0,0 +1,52 @@
<?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.getDailyRecordsStatus.adapters.persistence.GetDailyRecordsStatusMapper">
<select id="getDailyRecordsStatus"
resultType="app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus">
/* getDailyRecordsStatus : 일계부 등록 현황 리스트 조회 */
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 dr.id) AS power_cnt,
COUNT(DISTINCT dfs.id) AS forestry_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
-- TODO : 농업 자가소비량 테이블 수정 후 추가
WHERE dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
GROUP BY dr.id
)
SELECT
ddg.start_day || CASE WHEN ddg.start_day = ddg.end_day THEN '' ELSE '-' || ddg.end_day END AS day_group,
CASE
WHEN ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */
WHEN dr.all_status = 'DONE' THEN 'DONE' /* 작성완료 */
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */
WHEN dr.all_status = 'TODAY_NONE' THEN 'NONE' /* 등록없음 */
ELSE 'EMPTY' /* 미작성 */
END AS all_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status,
get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status
-- TODO : 농업 자가소비량 테이블 수정 후 추가
FROM daily_day_group ddg
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
LEFT JOIN data_counts dc ON dc.id = dr.id
ORDER BY ddg.start_day
</select>
</mapper>

View File

@@ -4,10 +4,11 @@
<mapper
namespace="app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence.GetHouseholdStatusMapper">
<select id="getHouseholdStatusById"
resultType="app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus">
resultType="app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus">
SELECT
h.seq AS householdSeq,
h.household_num AS householdNum,
h.owner_name AS householdName,
h.owner_age AS householdAge,
h.tel AS householdTel,
h.phone AS householdPhone,

View File

@@ -18,7 +18,7 @@
FROM daily_day_group
WHERE end_day &lt;= EXTRACT(DAY FROM CURRENT_DATE)), 0
),
1
2
) AS progress_percent
) /* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */
@@ -81,14 +81,23 @@
</choose>
</if>
<if test="cmd.regionMainCode != null and cmd.regionMainCode != ''">
/* 실사 검색 */
AND hvr.regionMainCode = #{cmd.regionMainCode}
</if>
<choose>
<when test="cmd.userRole != null and cmd.userRole != 'ROLE_ADMIN'">
/* 지역 검색 : 지방실사 또는 조사원 */
AND hvr.regionMainCode = #{cmd.userRegionMainCode}
</when>
<when test="cmd.regionSubCode != null and cmd.regionSubCode != ''">
/* 지역 검색 : 관리자 */
AND hvr.regionMainCode = #{cmd.regionSubCode}
</when>
</choose>
<if test="cmd.regionSubCode != null and cmd.regionSubCode != ''">
/* 지역 검색 */
AND hvr.regionSubCode = #{cmd.regionSubCode}
</if>
<if test="cmd.regionDetailCode != null and cmd.regionDetailCode != ''">
/* 세부지역 검색 */
AND hvr.regionDetailCode = #{cmd.regionDetailCode}