From 60e06f9d45e2cf10dc30df0a95151f234112bec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 17:32:25 +0900 Subject: [PATCH 01/10] =?UTF-8?q?aws,=20api=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3365d4a0..579bbf68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,8 @@ WORKDIR /app # 소스 디렉토리를 컨테이너에 복사 COPY pom.xml . COPY core ./core -COPY aws ./aws COPY admin ./admin COPY front ./front -COPY api ./api # Maven을 이용해 프로젝트 빌드 RUN mvn --projects $TARGET_MODULE --also-make package -Dmaven.test.skip=true From a64e480ffb350ec66a7599e992178061b717ea66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 08:56:47 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/layout/layout.html | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 116e3144..e5c4c852 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -34,7 +34,6 @@ - From 4b7effad3a974bb1eb667603fc47eb0bf84b804e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 08:59:52 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/layout/layout.html | 1 + 1 file changed, 1 insertion(+) diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index e5c4c852..637228bb 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -40,6 +40,7 @@ +
From 15b4ac77b4c3bde28521b3a6c786ec30c3114d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 1 Jul 2025 10:55:47 +0900 Subject: [PATCH 04/10] =?UTF-8?q?vm=20=EC=98=B5=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index d8352145..23a754cf 100644 --- a/README.md +++ b/README.md @@ -120,6 +120,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 ``` ** 주의 : 운영서버일 경우 -Dpath.upload.storage=SFTP로 설정 From ac6cb091c6b9a37dfe4aa24102534648c50aa37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 12:21:48 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[1=EC=B0=A8][DB]=20=EC=9D=BC=EA=B3=84?= =?UTF-8?q?=EB=B6=80=20=EC=A7=80=EC=B6=9C=EC=9D=98=20=EC=9A=A9=EB=8F=84=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EA=B8=B8=EC=9D=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/resources/sql/schema/02_create-record.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), -- 단위(직접입력) From 7f016af6fc474de6bda3203bc1eecbe9627396f2 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 7 Jul 2025 12:10:38 +0900 Subject: [PATCH 06/10] =?UTF-8?q?[FO]=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20view=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 856896fde3f8a693badf6b587d92e53acd150053) --- .../core/config/adapters/persistence/entity/Household.java | 2 +- .../getUserFront/ports/application/domain/GetUserFront.java | 2 +- front/src/main/resources/mappers/userFront/GetUserMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java index 451785bb..1b196794 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Household.java @@ -41,7 +41,7 @@ public class Household extends AuditEntity { private Integer scaleCode; - private Integer employmentCode; + private Integer employmentType; private Boolean isPanel; diff --git a/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java b/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java index 6344122f..40a5f8cc 100644 --- a/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java +++ b/front/src/main/java/app/module/front/usecase/info/userFront/getUserFront/ports/application/domain/GetUserFront.java @@ -29,7 +29,7 @@ public class GetUserFront { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private String employmentCode; + private String employmentType; private Boolean isPanel; private String memo; private String dropReason; diff --git a/front/src/main/resources/mappers/userFront/GetUserMapper.xml b/front/src/main/resources/mappers/userFront/GetUserMapper.xml index e964818e..c56b99b7 100644 --- a/front/src/main/resources/mappers/userFront/GetUserMapper.xml +++ b/front/src/main/resources/mappers/userFront/GetUserMapper.xml @@ -22,7 +22,7 @@ industry_middle_code, industry_sub_middle, industry_detail, - employment_code, + employment_type, is_panel, memo, drop_reason, From 57bbe9d00da242a9ef64b928ffc501086d5a6fc8 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 4 Jul 2025 14:17:03 +0900 Subject: [PATCH 07/10] =?UTF-8?q?[FO]=20=EC=98=A4=EB=A5=98=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 741c435687f070836f127ad271523fb98f7b32c9) --- .../getHousehold/ports/application/domain/GetHousehold.java | 2 +- .../src/main/resources/mappers/household/GetHouseholdMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java index 8db76c8a..25820236 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java @@ -32,7 +32,7 @@ public class GetHousehold { private String industryMiddleCode; private String industrySubMiddle; private String industryDetail; - private String employmentCode; + private String employmentType; private Boolean isPanel; private String memo; private String dropReason; diff --git a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml index 36fd2728..93a7544d 100644 --- a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml @@ -22,7 +22,7 @@ h.industry_middle_code, h.industry_sub_middle, h.industry_detail, - h.employment_code, + h.employment_type, h.is_panel, h.memo, h.drop_reason, From 7c69420af3a281955304faff8514365b422b0bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Thu, 17 Jul 2025 09:29:10 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/record/calendar.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 98d347d3..35fdbff0 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -835,6 +835,7 @@ let dailyNo = [] let msgTxt = ''; let month = viewDate.getMonth() + 1; + let idxPlus = 0; msgTxt += "등록하지 않은 일계부 항목이 있습니다.\n 정확한 조사를 위해 꾸준히 입력해 주세요.\n"; if(response.dailyRecordAlertDtoList.length > 0){ response.dailyRecordAlertDtoList.forEach((dto) =>{ @@ -847,14 +848,11 @@ dailyNo.push(dateTxt); }); msgTxt += "

1. 일계부 미등록

\n

"+dailyNo.join(',')+"

\n"; + idxPlus ++; } - if(response.monthRecordAlertDtoList.length > 0) { response.monthRecordAlertDtoList.forEach((dto,idx) => { - if(response.dailyRecordAlertDtoList.length > 0){ - idx ++; - } - msgTxt += "

"+idx+". "+dto+"

\n"; + msgTxt += "

"+ (idx+idxPlus+1) +". "+dto+"

\n"; }); } From 2e53a12535d13cb3898c89a4577ecee3528b19b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Thu, 17 Jul 2025 11:49:36 +0900 Subject: [PATCH 09/10] =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EB=B0=8F=20sql=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/dashboard/ChartMapper.xml | 10 +- .../resources/sql/data/04_second_open.sql | 99 +++++++++++++++++++ 2 files changed, 107 insertions(+), 2 deletions(-) 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..681f726d 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,27 @@ 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'; From 308b0b1ab5e3a1503a48306d42d526ca4580ebde Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Thu, 17 Jul 2025 14:01:23 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[DB]=20=EC=8B=9C=ED=80=80=EC=8A=A4=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/data/04_second_open.sql | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) 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 681f726d..f871d0fb 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -756,3 +756,37 @@ 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