diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml
index d3fe3f15..15751c66 100644
--- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml
+++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml
@@ -13,12 +13,12 @@
max(u.code_text) AS region_main_code_name,
case a.account_disabled when false then '사용' when true then '미사용' end account_disabled_flag
from admin a
- join admin_has_role ahr ON a.seq = ahr.admin_seq
+ join admin_has_role ahr ON a.seq = ahr.admin_seq 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
- left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true
+ 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 = 'ROLE_RESEARCHER' and ahr.is_deleted = false
+ ahr.role_id = 'ROLE_RESEARCHER'
and a.name LIKE CONCAT('%', #{searchValue}, '%')
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html
index 10d0f25e..c920931a 100644
--- a/admin/src/main/resources/templates/researcher/detail.html
+++ b/admin/src/main/resources/templates/researcher/detail.html
@@ -93,6 +93,7 @@
+
diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java
index 5f4f086c..c4419369 100644
--- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java
+++ b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java
@@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-@SpringBootTest
-@TestPropertySource("classpath:application-override.properties")
+
+
@Slf4j
class AdminCreateUpdateDaoTest {
@@ -23,12 +23,12 @@ class AdminCreateUpdateDaoTest {
System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true");
}
- @Autowired
+/* @Autowired
SaveAdminPortOut adminCreateUpdateDao;
@Autowired
AdminViewPortIn adminViewPortIn;
@Autowired
- SaveAdminPortIn saveAdminPortIn;
+ SaveAdminPortIn saveAdminPortIn;*/
@Test
@DisplayName("operate - AdminCreateDao")
diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql
index cb7296fa..c033ef94 100644
--- a/core/src/main/resources/sql/schema/02_create-all.sql
+++ b/core/src/main/resources/sql/schema/02_create-all.sql
@@ -24,19 +24,19 @@ CREATE TABLE privilege (
))
);
-COMMENT ON TABLE public.privilege IS '권한 정의 테이블';
+COMMENT ON TABLE privilege IS '권한 정의 테이블';
-COMMENT ON COLUMN public.privilege.id IS '권한 ID';
-COMMENT ON COLUMN public.privilege.description IS '권한 설명';
-COMMENT ON COLUMN public.privilege.app_type IS '앱 구분';
-COMMENT ON COLUMN public.privilege.order_no IS '정렬 순서';
-COMMENT ON COLUMN public.privilege.created_at IS '생성일';
-COMMENT ON COLUMN public.privilege.created_by IS '생성자';
-COMMENT ON COLUMN public.privilege.updated_at IS '수정일';
-COMMENT ON COLUMN public.privilege.updated_by IS '수정자';
-COMMENT ON COLUMN public.privilege.deleted_at IS '삭제일';
-COMMENT ON COLUMN public.privilege.deleted_by IS '삭제자';
-COMMENT ON COLUMN public.privilege.is_deleted IS '삭제 여부';
+COMMENT ON COLUMN privilege.id IS '권한 ID';
+COMMENT ON COLUMN privilege.description IS '권한 설명';
+COMMENT ON COLUMN privilege.app_type IS '앱 구분';
+COMMENT ON COLUMN privilege.order_no IS '정렬 순서';
+COMMENT ON COLUMN privilege.created_at IS '생성일';
+COMMENT ON COLUMN privilege.created_by IS '생성자';
+COMMENT ON COLUMN privilege.updated_at IS '수정일';
+COMMENT ON COLUMN privilege.updated_by IS '수정자';
+COMMENT ON COLUMN privilege.deleted_at IS '삭제일';
+COMMENT ON COLUMN privilege.deleted_by IS '삭제자';
+COMMENT ON COLUMN privilege.is_deleted IS '삭제 여부';
-- ============================================
@@ -1201,62 +1201,54 @@ COMMENT ON COLUMN daily_input_status.is_deleted IS '삭제여부';
CREATE SEQUENCE forest_product_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE forest_product (
- id bigint DEFAULT nextval('forest_product_seq') NOT NULL, -- 현황 ID
- household_seq bigint NOT NULL, -- 임가정보 일련번호 (FK)
- street_num varchar(255), -- 지번
- land_type varchar(255), -- 지목
- town varchar(255), -- 읍면동
- available_area integer, -- 가능면적
- crop_name varchar(255), -- 재배작물명
- crop_code varchar(255), -- 작물부호 (매핑코드)
- land_area integer, -- 면적
- month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
- main_yield NUMERIC(10, 2), -- 수확량
- main_yield_unit_code varchar(255), -- 수확 단위 (매핑코드)
- main_sale_amount NUMERIC(10, 2), -- 판매량
- main_sale_unit_code varchar(255), -- 판매 단위 (매핑코드)
+ id int8 DEFAULT nextval('forest_product_seq'::regclass) NOT NULL, -- 현황 ID
+ household_seq int8 NOT NULL, -- 임가 일련번호 (FK)
+ street_num varchar(255), -- 지번
+ land_type varchar(255), -- 지목
+ town varchar(255), -- 읍면동
+ available_area varchar(10), -- 가능면적
+ crop_name varchar(255), -- 재배작물명
+ crop_code varchar(255), -- 작물부호 (매핑코드)
+ land_area varchar(10), -- 면적
+ "month" varchar(7) NOT NULL, -- 조사 월 (yyyy-mm)
+ main_yield varchar(10), -- 주 수확량
+ main_yield_unit_code varchar(255), -- 주 수확량 단위(코드)
+ main_sale_amount varchar(10), -- 주 판매량
+ main_sale_unit_code varchar(255), -- 주 판매 단위(코드)
+ sub_yield varchar(10), -- 부 수확량
+ sub_yield_unit_code varchar(255), -- 부 수확량 단위(코드)
+ sub_sale_amount varchar(10), -- 부 판매량
+ sub_sale_unit_code varchar(255), -- 부 판매 단위(코드)
+ monthly_input_status_id int8, -- 월별 입력 상태 ID (FK)
+ main_yield_unit varchar(255), -- 주 수확량 단위(직접입력)
+ main_sale_unit varchar(255), -- 주 판매 단위(직접입력)
+ sub_yield_unit varchar(255), -- 부 수확량 단위(직접입력)
+ sub_sale_unit varchar(255), -- 부 판매 단위(직접입력)
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
- sub_yield NUMERIC(10, 2), -- 수확량
- sub_yield_unit_code varchar(255), -- 수확 단위 (매핑코드)
- sub_sale_amount NUMERIC(10, 2), -- 판매량
- sub_sale_unit_code varchar(255), -- 판매 단위 (매핑코드)
-
-
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false, -- 삭제여부
-
- CONSTRAINT forest_product_pkey PRIMARY KEY (id),
- CONSTRAINT fk_forest_product__household FOREIGN KEY (household_seq) REFERENCES household(seq)
+ CONSTRAINT forest_product_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_forest_product__household FOREIGN KEY (household_seq) REFERENCES household(seq),
+ CONSTRAINT fk_forest_product_monthly_input_status FOREIGN KEY (monthly_input_status_id) REFERENCES monthly_input_status(id)
);
-COMMENT ON TABLE forest_product IS '임산물 현황';
+COMMENT ON TABLE forest_product IS '임업 생산물 정보';
-COMMENT ON COLUMN forest_product.id IS '현황 ID';
-COMMENT ON COLUMN forest_product.household_seq IS '임가정보 일련번호';
+COMMENT ON COLUMN forest_product.id IS '임업 생산물 ID';
+COMMENT ON COLUMN forest_product.household_seq IS '임가 일련번호';
COMMENT ON COLUMN forest_product.street_num IS '지번';
-COMMENT ON COLUMN forest_product.land_type IS '지목';
-COMMENT ON COLUMN forest_product.town IS '읍면동';
-COMMENT ON COLUMN forest_product.available_area IS '가능면적';
-COMMENT ON COLUMN forest_product.crop_name IS '재배작물명';
-COMMENT ON COLUMN forest_product.crop_code IS '작물부호 (매핑코드)';
-COMMENT ON COLUMN forest_product.land_area IS '면적';
-COMMENT ON COLUMN forest_product.month IS '조사시행 월 (yyyy-mm)';
-
-COMMENT ON COLUMN forest_product.main_yield IS '주 생산물 수확량';
-COMMENT ON COLUMN forest_product.main_yield_unit_code IS '주 생산물 수확 단위 (매핑코드)';
-COMMENT ON COLUMN forest_product.main_sale_amount IS '주 생산물 판매량';
-COMMENT ON COLUMN forest_product.main_sale_unit_code IS '주 생산물 판매 단위 (매핑코드)';
-
-COMMENT ON COLUMN forest_product.sub_yield IS '주 생산물 수확량';
-COMMENT ON COLUMN forest_product.sub_yield_unit_code IS '주 생산물 수확 단위 (매핑코드)';
-COMMENT ON COLUMN forest_product.sub_sale_amount IS '주 생산물 판매량';
-COMMENT ON COLUMN forest_product.sub_sale_unit_code IS '주 생산물 판매 단위 (매핑코드)';
-
+COMMENT ON COLUMN forest_product.land_type IS '토지 유형';
+COMMENT ON COLUMN forest_product.town IS '마을';
+COMMENT ON COLUMN forest_product.available_area IS '가용 면적';
+COMMENT ON COLUMN forest_product.crop_name IS '작물명';
+COMMENT ON COLUMN forest_product.crop_code IS '작물 코드';
+COMMENT ON COLUMN forest_product.land_area IS '토지 면적';
+COMMENT ON COLUMN forest_product.month IS '조사 월 (yyyy-mm)';
COMMENT ON COLUMN forest_product.created_at IS '생성일';
COMMENT ON COLUMN forest_product.created_by IS '생성자';
COMMENT ON COLUMN forest_product.updated_at IS '수정일';
@@ -1264,6 +1256,19 @@ COMMENT ON COLUMN forest_product.updated_by IS '수정자';
COMMENT ON COLUMN forest_product.deleted_at IS '삭제일';
COMMENT ON COLUMN forest_product.deleted_by IS '삭제자';
COMMENT ON COLUMN forest_product.is_deleted IS '삭제여부';
+COMMENT ON COLUMN forest_product.main_yield IS '주 수확량';
+COMMENT ON COLUMN forest_product.main_yield_unit_code IS '주 수확량 단위(코드)';
+COMMENT ON COLUMN forest_product.main_sale_amount IS '주 판매량';
+COMMENT ON COLUMN forest_product.main_sale_unit_code IS '주 판매 단위(코드)';
+COMMENT ON COLUMN forest_product.sub_yield IS '부 수확량';
+COMMENT ON COLUMN forest_product.sub_yield_unit_code IS '부 수확량 단위(코드)';
+COMMENT ON COLUMN forest_product.sub_sale_amount IS '부 판매량';
+COMMENT ON COLUMN forest_product.sub_sale_unit_code IS '부 판매 단위(코드)';
+COMMENT ON COLUMN forest_product.monthly_input_status_id IS '월별 입력 상태 ID';
+COMMENT ON COLUMN forest_product.main_yield_unit IS '주 수확량 단위(직접입력)';
+COMMENT ON COLUMN forest_product.main_sale_unit IS '주 판매 단위(직접입력)';
+COMMENT ON COLUMN forest_product.sub_yield_unit IS '부 수확량 단위(직접입력)';
+COMMENT ON COLUMN forest_product.sub_sale_unit IS '부 판매 단위(직접입력)';
-- ============================================
@@ -1318,44 +1323,49 @@ COMMENT ON COLUMN forest_product_yield.is_deleted IS '삭제여부';
CREATE SEQUENCE bank_auto_transfer_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE bank_auto_transfer (
- id bigint DEFAULT nextval('bank_auto_transfer_seq') NOT NULL, -- 자동이체 ID
- household_seq bigint NOT NULL, -- 임가정보 일련번호 (FK)
- transfer_type varchar(7) NOT NULL, -- 수입/지출 유형 (enum : INCOME / EXPENSE)
- income_code varchar(255), -- 수입 코드 (매핑코드)
- expense_code varchar(255), -- 지출 코드 (매핑코드)
- crop_code integer, -- 재배형태 코드 (매핑코드)
- transfer_category varchar(30), -- 수입/지출 종류
- source_purpose varchar(10), -- 수입원(용도)
- count integer, -- 수량
- unit_code varchar(255), -- 단위 (매핑코드)
- price integer, -- 현금(원)
- month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false, -- 삭제여부
+ id int8 DEFAULT nextval('bank_auto_transfer_seq'::regclass) NOT NULL, -- 자동 이체 ID
+ household_seq int8 NOT NULL, -- 임가 일련번호 (FK)
+ transfer_type varchar(255) NOT NULL, -- 수입/지출 유형 (enum : INCOME / EXPENSE)
+ income_code varchar(255), -- 수입 코드 (매핑코드)
+ expense_code varchar(255), -- 지출 코드 (매핑코드)
+ crop_code varchar(255), -- 재배형태 코드 (매핑코드)
+ transfer_category varchar(30), -- 수입/지출 종류
+ source_purpose varchar(10), -- 수입원(용도)
+ count varchar(10), -- 수량
+ unit_code varchar(255), -- 단위 (매핑코드)
+ price int8, -- 현금(원)
+ "month" varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
+ monthly_input_status_id int8, -- 월별 입력 상태 ID (FK)
+ transfer_category_code varchar(255), -- 이체 카테고리 코드
+ unit varchar(255), -- 단위(직접입력)
+ category varchar(10), -- 카테고리
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
- CONSTRAINT bank_auto_transfer_pkey PRIMARY KEY (id),
- CONSTRAINT fk_bank_auto_transfer__household FOREIGN KEY (household_seq) REFERENCES household(seq)
+ CONSTRAINT bank_auto_transfer_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_bank_auto_transfer__household FOREIGN KEY (household_seq) REFERENCES household(seq),
+ CONSTRAINT fk_bank_auto_transfer_monthly_input_status FOREIGN KEY (monthly_input_status_id) REFERENCES monthly_input_status(id)
);
-COMMENT ON TABLE bank_auto_transfer IS '은행 자동이체 항목';
+COMMENT ON TABLE bank_auto_transfer IS '은행 자동 이체 내역';
-COMMENT ON COLUMN bank_auto_transfer.id IS '자동이체 ID';
-COMMENT ON COLUMN bank_auto_transfer.household_seq IS '임가정보 일련번호';
-COMMENT ON COLUMN bank_auto_transfer.transfer_type IS '수입/지출 유형 (enum)';
-COMMENT ON COLUMN bank_auto_transfer.income_code IS '수입 코드 (매핑코드)';
-COMMENT ON COLUMN bank_auto_transfer.expense_code IS '지출 코드 (매핑코드)';
-COMMENT ON COLUMN bank_auto_transfer.crop_code IS '재배형태 코드 (매핑코드)';
-COMMENT ON COLUMN bank_auto_transfer.transfer_category IS '수입/지출 종류';
-COMMENT ON COLUMN bank_auto_transfer.source_purpose IS '수입원(용도)';
+COMMENT ON COLUMN bank_auto_transfer.id IS '자동 이체 ID';
+COMMENT ON COLUMN bank_auto_transfer.household_seq IS '임가 일련번호';
+COMMENT ON COLUMN bank_auto_transfer.transfer_type IS '이체 유형';
+COMMENT ON COLUMN bank_auto_transfer.income_code IS '수입 코드';
+COMMENT ON COLUMN bank_auto_transfer.expense_code IS '지출 코드';
+COMMENT ON COLUMN bank_auto_transfer.crop_code IS '작물 코드';
+COMMENT ON COLUMN bank_auto_transfer.transfer_category IS '이체 카테고리';
+COMMENT ON COLUMN bank_auto_transfer.source_purpose IS '원천/용도';
COMMENT ON COLUMN bank_auto_transfer.count IS '수량';
-COMMENT ON COLUMN bank_auto_transfer.unit_code IS '단위 (매핑코드)';
-COMMENT ON COLUMN bank_auto_transfer.price IS '현금(원)';
-COMMENT ON COLUMN bank_auto_transfer.month IS '조사시행 월 (yyyy-mm)';
+COMMENT ON COLUMN bank_auto_transfer.unit_code IS '단위(코드)';
+COMMENT ON COLUMN bank_auto_transfer.price IS '금액';
+COMMENT ON COLUMN bank_auto_transfer.month IS '조사 월 (yyyy-mm)';
COMMENT ON COLUMN bank_auto_transfer.created_at IS '생성일';
COMMENT ON COLUMN bank_auto_transfer.created_by IS '생성자';
COMMENT ON COLUMN bank_auto_transfer.updated_at IS '수정일';
@@ -1363,7 +1373,10 @@ COMMENT ON COLUMN bank_auto_transfer.updated_by IS '수정자';
COMMENT ON COLUMN bank_auto_transfer.deleted_at IS '삭제일';
COMMENT ON COLUMN bank_auto_transfer.deleted_by IS '삭제자';
COMMENT ON COLUMN bank_auto_transfer.is_deleted IS '삭제여부';
-
+COMMENT ON COLUMN bank_auto_transfer.monthly_input_status_id IS '월별 입력 상태 ID';
+COMMENT ON COLUMN bank_auto_transfer.transfer_category_code IS '이체 카테고리 코드';
+COMMENT ON COLUMN bank_auto_transfer.unit IS '단위(직접입력)';
+COMMENT ON COLUMN bank_auto_transfer.category IS '카테고리';
-- 6. monthly_carryover
-- ============================================
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 332b77e5..49418152 100644
--- a/core/src/main/resources/sql/schema/02_create-record.sql
+++ b/core/src/main/resources/sql/schema/02_create-record.sql
@@ -22,23 +22,25 @@ DROP SEQUENCE IF EXISTS daily_record_seq;
*/
+
+
-- ============================================
-- TABLE : daily_day_group
-- DESC : 일계부 작성일자 그룹 테이블
-- ============================================
CREATE TABLE daily_day_group (
- group_no smallint NOT NULL, -- 그룹번호
- start_day smallint, -- 시작일자
- end_day smallint, -- 종료일자
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false, -- 삭제여부
+ group_no smallint NOT NULL, -- 그룹번호
+ start_day smallint, -- 시작일자
+ end_day smallint, -- 종료일자
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted boolean DEFAULT false, -- 삭제여부
- CONSTRAINT daily_day_group_pkey PRIMARY KEY (group_no)
+ CONSTRAINT daily_day_group_pkey PRIMARY KEY (group_no)
);
COMMENT ON TABLE daily_day_group IS '일계부 작성일자 그룹 테이블';
@@ -56,56 +58,58 @@ COMMENT ON COLUMN daily_day_group.is_deleted IS '삭제여부';
INSERT INTO daily_day_group (group_no, start_day, end_day, created_at, created_by, is_deleted)
VALUES
- (1, 1, 2, now(), '_system', false)
- ,(2, 3, 4, now(), '_system', false)
- ,(3, 5, 6, now(), '_system', false)
- ,(4, 7, 7, now(), '_system', false)
- ,(5, 8, 9, now(), '_system', false)
- ,(6, 10, 11, now(), '_system', false)
- ,(7, 12, 13, now(), '_system', false)
- ,(8, 14, 14, now(), '_system', false)
- ,(9, 15, 16, now(), '_system', false)
- ,(10, 17, 18, now(), '_system', false)
- ,(11, 19, 20, now(), '_system', false)
- ,(12, 21, 21, now(), '_system', false)
- ,(13, 22, 23, now(), '_system', false)
- ,(14, 24, 25, now(), '_system', false)
- ,(15, 26, 27, now(), '_system', false)
- ,(16, 28, 29, now(), '_system', false)
- ,(17, 30, 31, now(), '_system', false)
+(1, 1, 2, now(), '_system', false)
+ ,(2, 3, 4, now(), '_system', false)
+ ,(3, 5, 6, now(), '_system', false)
+ ,(4, 7, 7, now(), '_system', false)
+ ,(5, 8, 9, now(), '_system', false)
+ ,(6, 10, 11, now(), '_system', false)
+ ,(7, 12, 13, now(), '_system', false)
+ ,(8, 14, 14, now(), '_system', false)
+ ,(9, 15, 16, now(), '_system', false)
+ ,(10, 17, 18, now(), '_system', false)
+ ,(11, 19, 20, now(), '_system', false)
+ ,(12, 21, 21, now(), '_system', false)
+ ,(13, 22, 23, now(), '_system', false)
+ ,(14, 24, 25, now(), '_system', false)
+ ,(15, 26, 27, now(), '_system', false)
+ ,(16, 28, 29, now(), '_system', false)
+ ,(17, 30, 31, now(), '_system', false)
;
+
+
-- ============================================
-- TABLE : daily_record
-- DESC : 일계부 일별 작성상태
-- ============================================
-CREATE SEQUENCE daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
+CREATE SEQUENCE IF NOT EXISTS daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_record (
- id bigint DEFAULT nextval('daily_record_seq') NOT NULL, -- 일계부 작성상태 ID
- household_seq bigint NOT NULL, -- 임가 일련번호 (FK)
- record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
- day_group_no smallint, -- 일계부 작성일자 그룹 번호
- start_date date, -- 작성시작일(yyyy-mm-dd)
- end_date date, -- 작성종료일(yyyy-mm-dd)
- all_status varchar(15), -- 전체 입력상태
- income_status varchar(15), -- 수입 입력상태
- work_status varchar(15), -- 임업노동 투입내역 입력상태
- expense_status varchar(15), -- 지출 입력상태
- power_status varchar(15), -- 동력사용시간 입력상태
- forestry_status varchar(15), -- 자가임업 생산물 중 자가소비량 입력상태
- farming_status varchar(15), -- 자가농업 생산물 중 자가소비량 입력상태
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false, -- 삭제여부
-
- CONSTRAINT daily_record_pkey PRIMARY KEY (id),
- CONSTRAINT fk_daily_record__household FOREIGN KEY (household_seq) REFERENCES household(seq)
+ id int8 DEFAULT nextval('daily_record_seq'::regclass) NOT NULL, -- 일계부 작성상태 ID
+ household_seq int8 NOT NULL, -- 임가 일련번호 (FK)
+ record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
+ day_group_no int2, -- 일계부 작성일자 그룹 번호
+ start_date date, -- 작성시작일(yyyy-mm-dd)
+ end_date date, -- 작성종료일(yyyy-mm-dd)
+ all_status varchar(15), -- 전체 입력상태
+ income_status varchar(15), -- 수입 입력상태
+ work_status varchar(15), -- 임업노동 투입내역 입력상태
+ expense_status varchar(15), -- 지출 입력상태
+ power_status varchar(15), -- 동력사용시간 입력상태
+ forestry_status varchar(15), -- 자가임업 생산물 중 자가소비량 입력상태
+ farming_status varchar(15), -- 자가농업 생산물 중 자가소비량 입력상태
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
+
+ CONSTRAINT daily_record_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_daily_record__household FOREIGN KEY (household_seq) REFERENCES household(seq)
);
COMMENT ON TABLE daily_record IS '일계부 일별 작성상태';
@@ -113,9 +117,9 @@ COMMENT ON TABLE daily_record IS '일계부 일별 작성상태';
COMMENT ON COLUMN daily_record.id IS '일계부 작성상태 ID';
COMMENT ON COLUMN daily_record.household_seq IS '임가 일련번호';
COMMENT ON COLUMN daily_record.record_month IS '조사시행 월 (yyyy-mm)';
+COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호';
COMMENT ON COLUMN daily_record.start_date IS '작성시작일(yyyy-mm-dd)';
COMMENT ON COLUMN daily_record.end_date IS '작성종료일(yyyy-mm-dd)';
-COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호';
COMMENT ON COLUMN daily_record.all_status IS '전체 입력상태';
COMMENT ON COLUMN daily_record.income_status IS '수입 입력상태';
COMMENT ON COLUMN daily_record.work_status IS '임업노동 투입내역 입력상태';
@@ -131,7 +135,6 @@ COMMENT ON COLUMN daily_record.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_record.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_record.is_deleted IS '삭제여부';
-
-- ============================================
-- TABLE : daily_income
-- DESC : 수입내역 - 일계부
@@ -139,32 +142,32 @@ COMMENT ON COLUMN daily_record.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_income_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_income (
- id bigint DEFAULT nextval('daily_income_seq') NOT NULL, -- 일계부 수입 ID
- daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
- input_type varchar(5), -- 입력 구분(SELF, OCR)
- category varchar(10), -- 유형
- income_mark varchar(10), -- 수입 부호
- expense_mark varchar(10), -- 지출 부호
- is_credit boolean, -- 외상판매 여부
- crop_code varchar(255), -- 재배형태(매핑코드)
- income_kind varchar(100), -- 수입의 종류
- income_kind_mark varchar(10), -- 종류 부호
- source_purpose varchar(100), -- 수입원(용도)
- quantity varchar(10), -- 수량
- unit_code varchar(255), -- 단위(매핑코드)
- unit_self varchar(100), -- 단위(직접입력)
- price bigint, -- 현금(원)
- estimated_value bigint, -- 현물(평가액)
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false, -- 삭제여부
-
- CONSTRAINT daily_income_pkey PRIMARY KEY (id),
- CONSTRAINT fk_daily_income__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
+ id int8 DEFAULT nextval('daily_income_seq'::regclass) NOT NULL, -- 일계부 수입 ID
+ daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ input_type varchar(5), -- 입력 구분(SELF, OCR)
+ category varchar(10), -- 유형
+ income_mark varchar(10), -- 수입 부호
+ expense_mark varchar(10), -- 지출 부호
+ is_credit bool, -- 외상판매 여부
+ crop_code varchar(255), -- 재배형태(매핑코드)
+ income_kind varchar(100), -- 수입의 종류
+ income_kind_mark varchar(10), -- 종류 부호
+ source_purpose varchar(100), -- 수입원(용도)
+ quantity varchar(10), -- 수량
+ unit_code varchar(255), -- 단위(매핑코드)
+ unit_self varchar(100), -- 단위(직접입력)
+ price int8, -- 현금(원)
+ estimated_value int8, -- 현물(평가액)
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
+
+ CONSTRAINT daily_income_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_daily_income__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_income IS '수입내역 - 일계부';
@@ -193,7 +196,6 @@ COMMENT ON COLUMN daily_income.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_income.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_income.is_deleted IS '삭제여부';
-
-- ============================================
-- TABLE : daily_expense
-- DESC : 지출내역 - 일계부
@@ -201,31 +203,31 @@ COMMENT ON COLUMN daily_income.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_expense_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_expense (
- id bigint DEFAULT nextval('daily_expense_seq') NOT NULL, -- 일계부 지출 ID
- daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
- input_type varchar(5), -- 입력 구분(SELF, OCR)
- category varchar(10), -- 유형
- income_mark varchar(10), -- 수입부호
- expense_mark varchar(10), -- 지출부호
- is_credit boolean, -- 외상판매 여부
- expense_kind varchar(100), -- 지출의 종류
- expense_kind_mark varchar(10), -- 종류 부호
- source_purpose varchar(10), -- 지출원(용도)
- quantity varchar(10), -- 수량
- unit_code varchar(255), -- 단위(매핑코드)
- unit_self varchar(100), -- 단위(직접입력)
- price bigint, -- 현금(원)
- estimated_value bigint, -- 현물(평가액)
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false, -- 삭제여부
+ id int8 DEFAULT nextval('daily_expense_seq'::regclass) NOT NULL, -- 일계부 지출 ID
+ daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ input_type varchar(5), -- 입력 구분(SELF, OCR)
+ category varchar(10), -- 유형
+ income_mark varchar(10), -- 수입부호
+ expense_mark varchar(10), -- 지출부호
+ is_credit bool, -- 외상판매 여부
+ expense_kind varchar(100), -- 지출의 종류
+ expense_kind_mark varchar(10), -- 종류 부호
+ source_purpose varchar(10), -- 지출원(용도)
+ quantity varchar(10), -- 수량
+ unit_code varchar(255), -- 단위(매핑코드)
+ unit_self varchar(100), -- 단위(직접입력)
+ price int8, -- 현금(원)
+ estimated_value int8, -- 현물(평가액)
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
- CONSTRAINT daily_expense_pkey PRIMARY KEY (id),
- CONSTRAINT fk_daily_expense__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
+ CONSTRAINT daily_expense_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_daily_expense__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_expense IS '지출내역 - 일계부';
@@ -253,7 +255,6 @@ COMMENT ON COLUMN daily_expense.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_expense.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_expense.is_deleted IS '삭제여부';
-
-- ============================================
-- TABLE : daily_work
-- DESC : 임업노동 투입내역 - 일계부
@@ -261,38 +262,38 @@ COMMENT ON COLUMN daily_expense.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_work_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_work (
- id bigint DEFAULT nextval('daily_work_seq') NOT NULL,
- daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
- item_name varchar(100),
- item_mark varchar(10),
- work_name varchar(100),
- work_mark varchar(10),
- work_land_area varchar(10),
- area_unit_code varchar(255),
- area_unit_self varchar(100),
- harvest_quantity varchar(10),
- harvest_unit_code varchar(255),
- harvest_unit_self varchar(100),
- owner_time varchar(10), -- 경영주 노동시간
- spouse_time varchar(10), -- 배우자 노동시간
- family_m_hours varchar(10), -- 가족 남 노동시간
- family_f_hours varchar(10), -- 가족 여 노동시간
- hired_m_hours varchar(10), -- 고용 남
- hired_f_hours varchar(10), -- 고용 여
- shared_m_hours varchar(10), -- 품앗이 남
- shared_f_hours varchar(10), -- 품앗이 여
- volunteer_m_hours varchar(10), -- 일손돕기 남
- volunteer_f_hours varchar(10), -- 일손돕기 여
- created_at timestamp(6),
- created_by varchar(255),
- updated_at timestamp(6),
- updated_by varchar(255),
- deleted_at timestamp(6),
- deleted_by varchar(255),
- is_deleted boolean NOT NULL DEFAULT false,
+ id int8 DEFAULT nextval('daily_work_seq'::regclass) NOT NULL, -- 투입내역 내부키
+ daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ item_name varchar(100), -- 품목명
+ item_mark varchar(10), -- 품목 부호
+ work_name varchar(100), -- 작업명
+ work_mark varchar(10), -- 작업 부호
+ work_land_area varchar(10), -- 작업 면적
+ area_unit_code varchar(255), -- 작업 면적 단위(코드매핑)
+ area_unit_self varchar(100), -- 작업 면적 단위(직접입력)
+ harvest_quantity varchar(10), -- 수확량
+ harvest_unit_code varchar(255), -- 수확량 단위(코드매핑)
+ harvest_unit_self varchar(100), -- 수확량 단위(직접입력)
+ owner_time varchar(10), -- 경영주 노동시간
+ spouse_time varchar(10), -- 배우자 노동시간
+ family_m_hours varchar(10), -- 가족 남 노동시간
+ family_f_hours varchar(10), -- 가족 여 노동시간
+ hired_m_hours varchar(10), -- 고용 남
+ hired_f_hours varchar(10), -- 고용 여
+ shared_m_hours varchar(10), -- 품앗이 남
+ shared_f_hours varchar(10), -- 품앗이 여
+ volunteer_m_hours varchar(10), -- 일손돕기 남
+ volunteer_f_hours varchar(10), -- 일손돕기 여
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
- CONSTRAINT daily_work_pkey PRIMARY KEY (id),
- CONSTRAINT fk_daily_work__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
+ CONSTRAINT daily_work_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_daily_work__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_work IS '임업노동 투입내역 - 일계부';
@@ -327,7 +328,6 @@ COMMENT ON COLUMN daily_work.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_work.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_work.is_deleted IS '삭제여부';
-
-- ============================================
-- TABLE : daily_power
-- DESC : 동력 사용시간 - 일계부
@@ -335,19 +335,19 @@ COMMENT ON COLUMN daily_work.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_power_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_power (
- id bigint DEFAULT nextval('daily_power_seq') NOT NULL, -- 동력사용시간 ID
- daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
- equipment_name varchar(100), -- 명칭
- equipment_mark varchar(10), -- 명칭 부호
- owned_hours varchar(10), -- 자가 시간
- leased_hours varchar(10), -- 임차 시간
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false, -- 삭제여부
+ id int8 DEFAULT nextval('daily_power_seq'::regclass) NOT NULL, -- 동력사용시간 ID
+ daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ equipment_name varchar(100), -- 명칭
+ equipment_mark varchar(10), -- 명칭 부호
+ owned_hours varchar(10), -- 자가 시간
+ leased_hours varchar(10), -- 임차 시간
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
CONSTRAINT daily_power_pkey PRIMARY KEY (id),
CONSTRAINT fk_daily_power__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
@@ -369,7 +369,6 @@ COMMENT ON COLUMN daily_power.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_power.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_power.is_deleted IS '삭제여부';
-
-- ============================================
-- TABLE : daily_forestry
-- DESC : 자가임업 생산물 중 자가소비량
@@ -377,31 +376,31 @@ COMMENT ON COLUMN daily_power.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_forestry_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_forestry (
- id bigint DEFAULT nextval('daily_forestry_seq') NOT NULL, -- 임업 자가소비량 일련번호
- daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
- income_mark varchar(10), -- 수입부호
- expense_mark varchar(10), -- 지출부호
- product_name varchar(100), -- 생산물
- usage varchar(100), -- 용도
- quantity varchar(10), -- 수량
- unit_code varchar(255), -- 단위(매핑코드)
- unit_self varchar(100), -- 단위(직접입력)
- estimated_value bigint, -- 현물평가
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부
+ id int8 DEFAULT nextval('daily_forestry_seq'::regclass) NOT NULL, -- 임업 자가소비량 일련번호
+ daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ income_mark varchar(10), -- 수입 부호
+ expense_mark varchar(10), -- 지출 부호
+ product_name varchar(100), -- 생산물
+ "usage" varchar(100), -- 용도
+ quantity varchar(10), -- 수량
+ unit_code varchar(255), -- 단위(매핑코드)
+ unit_self varchar(100), -- 단위(직접입력)
+ estimated_value int8, -- 현물평가
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
- CONSTRAINT daily_forestry_pkey PRIMARY KEY (id),
- CONSTRAINT fk_daily_forestry__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
+ CONSTRAINT daily_forestry_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_daily_forestry__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_forestry IS '자가임업 생산물 중 자가소비량';
-COMMENT ON COLUMN daily_forestry.id IS '임가 일련번호';
+COMMENT ON COLUMN daily_forestry.id IS '임업 자가소비량 일련번호';
COMMENT ON COLUMN daily_forestry.daily_record_seq IS '일계부 작성상태 일련번호';
COMMENT ON COLUMN daily_forestry.income_mark IS '수입 부호';
COMMENT ON COLUMN daily_forestry.expense_mark IS '지출 부호';
@@ -419,7 +418,6 @@ COMMENT ON COLUMN daily_forestry.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_forestry.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_forestry.is_deleted IS '삭제여부';
-
-- ============================================
-- TABLE : daily_farming
-- DESC : 자가농업 생산물 중 자가소비량
@@ -427,35 +425,36 @@ COMMENT ON COLUMN daily_forestry.is_deleted IS '삭제여부';
CREATE SEQUENCE daily_farming_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_farming (
- id bigint DEFAULT nextval('daily_farming_seq') NOT NULL, -- 농업 자가소비량 내부키
- daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
- income_mark varchar(10), -- 수입 부호
- expense_mark varchar(10), -- 지출 부호
- product_code varchar(255), -- 생산물(매핑코드)
- product_self varchar(100), -- 생산물(직접입력)
- usage varchar(100), -- 용도
- quantity varchar(10), -- 수량
- unit_code varchar(255), -- 단위(매핑코드)
- unit_self varchar(100), -- 단위(직접입력)
- estimated_value bigint, -- 현물평가액
- created_at timestamp(6), -- 생성일
- created_by varchar(255), -- 생성자
- updated_at timestamp(6), -- 수정일
- updated_by varchar(255), -- 수정자
- deleted_at timestamp(6), -- 삭제일
- deleted_by varchar(255), -- 삭제자
- is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부
+ id int8 DEFAULT nextval('daily_farming_seq'::regclass) NOT NULL, -- 농업 자가소비량 내부키
+ daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ income_mark varchar(10), -- 수입 부호
+ expense_mark varchar(10), -- 지출 부호
+ product_code varchar(255), -- 생산물(매핑코드)
+ product_self varchar(100), -- 생산물(직접입력)
+ "usage" varchar(100), -- 용도
+ quantity varchar(10), -- 수량
+ unit_code varchar(255), -- 단위(매핑코드)
+ unit_self varchar(100), -- 단위(직접입력)
+ estimated_value int8, -- 현물평가액
+ created_at timestamp(6), -- 생성일
+ created_by varchar(255), -- 생성자
+ updated_at timestamp(6), -- 수정일
+ updated_by varchar(255), -- 수정자
+ deleted_at timestamp(6), -- 삭제일
+ deleted_by varchar(255), -- 삭제자
+ is_deleted bool DEFAULT false, -- 삭제여부
- CONSTRAINT daily_farming_pkey PRIMARY KEY (id),
- CONSTRAINT fk_daily_farming__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
+ CONSTRAINT daily_farming_pkey PRIMARY KEY (id),
+ CONSTRAINT fk_daily_farming__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id)
);
COMMENT ON TABLE daily_farming IS '자가농업 생산물 중 자가소비량';
COMMENT ON COLUMN daily_farming.id IS '농업 자가소비량 내부키';
+COMMENT ON COLUMN daily_farming.daily_record_seq IS '일계부 작성상태 일련번호';
COMMENT ON COLUMN daily_farming.income_mark IS '수입부호';
COMMENT ON COLUMN daily_farming.expense_mark IS '지출부호';
-COMMENT ON COLUMN daily_farming.product_code IS '생산물(매핌코드)';
+COMMENT ON COLUMN daily_farming.product_code IS '생산물(매핑코드)';
COMMENT ON COLUMN daily_farming.product_self IS '생산물(직접입력)';
COMMENT ON COLUMN daily_farming.usage IS '용도';
COMMENT ON COLUMN daily_farming.quantity IS '수량';
@@ -470,6 +469,3 @@ COMMENT ON COLUMN daily_farming.deleted_at IS '삭제일';
COMMENT ON COLUMN daily_farming.deleted_by IS '삭제자';
COMMENT ON COLUMN daily_farming.is_deleted IS '삭제여부';
--- ============================================
--- 임가 일계부 입력 관련 테이블 E
--- ============================================
diff --git a/front/src/main/resources/templates/info/user/password.html b/front/src/main/resources/templates/info/user/password.html
index c862e938..bbb5f7b0 100644
--- a/front/src/main/resources/templates/info/user/password.html
+++ b/front/src/main/resources/templates/info/user/password.html
@@ -15,7 +15,7 @@