Merge branch 'kangsun' into 'dev'
[BO] 임가현황 작업 중 (10) See merge request korea-research/korea-research!20
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
namespace="app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper">
|
||||
|
||||
<insert id="createHousehold">
|
||||
/* createHousehold : 임가 등록 */
|
||||
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
|
||||
SELECT nextval('household_seq')
|
||||
</selectKey>
|
||||
@@ -81,6 +82,7 @@
|
||||
</insert>
|
||||
|
||||
<insert id="createHouseholdHasRole">
|
||||
/* createHouseholdHasRole : 임가 역할 등록 */
|
||||
INSERT INTO household_has_role (id,
|
||||
household_seq,
|
||||
role_id,
|
||||
@@ -95,4 +97,22 @@
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<insert id="createResearcherHasHousehold">
|
||||
/* createResearcherHasHousehold : 임가 등록 시 담당 조사원 매핑 */
|
||||
INSERT INTO researcher_has_household
|
||||
(
|
||||
id,
|
||||
household_seq,
|
||||
admin_seq,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
nextval('researcher_has_household_seq'),
|
||||
#{householdSeq},
|
||||
#{adminSeq},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -0,0 +1,37 @@
|
||||
<?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.createResearcherMapping.adapters.persistence.CreateResearcherMappingMapper">
|
||||
|
||||
<update id="deleteResearcherMapping">
|
||||
/* deleteResearcherMapping : 조사원 임가 매핑 삭제 */
|
||||
UPDATE researcher_has_household
|
||||
SET <include refid="common.fields.DeleteBaseSet"/>
|
||||
WHERE is_deleted = false
|
||||
AND household_seq IN
|
||||
<foreach collection="householdSeqs" item="householdSeq" open="(" separator="," close=")">
|
||||
#{householdSeq}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
<insert id="createResearcherMapping">
|
||||
/* createResearcherMapping : 조사원 임가 매핑 등록 */
|
||||
INSERT INTO researcher_has_household
|
||||
(
|
||||
id,
|
||||
admin_seq,
|
||||
household_seq,
|
||||
<include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
)
|
||||
VALUES
|
||||
<foreach collection="householdSeqs" item="householdSeq" separator=",">
|
||||
(
|
||||
nextval('researcher_has_household_seq'),
|
||||
#{adminSeq},
|
||||
#{householdSeq},
|
||||
<include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -6,38 +6,77 @@
|
||||
<select id="getBankAutoTransferIncomeRecords"
|
||||
resultType="app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords">
|
||||
/* getBankAutoTransferIncomeRecords : 은행자동이체 (수입) 내역 목록 조회 */
|
||||
SELECT bat.id, /* 수입 id */
|
||||
ui_crop.code_text AS cropText, /* 재배형태 */
|
||||
ui_category.code_text AS categoryText, /* 수입의 종류 (코드명) */
|
||||
bat.transfer_category AS categorySelf, /* 수입의 종류 (텍스트입력) */
|
||||
bat.source_purpose AS sourcePurpose, /* 수입원 */
|
||||
bat.count, /* 수량 */
|
||||
ui_unit.code_text AS unitText, /* 단위 */
|
||||
bat.price /* 현금(원) */
|
||||
SELECT bat.id, /* 수입 id */
|
||||
ui_crop.code_text AS cropText, /* 재배형태 */
|
||||
-- TODO(ks) : 이게 맞나 싶지만.. 일단 .. case when 으로 ..
|
||||
CASE
|
||||
WHEN ui_category.id = 'code.bank.input.self'
|
||||
THEN bat.transfer_category
|
||||
ELSE ui_category.code_text
|
||||
END AS categoryText, /* 수입의 종류 */
|
||||
CASE
|
||||
WHEN ui_category.id = 'code.bank.input.self'
|
||||
THEN '-'
|
||||
ELSE bat.transfer_category
|
||||
END AS target, /* 대상(수입의 종류 텍스트입력) */
|
||||
bat.source_purpose AS sourcePurpose, /* 수입원 */
|
||||
bat.count, /* 수량 */
|
||||
CASE
|
||||
WHEN ui_unit.id = 'code.record.unit.self'
|
||||
THEN bat.unit
|
||||
ELSE ui_unit.code_text
|
||||
END AS unitText, /* 단위 */
|
||||
bat.price AS price /* 현금(원) */
|
||||
FROM bank_auto_transfer bat
|
||||
LEFT JOIN uicode ui_crop ON ui_crop.parent_id = 'code.record.crop' AND ui_crop.id = bat.crop_code
|
||||
LEFT JOIN uicode ui_unit ON ui_unit.parent_id = 'code.record.unit' AND ui_unit.id = bat.unit_code
|
||||
LEFT JOIN uicode ui_category ON ui_category.parent_id = 'code.bank.input' AND ui_category.id = bat.transfer_category_code
|
||||
LEFT JOIN uicode ui_crop
|
||||
ON ui_crop.parent_id = 'code.record.crop'
|
||||
AND ui_crop.id = bat.crop_code
|
||||
AND ui_crop.is_deleted = false
|
||||
LEFT JOIN uicode ui_unit
|
||||
ON ui_unit.parent_id = 'code.record.unit'
|
||||
AND ui_unit.id = bat.unit_code
|
||||
AND ui_unit.is_deleted = false
|
||||
LEFT JOIN uicode ui_category
|
||||
ON ui_category.parent_id = 'code.bank.input'
|
||||
AND ui_category.id = bat.transfer_category_code
|
||||
AND ui_category.is_deleted = false
|
||||
WHERE bat.transfer_type = 'code.bank.input'
|
||||
AND bat.household_seq = #{householdSeq}
|
||||
AND bat.month = #{recordMonth}
|
||||
AND bat.is_deleted = false
|
||||
</select>
|
||||
|
||||
<select id="getBankAutoTransferExpenseRecords"
|
||||
resultType="app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords">
|
||||
/* getBankAutoTransferExpenseRecords : 은행자동이체 (지출) 내역 목록 조회 */
|
||||
SELECT bat.id, /* 지출 id */
|
||||
ui_category.code_text AS cropText, /* 지출의 종류 (코드명) */
|
||||
bat.transfer_category AS categorySelf, /* 지출의 종류 (텍스트입력) */
|
||||
bat.source_purpose AS sourcePurpose, /* 용도 */
|
||||
bat.count, /* 수량 */
|
||||
ui_unit.code_text AS unitText, /* 단위 */
|
||||
bat.price /* 현금(원) */
|
||||
SELECT bat.id, /* 지출 id */
|
||||
CASE
|
||||
WHEN ui_category.id = 'code.bank.input.self'
|
||||
THEN bat.transfer_category
|
||||
ELSE ui_category.code_text
|
||||
END AS categoryText, /* 지출의 종류 */
|
||||
bat.source_purpose AS sourcePurpose, /* 용도 */
|
||||
bat.count, /* 수량 */
|
||||
CASE
|
||||
WHEN ui_unit.id = 'code.record.unit.self'
|
||||
THEN bat.unit
|
||||
ELSE ui_unit.code_text
|
||||
END AS unitText, /* 단위 */
|
||||
bat.price /* 현금(원) */
|
||||
FROM bank_auto_transfer bat
|
||||
LEFT JOIN uicode ui_unit ON ui_unit.parent_id = 'code.record.unit' AND ui_unit.id = bat.unit_code
|
||||
LEFT JOIN uicode ui_category ON ui_category.parent_id = 'code.bank.input' AND ui_category.id = bat.transfer_category_code
|
||||
LEFT JOIN
|
||||
uicode ui_unit
|
||||
ON ui_unit.parent_id = 'code.record.unit'
|
||||
AND ui_unit.id = bat.unit_code
|
||||
AND ui_unit.is_deleted = false
|
||||
LEFT JOIN
|
||||
uicode ui_category
|
||||
ON ui_category.parent_id = 'code.bank.output'
|
||||
AND ui_category.id = bat.transfer_category_code
|
||||
AND ui_category.is_deleted = false
|
||||
WHERE bat.transfer_type = 'code.bank.output'
|
||||
AND bat.household_seq = #{householdSeq}
|
||||
AND bat.month = #{recordMonth}
|
||||
AND bat.is_deleted = false
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -16,27 +16,55 @@
|
||||
<select id="getForestProductsStatus"
|
||||
resultType="app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus">
|
||||
/* getForestProductsStatus : 임가 현황의 임산물 현황 목록 조회 */
|
||||
SELECT df.id, /* 임산물 현황 id */
|
||||
df.street_num, /* 지번 */
|
||||
df.land_type, /* 지목 */
|
||||
df.town, /* 읍면동 */
|
||||
df.available_area, /* 가능면적 */
|
||||
df.crop_name, /* 재배작물명 */
|
||||
df.land_area, /* 면적 */
|
||||
df.main_yield, /* 주생산물 수확량 */
|
||||
ui_main_yield.code_text, /* 주생산물 수확량 단위 */
|
||||
df.main_sale_amount, /* 주생산물 판매량 */
|
||||
ui_main_sale.code_text , /* 주생산물 판매량 단위 */
|
||||
df.sub_yield, /* 부생산물 수확량 */
|
||||
ui_sub_yield.code_text , /* 주생산물 판매량 단위 */
|
||||
df.sub_sale_amount, /* 부생산물 판매량 */
|
||||
ui_sub_sale.code_text /* 부생산물 판매량 단위 */
|
||||
SELECT df.id, /* 임산물 현황 id */
|
||||
df.street_num, /* 지번 */
|
||||
df.land_type, /* 지목 */
|
||||
df.town, /* 읍면동 */
|
||||
df.available_area, /* 가능면적 */
|
||||
df.crop_name, /* 재배작물명 */
|
||||
df.land_area, /* 면적 */
|
||||
df.main_yield, /* 주생산물 수확량 */
|
||||
CASE
|
||||
WHEN ui_main_yield.id = 'code.record.unit.self'
|
||||
THEN df.main_yield_unit
|
||||
ELSE ui_main_yield.code_text
|
||||
END AS main_yield_unit_text, /* 주생산물 수확량 단위 */
|
||||
df.main_sale_amount, /* 주생산물 판매량 */
|
||||
CASE
|
||||
WHEN ui_main_sale.id = 'code.record.unit.self'
|
||||
THEN df.main_sale_unit
|
||||
ELSE ui_main_sale.code_text
|
||||
END AS main_sale_unit_text, /* 주생산물 판매량 단위 */
|
||||
df.sub_yield, /* 부생산물 수확량 */
|
||||
CASE
|
||||
WHEN ui_sub_yield.id = 'code.record.unit.self'
|
||||
THEN df.sub_yield_unit
|
||||
ELSE ui_sub_yield.code_text
|
||||
END AS sub_yield_unit_text, /* 부생산물 수확량 단위 */
|
||||
df.sub_sale_amount, /* 부생산물 판매량 */
|
||||
CASE
|
||||
WHEN ui_sub_sale.id = 'code.record.unit.self'
|
||||
THEN df.sub_sale_unit
|
||||
ELSE ui_sub_sale.code_text
|
||||
END AS sub_sale_unit_text /* 부생산물 판매량 단위 */
|
||||
FROM forest_product df
|
||||
-- TODO(ks) : 일단 전부 join.. 추후에 view 로 만들든지 개선해보기..
|
||||
LEFT JOIN uicode ui_main_yield ON ui_main_yield.parent_id = 'code.record.unit' AND ui_main_yield.id = df.main_yield_unit_code
|
||||
LEFT JOIN uicode ui_main_sale ON ui_main_sale.parent_id = 'code.record.unit' AND ui_main_sale.id = df.main_sale_unit_code
|
||||
LEFT JOIN uicode ui_sub_yield ON ui_sub_yield.parent_id = 'code.record.unit' AND ui_sub_yield.id = df.sub_yield_unit_code
|
||||
LEFT JOIN uicode ui_sub_sale ON ui_sub_sale.parent_id = 'code.record.unit' AND ui_sub_sale.id = df.sub_sale_unit_code
|
||||
LEFT JOIN uicode ui_main_yield
|
||||
ON ui_main_yield.parent_id = 'code.record.unit'
|
||||
AND ui_main_yield.id = df.main_yield_unit_code
|
||||
AND ui_main_yield.is_deleted = false
|
||||
LEFT JOIN uicode ui_main_sale
|
||||
ON ui_main_sale.parent_id = 'code.record.unit'
|
||||
AND ui_main_sale.id = df.main_sale_unit_code
|
||||
AND ui_main_sale.is_deleted = false
|
||||
LEFT JOIN uicode ui_sub_yield
|
||||
ON ui_sub_yield.parent_id = 'code.record.unit'
|
||||
AND ui_sub_yield.id = df.sub_yield_unit_code
|
||||
AND ui_sub_yield.is_deleted = false
|
||||
LEFT JOIN uicode ui_sub_sale
|
||||
ON ui_sub_sale.parent_id = 'code.record.unit'
|
||||
AND ui_sub_sale.id = df.sub_sale_unit_code
|
||||
AND ui_sub_sale.is_deleted = false
|
||||
WHERE df.household_seq = #{householdSeq}
|
||||
AND df.month = #{recordMonth}
|
||||
AND df.is_deleted = false
|
||||
|
||||
@@ -7,57 +7,77 @@
|
||||
<select id="getHouseholdsStatus"
|
||||
resultType="app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus">
|
||||
/* getHouseholdsStatus : 임가현황 리스트 조회 */
|
||||
WITH record_progress AS (
|
||||
SELECT ROUND(
|
||||
100.0 *
|
||||
(SELECT COUNT(*)
|
||||
FROM daily_record
|
||||
WHERE record_month = #{cmd.recordMonth} AND all_status = 'DONE')
|
||||
/ NULLIF(
|
||||
(SELECT COUNT(*)
|
||||
FROM daily_day_group
|
||||
WHERE end_day <= EXTRACT(DAY FROM CURRENT_DATE)), 0
|
||||
),
|
||||
2
|
||||
) AS progress_percent
|
||||
) /* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */
|
||||
WITH daily_progress AS (
|
||||
/* 임가별 이번달 완료된 일 수 계산 */
|
||||
SELECT
|
||||
household_seq,
|
||||
COUNT(*) as completed_days
|
||||
FROM daily_record
|
||||
WHERE record_month = #{cmd.recordMonth}
|
||||
AND all_status IN ('DONE', 'TODAY_NONE')
|
||||
GROUP BY household_seq
|
||||
),
|
||||
total_days AS (
|
||||
/* 오늘 날짜 기준 전체 입력 가능 날짜 수 */
|
||||
SELECT COUNT(*) as total_possible_days
|
||||
FROM daily_day_group
|
||||
WHERE end_day <= EXTRACT(DAY FROM CURRENT_DATE)
|
||||
),
|
||||
visit_summary AS (
|
||||
/* 임가별 1차임가방문, 2차임가방문, 답례품전달여부 */
|
||||
SELECT
|
||||
rhh.household_seq,
|
||||
MIN(v.visit_date) AS first_visit_date,
|
||||
MAX(v.visit_date) AS second_visit_date,
|
||||
BOOL_OR(v.is_gift_sent) AS is_gift_sent
|
||||
FROM household_visit v
|
||||
JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq
|
||||
WHERE rhh.is_deleted = false
|
||||
AND TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth}
|
||||
GROUP BY rhh.household_seq
|
||||
)
|
||||
SELECT
|
||||
hvr.*,
|
||||
COUNT(*) OVER () AS total
|
||||
FROM (
|
||||
SELECT
|
||||
r.admin_seq AS adminSeq,
|
||||
h.seq AS householdSeq,
|
||||
h.household_num AS householdNum,
|
||||
h.owner_name AS householdName,
|
||||
h.phone AS householdPhone,
|
||||
h.region_main_code AS regionMainCode,
|
||||
h.region_main_name AS regionMainName,
|
||||
h.region_sub_code AS regionSubCode,
|
||||
h.region_sub_name AS regionSubName,
|
||||
h.region_detail_code AS regionDetailCode,
|
||||
h.region_detail_name AS regionDetailName,
|
||||
h.industry_large_code as industryLargeCode,
|
||||
h.industry_large_name AS industryLargeName,
|
||||
h.industry_middle_code as industryMiddleCode,
|
||||
h.industry_middle_name AS industryMiddleName,
|
||||
h.is_panel AS isPanel,
|
||||
ps.progress_percent AS progressPercent,
|
||||
v.first_visit_date AS firstVisitDate,
|
||||
v.second_visit_date AS secondVisitDate,
|
||||
COALESCE(v.is_gift_sent, false) AS isGiftSent,
|
||||
r.researcher_name AS researcherName,
|
||||
r.researcher_phone AS researcherPhone
|
||||
r.admin_seq AS adminSeq,
|
||||
h.seq AS householdSeq,
|
||||
h.household_num AS householdNum,
|
||||
h.owner_name AS householdName,
|
||||
h.phone AS householdPhone,
|
||||
h.region_main_code AS regionMainCode,
|
||||
h.region_main_name AS regionMainName,
|
||||
h.region_sub_code AS regionSubCode,
|
||||
h.region_sub_name AS regionSubName,
|
||||
h.region_detail_code AS regionDetailCode,
|
||||
h.region_detail_name AS regionDetailName,
|
||||
h.industry_large_code AS industryLargeCode,
|
||||
h.industry_large_name AS industryLargeName,
|
||||
h.industry_middle_code AS industryMiddleCode,
|
||||
h.industry_middle_name AS industryMiddleName,
|
||||
h.is_panel AS isPanel,
|
||||
/* 일계부 입력 진행 완료 퍼센테이지 (이번달 작성 완료일 수 / 현재날짜 기준 전체 입력 가능 날짜 수) */
|
||||
ROUND(
|
||||
100.0 * COALESCE(dp.completed_days, 0) / NULLIF(td.total_possible_days, 0),
|
||||
2
|
||||
) AS progressPercent,
|
||||
vs.first_visit_date AS firstVisitDate,
|
||||
vs.second_visit_date AS secondVisitDate,
|
||||
COALESCE(vs.is_gift_sent, false) AS isGiftSent,
|
||||
r.researcher_name AS researcherName,
|
||||
r.researcher_phone AS researcherPhone
|
||||
FROM v_household_with_code h
|
||||
LEFT JOIN v_household_visit v ON h.seq = v.household_seq
|
||||
CROSS JOIN total_days td
|
||||
LEFT JOIN daily_progress dp ON h.seq = dp.household_seq
|
||||
LEFT JOIN visit_summary vs ON h.seq = vs.household_seq
|
||||
LEFT JOIN v_household_researcher r ON h.seq = r.household_seq
|
||||
CROSS JOIN record_progress ps
|
||||
) AS hvr
|
||||
|
||||
<where>
|
||||
1=1
|
||||
|
||||
<if test="cmd.ownerField != null and cmd.ownerField != ''">
|
||||
<if test="cmd.ownerField != null and cmd.ownerField != '' and cmd.ownerValue != ''">
|
||||
/* 경영주 검색 */
|
||||
<choose>
|
||||
<when test="cmd.ownerField eq 'name'">
|
||||
@@ -69,7 +89,7 @@
|
||||
</choose>
|
||||
</if>
|
||||
|
||||
<if test="cmd.researcherField != null and cmd.researcherField != ''">
|
||||
<if test="cmd.researcherField != null and cmd.researcherField != '' and cmd.researcherValue != ''">
|
||||
/* 조사원 검색 */
|
||||
<choose>
|
||||
<when test="cmd.researcherField eq 'name'">
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
<?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.getPopupResearchers.adapters.persistence.GetPopupResearchersMapper">
|
||||
<select id="getPopupResearchers"
|
||||
resultType="app.module.admin.usecase.household.getPopupResearchers.ports.application.domain.GetPopupResearchers">
|
||||
SELECT
|
||||
a.seq AS adminSeq,
|
||||
a.name,
|
||||
a.phone,
|
||||
u.code_text AS regionMainName,
|
||||
COUNT(DISTINCT rhh.household_seq) AS householdCount,
|
||||
COUNT(*) OVER() AS total
|
||||
FROM admin a
|
||||
JOIN admin_has_role ahr
|
||||
ON a.seq = ahr.admin_seq
|
||||
AND ahr.role_id = 'ROLE_RESEARCHER'
|
||||
AND ahr.is_deleted = false
|
||||
LEFT JOIN uicode u
|
||||
ON u.parent_id = 'code.region.main'
|
||||
AND u.id = a.region_main_code
|
||||
LEFT JOIN researcher_has_household rhh
|
||||
ON rhh.admin_seq = a.seq
|
||||
AND rhh.is_deleted = false
|
||||
WHERE a.is_deleted = false AND a.account_disabled = false
|
||||
|
||||
<if test="cmd.searchField != null and cmd.searchField != '' and cmd.searchValue != ''">
|
||||
/* 조사원 검색 */
|
||||
<choose>
|
||||
<when test="cmd.searchField eq 'name'">
|
||||
AND a.name ILIKE '%' || #{cmd.searchValue} || '%'
|
||||
</when>
|
||||
<when test="cmd.searchField eq 'phone'">
|
||||
AND a.phone ILIKE '%' || #{cmd.searchValue} || '%'
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
|
||||
<if test="cmd.regionMainCode != null and cmd.regionMainCode != ''">
|
||||
/* 실사 검색 */
|
||||
AND a.region_main_code = #{cmd.regionMainCode}
|
||||
</if>
|
||||
|
||||
GROUP BY a.seq, a.name, a.phone, u.code_text, a.region_main_code
|
||||
ORDER BY a.region_main_code ASC
|
||||
|
||||
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user