diff --git a/README.md b/README.md
index 8552712a..287b1ef1 100644
--- a/README.md
+++ b/README.md
@@ -115,6 +115,12 @@ recycle 의 demo 가 궁금하다면 아래 URL 에서 확인 해주세요.
-Dfile.upload.sftp.id=etribe
-Dfile.upload.sftp.password=Etribe@3415
-Dfile.upload.sftp.port=22
+-Dspring.datasource.hikari.maximum-pool-size=10
+-Dspring.datasource.hikari.minimum-idle=5
+-Dspring.datasource.hikari.idle-timeout=120000
+-Dspring.datasource.hikari.max-lifetime=900000
+-Dspring.datasource.hikari.connection-timeout=5000
+-Dspring.datasource.hikari.leak-detection-threshold=30000
```
** 주의 : 운영서버일 경우 vm옵션 추가
-Dspring.profiles.active=prod
diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml
index 83b7e1da..4abfbd25 100644
--- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml
+++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml
@@ -12,6 +12,7 @@
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT h.seq), 0), 1) , 0 ) as gift_sent_percent
FROM household h
+ JOIN uicode u on u.parent_id ='code.region.main' and u.in_use = true and u.is_deleted = false
LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth}
LEFT join household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false
WHERE h.is_deleted = false
@@ -32,6 +33,7 @@
COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) AS total_gift_sent_count,
COALESCE(ROUND(COUNT(DISTINCT CASE WHEN hv.is_gift_sent = true THEN hv.household_seq END) * 100::numeric / NULLIF(COUNT(DISTINCT rhh.household_seq), 0), 1),0) as gift_sent_percent
FROM household h
+ JOIN uicode u on u.parent_id ='code.region.main' and u.in_use = true and u.is_deleted = false
JOIN researcher_has_household rhh on rhh.household_seq = h.seq and rhh.admin_seq = #{adminSeq} and rhh.is_deleted = false
LEFT JOIN v_monthly_completion_rate cr on cr.household_seq = h.seq AND cr.record_month = #{recordMonth}
LEFT JOIN household_visit hv on hv.household_seq = h.seq and to_char(hv.visit_date,'YYYYMM') = #{recordMonth} and hv.is_deleted = false
@@ -136,10 +138,11 @@
LEFT JOIN household_visit hv
ON hv.household_seq = h.seq
AND hv.is_deleted = false
+ AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
- WHERE u.parent_id = 'code.region.main'
+ WHERE u.parent_id = 'code.region.main' and u.in_use = true and u.is_deleted = false
GROUP BY u.code_text, u.order_no
UNION ALL
-- 전체 합계 행
@@ -169,10 +172,11 @@
LEFT JOIN household_visit hv
ON hv.household_seq = h.seq
AND hv.is_deleted = false
+ AND TO_CHAR(hv.visit_date, 'YYYYMM') = #{recordMonth}
LEFT JOIN v_monthly_completion_rate v
ON v.household_seq = h.seq
AND v.record_month = #{recordMonth}
- WHERE u.parent_id = 'code.region.main'
+ WHERE u.parent_id = 'code.region.main' and u.in_use = true and u.is_deleted = false
ORDER BY order_no
@@ -209,6 +213,7 @@
ON hv_gift.household_seq = h.seq
AND hv_gift.is_deleted = false
AND hv_gift.is_gift_sent = true
+ AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
WHERE detail_uicode.id LIKE 'code.region.detail.%'
GROUP BY
detail_uicode.code_text,
@@ -238,6 +243,7 @@
ON hv_gift.household_seq = h.seq
AND hv_gift.is_deleted = false
AND hv_gift.is_gift_sent = true
+ AND TO_CHAR(hv_gift.visit_date, 'YYYYMM') = #{recordMonth}
WHERE h.is_deleted = false AND h.is_panel = true
order by
region_order ASC,
diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql
index 3ed64cce..f871d0fb 100644
--- a/core/src/main/resources/sql/data/04_second_open.sql
+++ b/core/src/main/resources/sql/data/04_second_open.sql
@@ -134,6 +134,81 @@ DELETE FROM uri WHERE id = 'uri.admin.communication.sms';
-- 은행자동이체 내역 칼럼 타입 크기 변경
ALTER TABLE public.bank_auto_transfer ALTER COLUMN source_purpose TYPE varchar(100) USING source_purpose::varchar(100);
+
+-- 뷰 테이블 수정
+-- public.v_household_with_code source
+drop view v_household_with_code;
+
+CREATE OR REPLACE VIEW public.v_household_with_code
+AS SELECT h.seq,
+ h.household_num,
+ h.owner_name,
+ h.owner_age,
+ h.tel,
+ h.phone,
+ h.address,
+ h.region_main_code,
+ main.code_text AS region_main_name,
+ h.region_sub_code,
+ sub.name AS region_sub_name,
+ h.region_detail_code,
+ detail.name AS region_detail_name,
+ h.industry_large_code,
+ ind_large.name AS industry_large_name,
+ h.industry_middle_code,
+ ind_middle.name AS industry_middle_name,
+ h.industry_sub_middle,
+ h.industry_detail,
+ h.is_panel,
+ h.usage_type,
+ h.employment_type,
+ h.memo
+ FROM household h
+ LEFT JOIN uicode main ON h.region_main_code::text = main.id::text
+ LEFT JOIN v_uicode_view_name sub ON h.region_sub_code::text = sub.id::text
+ LEFT JOIN v_uicode_view_name detail ON h.region_detail_code::text = detail.id::text
+ LEFT JOIN v_uicode_view_name ind_large ON h.industry_large_code::text = ind_large.id::text
+ LEFT JOIN v_uicode_view_name ind_middle ON h.industry_middle_code::text = ind_middle.id::text
+ WHERE h.is_deleted = false;
+
+-- 함수 생성
+-- DROP FUNCTION public.fn_uicode_text(varchar);
+
+CREATE OR REPLACE FUNCTION public.fn_uicode_text(p_id character varying)
+ RETURNS character varying
+ LANGUAGE plpgsql
+AS $function$
+DECLARE
+ result VARCHAR;
+BEGIN
+ SELECT CONCAT(code_value, '.', code_text)
+ INTO result
+ FROM public.uicode
+ WHERE id = p_id AND is_deleted = false;
+
+ RETURN result;
+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$
+;
-- ====================================================================================================================
-- 문자 발송
-- ====================================================================================================================
@@ -657,3 +732,61 @@ created_at timestamp(6) NULL,
created_by varchar(255) null,
CONSTRAINT term_agreement_pkey PRIMARY KEY (id)
);
+
+-- ============================================
+-- 영수증 매핑 테이블
+-- ============================================
+-- public.receipt_has_record
+CREATE TABLE public.receipt_has_record (
+ receipt_type_id int8 NOT NULL,
+ file_id int8 NOT NULL,
+ "type" varchar(10) NOT NULL,
+ created_at timestamp(6) DEFAULT CURRENT_TIMESTAMP NOT NULL,
+ created_by varchar(255) NOT NULL,
+ updated_at timestamp(6) NULL,
+ updated_by varchar(255) NULL,
+ deleted_at timestamp(6) NULL,
+ deleted_by varchar(255) NULL,
+ is_deleted bool DEFAULT false NOT NULL,
+ CONSTRAINT receipt_has_record_pkey PRIMARY KEY (receipt_type_id, file_id)
+);
+
+--- 첨부파일 컬럼 추가
+COMMENT ON COLUMN public.upload_file.mapping_id IS '첨부파일 매핑 ID';
+
+ALTER TABLE public.upload_file ADD ocr text NULL;
+COMMENT ON COLUMN public.upload_file.ocr IS 'ocr';
+
+
+
+
+-- ====================================================================================================================
+-- 시퀀스 초기화 스크립트
+-- ====================================================================================================================
+SELECT setval('admin_seq', (SELECT COALESCE(MAX(seq), 0) FROM admin));
+SELECT setval('admin_has_role_seq', (SELECT COALESCE(MAX(id), 0) FROM admin_has_role));
+SELECT setval('bank_auto_transfer_seq', (SELECT COALESCE(MAX(id), 0) FROM bank_auto_transfer));
+SELECT setval('batch_log_seq', (SELECT COALESCE(MAX(id), 0) FROM batch_log));
+SELECT setval('daily_expense_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_expense));
+SELECT setval('daily_farming_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_farming));
+SELECT setval('daily_forestry_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_forestry));
+SELECT setval('daily_income_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_income));
+SELECT setval('daily_power_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_power));
+SELECT setval('daily_record_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_record));
+SELECT setval('daily_summary_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_summary));
+SELECT setval('daily_work_seq', (SELECT COALESCE(MAX(id), 0) FROM daily_work));
+SELECT setval('forest_product_seq', (SELECT COALESCE(MAX(id), 0) FROM forest_product));
+SELECT setval('household_seq', (SELECT COALESCE(MAX(seq), 0) FROM household));
+SELECT setval('household_has_role_seq', (SELECT COALESCE(MAX(id), 0) FROM household_has_role));
+SELECT setval('household_visit_seq', (SELECT COALESCE(MAX(id), 0) FROM household_visit));
+SELECT setval('logged_in_user_seq', (SELECT COALESCE(MAX(id), 0) FROM logged_in_user));
+SELECT setval('monthly_input_status_seq', (SELECT COALESCE(MAX(id), 0) FROM monthly_input_status));
+SELECT setval('notice_seq', (SELECT COALESCE(MAX(id), 0) FROM notice));
+SELECT setval('operation_log_seq', (SELECT COALESCE(MAX(id), 0) FROM operation_log));
+SELECT setval('researcher_has_household_seq', (SELECT COALESCE(MAX(id), 0) FROM researcher_has_household));
+SELECT setval('role_has_privilege_seq', (SELECT COALESCE(MAX(id), 0) FROM role_has_privilege));
+SELECT setval('suggestion_seq', (SELECT COALESCE(MAX(id), 0) FROM suggestion));
+SELECT setval('term_agreement_seq', (SELECT COALESCE(MAX(id), 0) FROM term_agreement));
+SELECT setval('upload_file_seq', (SELECT COALESCE(MAX(id), 0) FROM upload_file));
+SELECT setval('upload_receipt_files_seq', (SELECT COALESCE(MAX(id), 0) FROM upload_receipt_files));
+SELECT setval('uri_has_role_seq', (SELECT COALESCE(MAX(id), 0) FROM uri_has_role));
\ No newline at end of file
diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql
index 49418152..398cffdf 100644
--- a/core/src/main/resources/sql/schema/02_create-record.sql
+++ b/core/src/main/resources/sql/schema/02_create-record.sql
@@ -212,7 +212,7 @@ CREATE TABLE daily_expense (
is_credit bool, -- 외상판매 여부
expense_kind varchar(100), -- 지출의 종류
expense_kind_mark varchar(10), -- 종류 부호
- source_purpose varchar(10), -- 지출원(용도)
+ source_purpose varchar(100), -- 지출원(용도)
quantity varchar(10), -- 수량
unit_code varchar(255), -- 단위(매핑코드)
unit_self varchar(100), -- 단위(직접입력)
diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html
index b2a87d89..c376876e 100644
--- a/front/src/main/resources/templates/layout/layout.html
+++ b/front/src/main/resources/templates/layout/layout.html
@@ -35,13 +35,13 @@
-
+