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

This commit is contained in:
kangsunlee
2025-06-14 20:51:10 +09:00
parent 418ea600fc
commit 866ec501f5
28 changed files with 1369 additions and 316 deletions

View File

@@ -0,0 +1,89 @@
<?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.getDailyRecordStatus.adapters.persistence.GetDailyRecordStatusMapper">
<select id="getDailyIncomeRecords"
resultType="app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyIncomeRecords">
/* getDailyIncomeRecords : 일계부 등록 현황 상세 수입 조회 */
SELECT di.id, /* 수입 id */
di.input_type, /* 입력구분 */
di.is_credit, /* 외상판매여부 */
di.crop_code, /* 재배형태 코드 */
di.category_code, /* 수입 종류 코드 */
di.category_self, /* 수입 종류(직접입력) */
di.source_purpose, /* 수입원(용도) */
di.quantity, /* 수량 */
di.unit_code, /* 단위 */
di.price, /* 현금 */
di.estimated_value, /* 현물평가액 */
di.updated_by, /* 최종수정자 */
di.updated_at /* 최종수정날짜 */
FROM daily_record dr
JOIN daily_income di ON dr.id = di.daily_record_seq
WHERE dr.household_seq = #{householdSeq}
AND dr.id = #{recordSeq}
AND dr.record_month = #{recordMonth}
AND di.is_deleted = false
</select>
<select id="getDailyExpenseRecords"
resultType="app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyExpenseRecords">
/* getDailyExpenseRecords : 일계부 등록 현황 상세 지출 조회 */
SELECT de.id, /* 지출 id */
de.input_type, /* 입력구분 */
de.is_credit, /* 외상판매여부 */
de.category_code, /* 재배형태 코드 */
de.category_self, /* 지출 종류 코드 */
de.source_purpose, /* 지출원(용도) */
de.quantity, /* 수량 */
de.unit_code, /* 단위 */
de.price, /* 현금 */
de.estimated_value, /* 현물평가액 */
de.updated_by, /* 최종수정자 */
de.updated_at /* 최종수정날짜 */
FROM daily_record dr
JOIN daily_expense de ON dr.id = de.daily_record_seq
WHERE dr.household_seq = #{householdSeq}
AND dr.id = #{recordSeq}
AND dr.record_month = #{recordMonth}
AND de.is_deleted = false
</select>
<select id="getDailyPowerRecords"
resultType="app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyPowerRecords">
/* getDailyPowerRecords : 일계부 등록 현황 상세 동력사용시간 조회 */
select dp.id,
dp.equipment_name,
dp.owned_hours,
dp.leased_hours,
dp.updated_by,
dp.updated_at
from daily_record dr
join daily_power dp on dr.id = dp.daily_record_seq
WHERE dr.household_seq = #{householdSeq}
AND dr.id = #{recordSeq}
AND dr.record_month = #{recordMonth}
AND dp.is_deleted = false
</select>
<select id="getDailyForestryRecords"
resultType="app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyForestryRecords">
/* getDailyForestryRecords : 일계부 등록 현황 상세 자가임업 생산물 중 자가소비량 조회 */
SELECT df.id,
df.product_name,
df.usage,
df.quantity,
df.unit_code,
df.estimated_value,
df.updated_by,
df.updated_at
FROM daily_record dr
JOIN daily_forestry df on dr.id = df.daily_record_seq
WHERE dr.household_seq = #{householdSeq}
AND dr.id = #{recordSeq}
AND dr.record_month = #{recordMonth}
AND df.is_deleted = false
</select>
</mapper>

View File

@@ -6,53 +6,37 @@
<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
WITH month_check AS (
SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month
),
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
CASE
/* 현재 월이고 오늘 이후인 경우만 WAITING */
WHEN mc.is_current_month AND ddg.end_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'
WHEN dr.all_status IS NULL THEN 'EMPTY'
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
CROSS JOIN month_check mc
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
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(COUNT(*) FILTER (WHERE all_status != 'WAITING'), 0),
2
) AS progress_percent
FROM record_status
</select>
</mapper>

View File

@@ -12,7 +12,7 @@
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 dp.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
@@ -25,23 +25,27 @@
AND 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
)
SELECT
dr.id AS id,
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' /* 미작성 */
WHEN mc.is_current_month AND ddg.end_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,
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
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status
-- TODO : 농업 자가소비량 테이블 수정 후 추가
FROM daily_day_group ddg
CROSS JOIN month_check mc
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}

View File

@@ -81,14 +81,13 @@
</choose>
</if>
<choose>
<when test="cmd.userRole != null and cmd.userRole != 'ROLE_ADMIN'">
/* 지역 검색 : 지방실사 또는 조사원 */
/* 실사 검색 : 지방실사 또는 조사원 */
AND hvr.regionMainCode = #{cmd.userRegionMainCode}
</when>
<when test="cmd.regionMainCode != null and cmd.regionMainCode != ''">
/* 지역 검색 : 관리자 */
/* 실사 검색 : 관리자 */
AND hvr.regionMainCode = #{cmd.regionMainCode}
</when>
</choose>