Merge branch 'dev' into first_open_fetch

This commit is contained in:
주수현
2025-07-28 13:24:34 +09:00
31 changed files with 466 additions and 147 deletions

View File

@@ -17,14 +17,14 @@ public final class CommonConstants {
/**
* 관리자 아이디 생성 규칙
* [정책] 아이디: 4~15자, 영문/숫자/한글/특수문자(_,-) 허용
* [정책] 아이디: 2~15자, 영문/숫자/한글/특수문자(_,-) 허용
*/
public static final String ADMIN_ID_REGEX = "^[a-zA-Z0-9가-힣_-]{4,15}$";
public static final String ADMIN_ID_REGEX = "^[a-zA-Z0-9가-힣_-]{2,15}$";
/**
* 관리자 아이디 유효성 실패 메시지
*/
public static final String ADMIN_ID_MSG = "아이디는 4~15자, 영문/숫자/한글/특수문자(_,-)만 가능합니다.";
public static final String ADMIN_ID_MSG = "아이디는 2~15자, 영문/숫자/한글/특수문자(_,-)만 가능합니다.";
/**
* 관리자 비밀번호 생성 규칙
@@ -42,9 +42,19 @@ public final class CommonConstants {
*/
public static final String VALID_CODE_NOTBLANK = "valid.common.required";
/**
* Validator NotBlank errorCode
*/
public static final String VALID_CODE_NOTZERO = "valid.common.notZero";
/**
* 핸드폰 번호 규칙
*/
public static final String PHONE_REGEX = "^01([0|1|6|7|8|9])-?([0-9]{3,4})-?([0-9]{4})$";
/**
* Validator Invalid Zero errorCode
*/
public static final String VALID_CODE_INVALID_ZERO = "valid.common.required.value.min";
}

View File

@@ -185,6 +185,8 @@ AS SELECT h.seq,
LEFT JOIN v_uicode_view_name ind_middle ON h.industry_middle_code::text = ind_middle.id::text
WHERE h.is_deleted = false;
COMMENT ON VIEW public.v_household_with_code IS '임가 정보에 지역/업종 코드명을 조인한 조회용 뷰';
-- 함수 생성
-- DROP FUNCTION public.fn_uicode_text(varchar);
@@ -205,24 +207,6 @@ END;
$function$
;
-- DROP FUNCTION public.fn_uicode_value(varchar);
CREATE OR REPLACE FUNCTION public.fn_uicode_value(p_id character varying)
RETURNS character varying
LANGUAGE plpgsql
AS $function$
DECLARE
result VARCHAR;
BEGIN
SELECT code_value
INTO result
FROM public.uicode
WHERE id = p_id AND is_deleted = false;
RETURN result;
END;
$function$
;
-- ====================================================================================================================
-- 문자 발송
-- ====================================================================================================================
@@ -493,6 +477,7 @@ AS SELECT h.seq,
WHERE h.is_deleted = false
ORDER BY h.household_num;
COMMENT ON VIEW public.v_household_all IS '전체 임가 정보에 담당 조사원 매핑 정보를 포함한 조회용 뷰';
-- ============================================
-- VIEW : v_household_all_visit
@@ -529,57 +514,7 @@ AS SELECT vha.seq,
JOIN household_visit hv ON hv.household_seq = vha.seq AND hv.is_deleted = false
ORDER BY vha.household_num, hv.visit_date;
-- ============================================
-- VIEW : v_household_day
-- ============================================
-- DROP VIEW public.v_household_day;
CREATE OR REPLACE VIEW public.v_household_day
AS SELECT vha.seq,
vha.household_num,
vha.owner_name,
vha.owner_age,
vha.tel,
vha.phone,
vha.region_main_code_text,
vha.region_sub_code_text,
vha.region_detail_code_text,
vha.researcher_name,
vha.researcher_phone,
dr.record_month,
CASE
WHEN ddg.start_day = ddg.end_day THEN concat(ddg.start_day, '')
ELSE concat(ddg.start_day, '-', ddg.end_day)
END AS input_day,
dr.all_status,
dr.income_status,
( SELECT count(*) AS count
FROM daily_income di
WHERE di.daily_record_seq = dr.id AND di.is_deleted = false) AS income_count,
dr.work_status,
( SELECT count(*) AS count
FROM daily_work dw
WHERE dw.daily_record_seq = dr.id AND dw.is_deleted = false) AS work_count,
dr.expense_status,
( SELECT count(*) AS count
FROM daily_expense de
WHERE de.daily_record_seq = dr.id AND de.is_deleted = false) AS expensecount,
dr.power_status,
( SELECT count(*) AS count
FROM daily_power dp
WHERE dp.daily_record_seq = dr.id AND dp.is_deleted = false) AS power_count,
dr.forestry_status,
( SELECT count(*) AS count
FROM daily_forestry df
WHERE df.daily_record_seq = dr.id AND df.is_deleted = false) AS forestry_count,
dr.farming_status,
( SELECT count(*) AS count
FROM daily_farming df2
WHERE df2.daily_record_seq = dr.id AND df2.is_deleted = false) AS farming_count
FROM v_household_all vha
JOIN daily_record dr ON vha.seq = dr.household_seq AND dr.is_deleted = false
LEFT JOIN daily_day_group ddg ON ddg.group_no = dr.day_group_no AND ddg.is_deleted = false
ORDER BY vha.household_num, dr.record_month, dr.day_group_no;
COMMENT ON VIEW public.v_household_all_visit IS '전체 임가 정보에 담당 조사원 매핑 정보를 포함한 조회용 뷰';
-- ============================================
@@ -594,6 +529,8 @@ AS SELECT daily_record.household_seq,
WHERE daily_record.is_deleted = false AND (daily_record.all_status::text = ANY (ARRAY['DONE'::character varying, 'TODAY_NONE'::character varying]::text[]))
GROUP BY daily_record.household_seq, daily_record.record_month;
COMMENT ON VIEW public.v_household_monthly_completed_days IS '임가별 월별 일계부 완료 일수 집계 뷰';
-- ============================================
-- VIEW : v_household_monthly_target_days
@@ -617,6 +554,8 @@ as WITH param_matrix AS (
JOIN daily_day_group g ON g.start_day <= p.last_day
GROUP BY p.household_seq, p.record_month;
COMMENT ON VIEW public.v_household_monthly_target_days IS '임가 월별 그룹 일수 집계 뷰';
-- ============================================
-- VIEW : v_household_visit_summary
@@ -706,6 +645,8 @@ AS WITH ranked_visits AS (
final.gift_send
FROM final;
COMMENT ON VIEW public.v_household_visit_summary IS '임가별 월별 1차,2차 방문 정보 뷰';
-- ============================================
-- VIEW : v_monthly_completion_rate
@@ -723,31 +664,8 @@ as SELECT d.household_seq,
LEFT JOIN v_household_monthly_completed_days c ON d.household_seq = c.household_seq AND d.record_month::text = c.record_month::text
ORDER BY d.household_seq, d.record_month;
COMMENT ON VIEW public.v_monthly_completion_rate IS '임가별 월간 일계부 등록 완료율을 계산하는 뷰';
-- ============================================
-- VIEW : v_researcher_count
-- ============================================
-- DROP VIEW public.v_researcher_count;
CREATE OR REPLACE VIEW public.v_researcher_count
AS SELECT a.seq,
a.id,
count(rhh.id) AS household_count,
a.name,
a.phone,
a.region_main_code,
fn_uicode_text(a.region_main_code) AS region_main_code_text,
a.account_disabled,
CASE a.account_disabled
WHEN false THEN '사용'::text
WHEN true THEN '미사용'::text
ELSE NULL::text
END AS account_disabled_flag
FROM admin a
JOIN admin_has_role ahr ON a.seq = ahr.admin_seq AND ahr.is_deleted = false
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_panel IS TRUE AND h.is_deleted = false
WHERE ahr.role_id::text = 'ROLE_RESEARCHER'::text
GROUP BY a.seq, a.id, a.name, a.phone, a.account_disabled;
-- ============================================
-- 개인정보 변경 동의 내역
@@ -772,6 +690,15 @@ created_by varchar(255) null,
CONSTRAINT term_agreement_pkey PRIMARY KEY (id)
);
COMMENT ON COLUMN public.term_agreement.id IS '동의 이력 ID';
COMMENT ON COLUMN public.term_agreement.seq IS '사용자 seq';
COMMENT ON COLUMN public.term_agreement."type" IS '동의타입';
COMMENT ON COLUMN public.term_agreement.previous_data IS '이전데이터';
COMMENT ON COLUMN public.term_agreement.created_at IS '생성일';
COMMENT ON COLUMN public.term_agreement.created_by IS '생성자';
COMMENT ON TABLE public.term_agreement IS '사용자 동의 이력 테이블';
-- ============================================
-- 영수증 매핑 테이블
-- ============================================
@@ -790,12 +717,25 @@ CREATE TABLE public.receipt_has_record (
CONSTRAINT receipt_has_record_pkey PRIMARY KEY (receipt_type_id, file_id)
);
--- 첨부파일 컬럼 추가
COMMENT ON COLUMN public.upload_file.mapping_id IS '첨부파일 매핑 ID';
COMMENT ON TABLE public.receipt_has_record IS '영수증 매핑 테이블';
COMMENT ON COLUMN public.receipt_has_record."type" IS '종류(INCOME,EXPENSE)';
COMMENT ON COLUMN public.receipt_has_record.file_id IS '파일 ID';
COMMENT ON COLUMN public.receipt_has_record.receipt_type_id IS '영수증 타입 ID';
COMMENT ON COLUMN public.receipt_has_record.created_at IS '생성일';
COMMENT ON COLUMN public.receipt_has_record.created_by IS '생성자';
COMMENT ON COLUMN public.receipt_has_record.updated_at IS '수정일';
COMMENT ON COLUMN public.receipt_has_record.updated_by IS '수정자';
COMMENT ON COLUMN public.receipt_has_record.deleted_at IS '삭제일';
COMMENT ON COLUMN public.receipt_has_record.deleted_by IS '삭제자';
ALTER TABLE public.upload_file ADD ocr text NULL;
COMMENT ON COLUMN public.upload_file.ocr IS 'ocr';
--- 첨부파일 컬럼 추가
COMMENT ON COLUMN public.upload_file.mapping_id IS '첨부파일 매핑 ID';
@@ -832,5 +772,31 @@ SELECT setval('uri_has_role_seq', (SELECT COALESCE(MAX(id), 0) FROM
-- ====================================================================================================================
-- 사용하지않는 view 삭제
-- ====================================================================================================================
DROP VIEW uicode_names;
DROP VIEW v_dashboard;
DROP VIEW v_role;
-- ====================================================================================================================
-- 기존에 있던 view 의 Comment 추가
-- ====================================================================================================================
COMMENT ON VIEW public.v_household_researcher IS '조사원별 담당 임가 매핑 정보 뷰';
COMMENT ON VIEW public.v_household_visit IS '임가별 방문 요약 정보 뷰';
COMMENT ON VIEW public.v_uicode_view_name IS '코드값과 코드명을 조합한 UI 표시용 코드명 뷰';
-- ====================================================================================================================
-- 사용하지않는 function 삭제
-- ====================================================================================================================
DROP FUNCTION public.fn_monthly_input_status_target_month(varchar);
DROP FUNCTION public.sc_monthly_input_status();
-- ====================================================================================================================
-- 임업노동 투입내역 - 일계부 테이블 면적부호 칼럼 추가
-- ====================================================================================================================
ALTER TABLE daily_work ADD COLUMN area_mark VARCHAR(10);
COMMENT ON COLUMN daily_work.area_mark IS '면적 부호';