[BO] 임가 현황 - 임가 등록 작업 중 (5)

This commit is contained in:
kangsunlee
2025-06-15 22:08:17 +09:00
parent 9723b58aa9
commit cfd7d94744
43 changed files with 1341 additions and 216 deletions

View File

@@ -0,0 +1,12 @@
<?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.checkHouseholdNum.adapters.persistence.CheckHouseholdNumMapper">
<select id="checkHouseholdNum"
resultType="app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum">
SELECT COUNT(*) > 0 AS is_duplicated
FROM household
WHERE household_num = #{householdNum};
</select>
</mapper>

View File

@@ -0,0 +1,98 @@
<?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.createHousehold.adapters.persistence.CreateHouseholdMapper">
<insert id="createHousehold">
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
SELECT nextval('household_seq')
</selectKey>
INSERT INTO household (
seq,
household_num,
owner_name,
owner_age,
<if test="tel != null and tel != ''">
tel,
</if>
phone,
password,
region_main_code,
region_sub_code,
region_detail_code,
address,
<if test="industryLargeCode != null and industryLargeCode != ''">
industry_large_code,
</if>
<if test="industryMiddleCode != null and industryMiddleCode != ''">
industry_middle_code,
</if>
<if test="industrySubMiddle != null and industrySubMiddle != ''">
industry_sub_middle,
</if>
<if test="industryDetail != null and industryDetail != ''">
industry_detail,
</if>
<!-- <if test="employmentCode != null or employmentCode != ''">-->
<!-- employment_code,-->
<!-- </if>-->
is_panel,
<if test="memo != null and memo != ''">
memo,
</if>
<include refid="common.fields.CreateUpdateBaseColumns"/>
) VALUES (
#{seq},
#{householdNum},
#{ownerName},
#{ownerAge},
<if test="tel != null and tel != ''">
#{tel},
</if>
#{phone},
#{encodedPassword},
#{regionMainCode},
#{regionSubCode},
#{regionDetailCode},
#{address},
<if test="industryLargeCode != null and industryLargeCode != ''">
#{industryLargeCode},
</if>
<if test="industryMiddleCode != null and industryMiddleCode != ''">
#{industryMiddleCode},
</if>
<if test="industrySubMiddle != null and industrySubMiddle != ''">
#{industrySubMiddle},
</if>
<if test="industryDetail != null and industryDetail != ''">
#{industryDetail},
</if>
<!-- <if test="employmentCode != null or employmentCode != ''">-->
<!-- #{employmentCode},-->
<!-- </if>-->
#{isPanel},
<if test="memo != null and memo != ''">
#{memo},
</if>
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
<insert id="createHouseholdHasRole">
INSERT INTO household_has_role (id,
household_seq,
role_id,
<include refid="common.fields.CreateUpdateBaseColumns"/>)
VALUES
<foreach collection="roleIds" item="roleId" separator=",">
(
nextval('household_has_role_seq'),
#{householdSeq},
#{roleId},
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</foreach>
</insert>
</mapper>

View File

@@ -7,36 +7,36 @@
resultType="app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount">
/* getDailyRecordsCount : 일계부 상태 요약 및 진행률 조회 */
WITH month_check AS (
SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month
SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month
),
record_status AS (
SELECT
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
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
CASE
/* 현재 월이고 오늘 이후인 경우만 WAITING */
WHEN mc.is_current_month AND ddg.start_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
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(COUNT(*) FILTER (WHERE all_status != 'WAITING'), 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

@@ -33,23 +33,23 @@
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 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' /* 미작성 */
WHEN mc.is_current_month AND ddg.start_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,
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
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status,
fn_get_status(mc.is_current_month AND ddg.start_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}
AND dr.is_deleted = false
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>

View File

@@ -180,6 +180,7 @@
</if>
</where>
ORDER BY hvr.householdNum ASC
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
</select>
</mapper>