From a193facaf88220f8bdb38d5e23529ee558746a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 17 Jun 2025 17:10:07 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[DB]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/schema/02_create-record.sql | 62 +++++++++++++------ 1 file changed, 42 insertions(+), 20 deletions(-) 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 e36363a5..a94f9d1c 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -142,8 +142,10 @@ 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) + income_mark varchar(10), -- 수입부호 + expense_mark varchar(10), -- 지출부호 is_credit boolean, -- 외상판매 여부 - expense_mark_code varchar(10), -- 지출부호 + expense_mark_code varchar(10), -- 지출부호 TODO : 미사용 삭제하기 crop_code varchar(255), -- 재배형태 코드 (매핑코드) category_code varchar(255), -- 수입 종류(매핑코드) TODO : 미사용 삭제하기 category_self varchar(30), -- 수입 종류(직접입력) @@ -171,9 +173,9 @@ COMMENT ON COLUMN daily_income.id IS '일계부 수입 ID'; COMMENT ON COLUMN daily_income.daily_record_seq IS '일계부 작성상태 일련번호'; COMMENT ON COLUMN daily_income.input_type IS '입력 구분(SELF, OCR)'; COMMENT ON COLUMN daily_income.is_credit IS '외상판매 여부'; -COMMENT ON COLUMN daily_income.expense_mark_code IS '지출부호'; +COMMENT ON COLUMN daily_income.income_mark IS '수입부호'; +COMMENT ON COLUMN daily_income.expense_mark IS '지출부호'; COMMENT ON COLUMN daily_income.crop_code IS '재배형태 코드 (매핑코드)'; -COMMENT ON COLUMN daily_income.category_code IS '수입 종류(매핑코드)'; -- TODO : 미사용 삭제하기 COMMENT ON COLUMN daily_income.category_self IS '수입 종류(직접입력)'; COMMENT ON COLUMN daily_income.source_purpose IS '수입원(용도)'; COMMENT ON COLUMN daily_income.quantity IS '수량'; @@ -200,13 +202,15 @@ 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) + income_mark varchar(10), -- 수입부호 + expense_mark varchar(10), -- 지출부호 is_credit boolean, -- 외상판매 여부 - income_mark_code varchar(10), -- 수입부호 TODO : 수입종류와 다른것인지 판단 필요. 일단 다르다는 전제조건으로 생성 + income_mark_code varchar(10), -- 수입부호 TODO : 미사용 삭제하기 category_code varchar(255), -- 수입 종류(매핑코드) TODO : 미사용 삭제하기 category_self varchar(30), -- 수입 종류(직접입력) source_purpose varchar(10), -- 수입원(용도) quantity decimal(6,2), -- 수량 - unit_code varchar(255), -- 단위 (매핑코드) + unit_code varchar(255), -- 단위(매핑코드) unit_self varchar(30), -- 단위(직접입력) price integer, -- 현금(원) estimated_value integer, -- 현물(평가액) @@ -227,9 +231,9 @@ COMMENT ON TABLE daily_expense IS '지출내역 - 일계부'; COMMENT ON COLUMN daily_expense.id IS '일계부 지출 ID'; COMMENT ON COLUMN daily_expense.daily_record_seq IS '일계부 작성상태 일련번호'; COMMENT ON COLUMN daily_expense.input_type IS '입력 구분(SELF, OCR)'; +COMMENT ON COLUMN daily_expense.income_mark IS '수입부호'; +COMMENT ON COLUMN daily_expense.expense_mark IS '지출부호'; COMMENT ON COLUMN daily_expense.is_credit IS '외상판매 여부'; -COMMENT ON COLUMN daily_expense.income_mark_code IS '수입부호'; -COMMENT ON COLUMN daily_expense.category_code IS '지출 종류(매핑코드)'; -- TODO : 미사용 삭제하기 COMMENT ON COLUMN daily_expense.category_self IS '지출 종류(직접입력)'; COMMENT ON COLUMN daily_expense.source_purpose IS '지출원(용도)'; COMMENT ON COLUMN daily_expense.quantity IS '수량'; @@ -255,13 +259,16 @@ 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) + income_mark varchar(10), -- 수입부호 + expense_mark varchar(10), -- 지출부호 item_code varchar(255) NOT NULL, item_mark_code varchar(255), work_code varchar(255) NOT NULL, work_mark_code varchar(255), work_land_area int, harvest_quantity decimal(7,2), - unit_code varchar(10), + unit_code varchar(255), + unit_self varchar(30), -- 단위(직접입력) owner_time decimal(5,2), -- 경영주 노동시간 spouse_time decimal(5,2), -- 배우자 노동시간 family_m_hours decimal(5,2), -- 가족 남 노동시간 @@ -288,13 +295,16 @@ COMMENT ON TABLE daily_work IS '임업노동 투입내역 - 일계부'; COMMENT ON COLUMN daily_work.id IS '투입내역 내부키'; COMMENT ON COLUMN daily_work.daily_record_seq IS '일계부 작성상태 일련번호'; +COMMENT ON COLUMN daily_work.income_mark IS '수입부호'; +COMMENT ON COLUMN daily_work.expense_mark IS '지출부호'; COMMENT ON COLUMN daily_work.item_code IS '품목명 (매핑코드)'; COMMENT ON COLUMN daily_work.item_mark_code IS '품목부호 (매핑코드)'; COMMENT ON COLUMN daily_work.work_code IS '작업명 (매핑코드)'; COMMENT ON COLUMN daily_work.work_mark_code IS '작업부호 (매핑코드)'; COMMENT ON COLUMN daily_work.work_land_area IS '작업면적'; COMMENT ON COLUMN daily_work.harvest_quantity IS '수확량'; -COMMENT ON COLUMN daily_work.unit_code IS '단위 (코드매핑)'; +COMMENT ON COLUMN daily_work.unit_code IS '단위(코드매핑)'; +COMMENT ON COLUMN daily_work.unit_self IS '단위(직접입력)'; COMMENT ON COLUMN daily_work.owner_time IS '경영주 노동시간'; COMMENT ON COLUMN daily_work.spouse_time IS '배우자 노동시간'; COMMENT ON COLUMN daily_work.family_m_hours IS '가족 남 노동시간'; @@ -366,6 +376,8 @@ 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) + income_mark varchar(10), -- 수입부호 + expense_mark varchar(10), -- 지출부호 equipment_name varchar(15), -- 명칭 owned_mark_code varchar(255), -- 자가 부호 (매핑코드) TODO : 명칭 >> 자가로 변경 owned_hours decimal(5,2), -- 자가 시간 @@ -385,7 +397,9 @@ CREATE TABLE daily_power ( COMMENT ON TABLE daily_power IS '동력 사용시간 - 일계부'; COMMENT ON COLUMN daily_power.id IS '동력사용시간 ID'; -COMMENT ON COLUMN daily_income.daily_record_seq IS '일계부 작성상태 일련번호'; +COMMENT ON COLUMN daily_power.daily_record_seq IS '일계부 작성상태 일련번호'; +COMMENT ON COLUMN daily_power.income_mark IS '수입부호'; +COMMENT ON COLUMN daily_power.expense_mark IS '지출부호'; COMMENT ON COLUMN daily_power.equipment_name IS '명칭'; COMMENT ON COLUMN daily_power.owned_mark_code IS '자가 부호 (매핑코드)'; COMMENT ON COLUMN daily_power.owned_hours IS '자가 시간'; @@ -408,12 +422,15 @@ 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_code varchar(255), -- 수입 코드 (매핑코드) TODO : 필요유무 - expense_code varchar(255), -- 지출 코드 (매핑코드) TODO : 필요유무 + income_mark varchar(10), -- 수입부호 + expense_mark varchar(10), -- 지출부호 + income_code varchar(255), -- 수입 코드 (매핑코드) TODO : 미사용 삭제 + expense_code varchar(255), -- 지출 코드 (매핑코드) TODO : 미사용 삭제 product_name varchar(15), -- 생산물 usage varchar(20), -- 용도 quantity decimal(6,2), -- 수량 - unit_code varchar(10), -- 단위 (매핑코드) + unit_code varchar(255), -- 단위(매핑코드) + unit_self varchar(30), -- 단위(직접입력) estimated_value integer, -- 현물평가 created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 @@ -431,12 +448,13 @@ COMMENT ON TABLE daily_forestry IS '자가임업 생산물 중 자가소비량'; COMMENT ON COLUMN daily_forestry.id IS '임가 일련번호'; COMMENT ON COLUMN daily_forestry.daily_record_seq IS '일계부 작성상태 일련번호'; -COMMENT ON COLUMN daily_forestry.income_code IS '수입 코드(매핑코드)'; -COMMENT ON COLUMN daily_forestry.expense_code IS '지출 코드(매핑코드)'; +COMMENT ON COLUMN daily_forestry.income_mark IS '수입부호'; +COMMENT ON COLUMN daily_forestry.expense_mark IS '지출부호'; COMMENT ON COLUMN daily_forestry.product_name IS '생산물'; COMMENT ON COLUMN daily_forestry.usage IS '용도'; COMMENT ON COLUMN daily_forestry.quantity IS '수량'; COMMENT ON COLUMN daily_forestry.unit_code IS '단위(매핑코드)'; +COMMENT ON COLUMN daily_forestry.unit_self IS '단위(직접입력)'; COMMENT ON COLUMN daily_forestry.estimated_value IS '현물평가'; COMMENT ON COLUMN daily_forestry.created_at IS '생성일'; COMMENT ON COLUMN daily_forestry.created_by IS '생성자'; @@ -458,13 +476,16 @@ CREATE TABLE daily_farming ( daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) week_date date, -- 입력차수일(yyyy-mm-dd) week smallint, -- 입력차수(1,2,3,4) - income_code varchar(255), -- 수입 코드 (매핑코드) TODO : 필요유무 - expense_code varchar(255), -- 지출 코드 (매핑코드) TODO : 필요유무 + income_mark varchar(10), -- 수입부호 + expense_mark varchar(10), -- 지출부호 + income_code varchar(255), -- 수입 코드 (매핑코드) TODO : 미사용 삭제하기 + expense_code varchar(255), -- 지출 코드 (매핑코드) TODO : 미사용 삭제하기 product_name varchar(15), -- 생산물 product_detail varchar(20), -- 생산물 상세 TODO : 필요유무 usage varchar(20), -- 용도 quantity decimal(6,2), -- 수량 - unit_code varchar(10), -- 단위 (매핑코드) + unit_code varchar(255), -- 단위 (매핑코드) + unit_self varchar(30), -- 단위(직접입력) estimated_value integer, -- 현물평가액 created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 @@ -483,13 +504,14 @@ COMMENT ON TABLE daily_farming IS '자가농업 생산물 중 자가소비량'; COMMENT ON COLUMN daily_farming.id IS '농업 자가소비량 내부키'; COMMENT ON COLUMN daily_farming.week_date IS '입력차수일'; COMMENT ON COLUMN daily_farming.week IS '입력차수(1,2,3,4)'; -COMMENT ON COLUMN daily_farming.income_code IS '수입 코드(매핑코드)'; -COMMENT ON COLUMN daily_farming.expense_code IS '지출 코드(매핑코드)'; +COMMENT ON COLUMN daily_farming.income_mark IS '수입부호'; +COMMENT ON COLUMN daily_farming.expense_mark IS '지출부호'; COMMENT ON COLUMN daily_farming.product_name IS '생산물'; COMMENT ON COLUMN daily_farming.product_detail IS '생산물 상세'; COMMENT ON COLUMN daily_farming.usage IS '용도'; COMMENT ON COLUMN daily_farming.quantity IS '수량'; COMMENT ON COLUMN daily_farming.unit_code IS '단위(매핑코드)'; +COMMENT ON COLUMN daily_farming.unit_self IS '단위(직접입력)'; COMMENT ON COLUMN daily_farming.estimated_value IS '현물평가'; COMMENT ON COLUMN daily_farming.created_at IS '생성일'; COMMENT ON COLUMN daily_farming.created_by IS '생성자'; From 9a215b12210d52be77733005c1da27cc2f0f3f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 17 Jun 2025 18:13:07 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EC=88=98=20?= =?UTF-8?q?=EC=88=98=EC=9E=85/=EC=A7=80=EC=B6=9C=EC=9D=98=20=EB=B6=80?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD,=20UICODE=20INIT,=20=EB=8B=AC?= =?UTF-8?q?=EB=A0=A5=20JS=20=EB=B3=80=EA=B2=BD=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/sql/data/02_uicode.sql | 65 +++++++++++++++---- .../application/DailyExpenseService.java | 3 +- .../domain/CreateDailyExpenseCmd.java | 3 +- .../ports/application/DailyIncomeService.java | 3 +- .../domain/CreateDailyIncomeCmd.java | 3 +- .../mappers/daily/DailyExpenseMapper.xml | 10 +-- .../mappers/daily/DailyIncomeMapper.xml | 10 +-- .../templates/common/components.html | 4 +- .../resources/templates/record/calendar.html | 26 +++++--- .../resources/templates/record/daily.html | 12 ++-- .../templates/record/income/index.html | 2 + 11 files changed, 100 insertions(+), 41 deletions(-) diff --git a/core/src/main/resources/sql/data/02_uicode.sql b/core/src/main/resources/sql/data/02_uicode.sql index 6701ebaf..ce9184e4 100644 --- a/core/src/main/resources/sql/data/02_uicode.sql +++ b/core/src/main/resources/sql/data/02_uicode.sql @@ -118,17 +118,58 @@ VALUES -- 재배형태 ('code.record.crop', 'code.record', '재배형태', NULL, NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.crop.11', 'code.record.crop', '당년산/일반', '11', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.crop.12', 'code.record.crop', '당년산/유기농', '12', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.crop.13', 'code.record.crop', '당년산/무농약', '13', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.crop.15', 'code.record.crop', '당년산/GAP 인증', '15', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.11', 'code.record.crop', '당년산/ 일반', '11', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.12', 'code.record.crop', '당년산 / 친환경 인증 / 유기농', '12', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.13', 'code.record.crop', '당년산 / 친환경 인증 / 무농약', '13', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.15', 'code.record.crop', '당년산 / GAP 인증', '15', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.21', 'code.record.crop', '전년산 / 일반', '21', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.22', 'code.record.crop', '전년산 / 친환경 인증 / 유기농', '22', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.23', 'code.record.crop', '전년산 / 친환경 인증 / 무농약', '23', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.24', 'code.record.crop', '전년산 / 친환경 인증 / 저농약', '24', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.crop.25', 'code.record.crop', '전년산 / GAP 인증', '25', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), --- 단위 Code -('code.record.unit', 'code.record', '단위 Code', NULL, NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.unit.gram', 'code.record.unit', 'g', 'g', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.unit.kg', 'code.record.unit', 'kg', 'kg', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +-- 면적 +('code.record.area', 'code.record', '면적', NULL, NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.area.11', 'code.record.area', '평', '평', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.area.12', 'code.record.area', 'm2 (제곱미터)', 'm2', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.area.13', 'code.record.area', 'ha (헥타르)', 'ha', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.area.14', 'code.record.area', '정보', '정보', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.area.self', 'code.record.area', '직접 입력', 'SELF', NULL, true, 99, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), + +-- 수확량(판매량) 단위 +('code.record.unit', 'code.record', '수확량(판매량) 단위', NULL, NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.gram', 'code.record.unit', 'g (그램)', 'g', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.kg', 'code.record.unit', 'kg (킬로그램)', 'kg', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.13', 'code.record.unit', '근', '근', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.14', 'code.record.unit', '관', '관', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.15', 'code.record.unit', 'L (리터)', 'L', NULL, true, 4, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.16', 'code.record.unit', '되', '되', NULL, true, 5, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.17', 'code.record.unit', '말', '말', NULL, true, 6, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.18', 'code.record.unit', '섬', '섬', NULL, true, 7, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.unit.self', 'code.record.unit', '직접 입력', 'SELF', NULL, true, 99, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), + +-- 자가농업 생산물 중 자가소비량 +('code.record.farming', 'code.record', '자가농업 생산물 중 자가소비량', NULL, NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.11', 'code.record.farming', '쌀', '12111,81012', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.12', 'code.record.farming', '찹쌀', '12111,81012', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.13', 'code.record.farming', '보리', '12111,81012', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.14', 'code.record.farming', '콩', '12114,81012', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.15', 'code.record.farming', '팥', '12114,81012', NULL, true, 4, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.16', 'code.record.farming', '고구마', '12114,81012', NULL, true, 5, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.17', 'code.record.farming', '감자', '12114,81012', NULL, true, 6, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.18', 'code.record.farming', '배추', '12115,81012', NULL, true, 7, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.19', 'code.record.farming', '고추', '12115,81012', NULL, true, 8, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.20', 'code.record.farming', '마늘', '12115,81012', NULL, true, 9, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.21', 'code.record.farming', '양파', '12115,81012', NULL, true, 10, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.22', 'code.record.farming', '파', '12115,81012', NULL, true, 11, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.23', 'code.record.farming', '오이', '12115,81012', NULL, true, 12, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.24', 'code.record.farming', '무', '12115,81012', NULL, true, 13, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.25', 'code.record.farming', '김치', '12115,81012', NULL, true, 14, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.26', 'code.record.farming', '닭', '12122,81012', NULL, true, 15, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.27', 'code.record.farming', '달걀', '12123,81012', NULL, true, 16, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.28', 'code.record.farming', '과일', '12117,81012', NULL, true, 17, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.29', 'code.record.farming', '수수', '12113,81012', NULL, true, 18, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.30', 'code.record.farming', '기장', '12113,81012', NULL, true, 19, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.31', 'code.record.farming', '깨', '12116,81012', NULL, true, 20, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.self', 'code.record.farming', '직접 입력', 'SELF', NULL, true, 99, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false); --- 수입 종류 -('code.record.income', 'code.record', '단위 Code', NULL, NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.income.01', 'code.record.income', '종류1', '01', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.income.02', 'code.record.income', '종류2', '02', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false); diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java index 6c67275c..e0bee7b3 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java @@ -94,9 +94,10 @@ public class DailyExpenseService implements DailyExpensePortIn { new CreateDailyExpenseCmd( formVO.getId(), formVO.getDailyRecordSeq(), + (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 + null, formVO.getInputType(), formVO.getCredit(), - (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 formVO.getCategorySelf(), formVO.getSourcePurpose(), formVO.getQuantity(), diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java index 16e5857d..2376b927 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java @@ -13,9 +13,10 @@ import lombok.ToString; public class CreateDailyExpenseCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; + private String incomeMark; + private String expenseMark; private String inputType; private Boolean credit; - private String incomeMarkCode; private String categorySelf; private String sourcePurpose; private Integer quantity; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java index ed28c76b..e72535ce 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java @@ -97,10 +97,11 @@ public class DailyIncomeService implements DailyIncomePortIn { new CreateDailyIncomeCmd( formVO.getId(), formVO.getDailyRecordSeq(), + null, + (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 formVO.getInputType(), formVO.getCredit(), formVO.getCropCode(), - (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 formVO.getCategorySelf(), formVO.getSourcePurpose(), formVO.getQuantity(), diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java index 36c63819..06d1ceb9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java @@ -13,10 +13,11 @@ import lombok.ToString; public class CreateDailyIncomeCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; + private String incomeMark; + private String expenseMark; private String inputType; private Boolean credit; private String cropCode; - private String expenseMarkCode; private String categorySelf; private String sourcePurpose; private Integer quantity; diff --git a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml index cfa0ea57..b14cf298 100644 --- a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml @@ -29,13 +29,14 @@ insert into daily_expense ( - daily_record_seq, input_type, is_credit, income_mark_code, category_self, source_purpose + daily_record_seq, income_mark, expense_mark + , input_type, is_credit, category_self, source_purpose , quantity, unit_code, unit_self, price, estimated_value , is_deleted , ) values ( - #{dailyRecordSeq} - , #{inputType}, #{credit}, #{incomeMarkCode}, #{categorySelf}, #{sourcePurpose} + #{dailyRecordSeq}, #{incomeMark}, #{expenseMark} + , #{inputType}, #{credit}, #{categorySelf}, #{sourcePurpose} , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} , false , @@ -45,7 +46,8 @@ update daily_expense set , is_credit = #{credit} - , income_mark_code = #{incomeMarkCode} + , income_mark = #{incomeMark} + , expense_mark = #{expenseMark} , category_self = #{categorySelf} , source_purpose = #{sourcePurpose} , quantity = #{quantity} diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index 31af2f1a..d6e746b0 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -29,13 +29,14 @@ insert into daily_income ( - daily_record_seq, input_type, is_credit, expense_mark_code, crop_code, category_self, source_purpose + daily_record_seq, income_mark, expense_mark + , input_type, is_credit, crop_code, category_self, source_purpose , quantity, unit_code, unit_self, price, estimated_value , is_deleted , ) values ( - #{dailyRecordSeq} - , #{inputType}, #{credit}, #{expenseMarkCode}, #{cropCode}, #{categorySelf}, #{sourcePurpose} + #{dailyRecordSeq}, #{incomeMark}, #{expenseMark} + , #{inputType}, #{credit}, #{cropCode}, #{categorySelf}, #{sourcePurpose} , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} , false , @@ -45,7 +46,8 @@ update daily_income set , is_credit = #{credit} - , expense_mark_code = #{expenseMarkCode} + , income_mark = #{incomeMark} + , expense_mark = #{expenseMark} , crop_code = #{cropCode} , category_self = #{categorySelf} , source_purpose = #{sourcePurpose} diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index b27d66da..1aa00ef8 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -26,8 +26,8 @@ - - + + diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index c78dfa4e..f0dfa54e 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -410,10 +410,10 @@ } } - new DatepickerComponent(function(list, currentDate, viewDate){ - console.log('changeDateCallback', list, currentDate, viewDate); + new DatepickerComponent(function(rowdata, currentDate, viewDate){ + console.log('changeDateCallback', rowdata, currentDate, viewDate); - formControl.setDetail(list, currentDate, viewDate); + formControl.setDetail(this.currentMonth, rowdata, currentDate, viewDate); }, function(monthKey, currentDate){ console.log('changeMonthCallback', monthKey, currentDate); @@ -445,9 +445,14 @@ }; let formControl = { - setDetail(list, currentDate, viewDate) { - const todoList = list.filter(f => !(f.code === 'MONTHLY' || f.code === 'BANK')); - const etcList = list.filter(f => f.code === 'MONTHLY' || f.code === 'BANK'); + setDetail(searchMonth, rowdata, currentDate, viewDate) { + console.log(typeof rowdata, searchMonth, rowdata.no, rowdata.children) + let todoList = []; + let etcList = []; + if (typeof rowdata === 'object' && rowdata.children !== undefined) { + todoList = rowdata.children.filter(f => !(f.code === 'MONTHLY' || f.code === 'BANK')); + etcList = rowdata.children.filter(f => f.code === 'MONTHLY' || f.code === 'BANK'); + } console.log(todoList) console.log(etcList) @@ -455,23 +460,26 @@ let html = ''; if (todoList === undefined || todoList.length === 0) { html = tmpl.render({ + month: searchMonth, + no: rowdata.no, date: currentDate, etcList: etcList, }); } else { tmpl = $.templates('#dailyListTmpl'); html = tmpl.render({ + month: searchMonth, + no: rowdata.no, date: currentDate, list: todoList, etcList: etcList, }); } - console.log(html) $('#selectedDay').html(html); }, recordCreate(searchMonth, groupNo) { - location.href = ENV.httpUrl.create.replace('{searchMonth}', searchMonth).replace('{groupNo}', groupNo); + location.href = ENV.httpUrl.create.replace('{searchMonth}', searchMonth.replace('-', '')).replace('{groupNo}', groupNo); }, }; @@ -479,7 +487,7 @@ {{include tmpl="#titleTmpl" /}}
-
diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily.html index 43b644d3..39cefb1a 100644 --- a/front/src/main/resources/templates/record/daily.html +++ b/front/src/main/resources/templates/record/daily.html @@ -40,7 +40,7 @@ -
+
-
+ -
-
+
*/-->
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index df3d4e6a..de1251bd 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -179,9 +179,11 @@ $('input[name="unitCode"]').val(dataValue) // TODO : ui js 에서 show 적용유무 파악하기 + /* if (dataValue === 'code.record.unit.self') { $('#unitCode').parent().find('.component-input').addClass('show'); } + */ } }); From 3f9b74d1f6da2577d61b69d84eff280e9d212dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=9A=B0=EC=84=B1?= Date: Tue, 17 Jun 2025 20:13:45 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=9D=B4=EC=B2=B4=20-=20?= =?UTF-8?q?=EC=88=98=EC=9E=85=20=EC=99=84=EB=A3=8C=20(=ED=98=95=ED=83=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EC=95=84=EC=A7=81=20=ED=95=84=EC=9A=94?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/CreateBankDao.java | 51 ++++++++ .../persistence/CreateBankMapper.java | 9 ++ .../model/CreateForestProductDto.java | 43 +++++++ .../createBank/ports/CreateBankPortIn.java | 11 ++ .../createBank/ports/CreateBankPortOut.java | 11 ++ .../ports/application/CreateBankService.java | 24 ++++ .../ports/application/domain/CreateBank.java | 14 +++ .../application/domain/CreateBankCmd.java | 33 ++++++ .../adapters/persistence/GetBanksDao.java | 57 +++++++++ .../adapters/persistence/GetBanksMapper.java | 17 +++ .../persistence/model/GetBanksDto.java | 41 +++++++ .../bank/getBanks/ports/GetBanksPortIn.java | 12 ++ .../bank/getBanks/ports/GetBanksPortOut.java | 12 ++ .../ports/application/GetBanksService.java | 23 ++++ .../ports/application/domain/GetBanks.java | 41 +++++++ .../ports/application/domain/GetBanksCmd.java | 16 +++ .../adapters/persistence/RemoveBanksDao.java | 26 ++++ .../persistence/RemoveBanksMapper.java | 9 ++ .../persistence/model/RemoveBanksDto.java | 20 ++++ .../removeBanks/ports/RemoveBanksPortIn.java | 7 ++ .../removeBanks/ports/RemoveBanksPortOut.java | 7 ++ .../ports/application/RemoveBanksService.java | 19 +++ .../application/domain/RemoveBanksCmd.java | 17 +++ .../web/CreateBankInputController.java | 112 ++++++++++++++++++ .../web/GetBankInputUIController.java | 32 ++++- .../model/CreateBankInputProductReqVO.java | 31 +++++ .../web/model/CreateBankInputReqVO.java | 29 +++++ .../RemoveMonthForestProductsDao.java | 2 +- .../model/RemoveMonthForestProductsParam.java | 2 +- .../domain/RemoveMonthForestProductsCmd.java | 2 +- .../mappers/bank/CreateBankMapper.xml | 57 +++++++++ .../resources/mappers/bank/GetBanksMapper.xml | 67 +++++++++++ .../mappers/bank/RemoveBanksMapper.xml | 16 +++ .../product/CreateForestProductMapper.xml | 2 +- .../RemoveMonthForestProductsMapper.xml | 2 +- .../resources/templates/info/bank/input.html | 71 +++++++---- .../templates/info/bank/inputForm.html | 3 +- 37 files changed, 920 insertions(+), 28 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java create mode 100644 front/src/main/resources/mappers/bank/CreateBankMapper.xml create mode 100644 front/src/main/resources/mappers/bank/GetBanksMapper.xml create mode 100644 front/src/main/resources/mappers/bank/RemoveBanksMapper.xml diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java new file mode 100644 index 00000000..b13c8fb6 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankDao.java @@ -0,0 +1,51 @@ +package app.module.front.usecase.info.bank.createBank.adapters.persistence; + +import app.module.front.usecase.info.bank.createBank.adapters.persistence.model.CreateForestProductDto; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortOut; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Repository +@RequiredArgsConstructor +class CreateBankDao implements CreateBankPortOut { + + private final CreateBankMapper mapper; + + @Override + @Transactional + public Optional operate(CreateBankCmd cmd) { + + + CreateForestProductDto dto = + new CreateForestProductDto( + null, + cmd.getHouseholdSeq(), + cmd.getTransferType(), + cmd.getCropCode(), + cmd.getTransferCategoryCode(), + cmd.getTransferCategory(), + cmd.getIncomeCode(), + cmd.getExpenseCode(), + cmd.getSourcePurpose(), + cmd.getCount(), + cmd.getUnitCode(), + cmd.getPrice(), + cmd.getMonth(), + cmd.getMonthlyInputStatusId(), + cmd.getCreatedAt(), + cmd.getCreatedBy(), + cmd.getUpdatedAt(), + cmd.getUpdatedBy() + ); + + mapper.createBank(dto); + + + return Optional.of(new CreateBank(dto.getId())); + } +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java new file mode 100644 index 00000000..1b5087ae --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/CreateBankMapper.java @@ -0,0 +1,9 @@ +package app.module.front.usecase.info.bank.createBank.adapters.persistence; + +import app.module.front.usecase.info.bank.createBank.adapters.persistence.model.CreateForestProductDto; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateBankMapper { + void createBank(CreateForestProductDto dto); +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java new file mode 100644 index 00000000..11f4bd93 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/adapters/persistence/model/CreateForestProductDto.java @@ -0,0 +1,43 @@ +package app.module.front.usecase.info.bank.createBank.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class CreateForestProductDto { + + private Long id; + private Long householdSeq; + + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java new file mode 100644 index 00000000..87e94452 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortIn.java @@ -0,0 +1,11 @@ +package app.module.front.usecase.info.bank.createBank.ports; + +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; + +import java.util.Optional; + +public interface CreateBankPortIn { + + Optional operate(CreateBankCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java new file mode 100644 index 00000000..a4347bd2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/CreateBankPortOut.java @@ -0,0 +1,11 @@ +package app.module.front.usecase.info.bank.createBank.ports; + +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; + +import java.util.Optional; + +public interface CreateBankPortOut { + + Optional operate(CreateBankCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java new file mode 100644 index 00000000..18e4e463 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/CreateBankService.java @@ -0,0 +1,24 @@ +package app.module.front.usecase.info.bank.createBank.ports.application; + +import app.module.core.config.application.annotation.CreateCommand; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortIn; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortOut; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBank; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +class CreateBankService implements CreateBankPortIn { + + private final CreateBankPortOut portOut; + + @Override + @CreateCommand + public Optional operate(CreateBankCmd command) { + return portOut.operate(command); + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java new file mode 100644 index 00000000..cfee695b --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBank.java @@ -0,0 +1,14 @@ +package app.module.front.usecase.info.bank.createBank.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateBank { + private Long id; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java new file mode 100644 index 00000000..048fa4e2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/createBank/ports/application/domain/CreateBankCmd.java @@ -0,0 +1,33 @@ +package app.module.front.usecase.info.bank.createBank.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateBankCmd extends AuditCommand { + private Long householdSeq; + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java new file mode 100644 index 00000000..c8df24a7 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksDao.java @@ -0,0 +1,57 @@ +package app.module.front.usecase.info.bank.getBanks.adapters.persistence; + +import app.module.front.usecase.info.bank.getBanks.adapters.persistence.model.GetBanksDto; +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortOut; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.ListUtils; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +class GetBanksDao implements GetBanksPortOut { + + private final GetBanksMapper mapper; + + @Override + public Page operate(Pageable pageable, GetBanksCmd command) { + // 게시물 목록 얻기 + List contents = + ListUtils.emptyIfNull(mapper.getBanks(pageable, command)); + + return new PageImpl<>( + contents.stream() + .map( + article -> + new GetBanks( + article.getId(), + article.getHouseholdSeq(), + article.getTransferType(), + article.getCropCode(), + article.getTransferCategoryCode(), + article.getTransferCategory(), + article.getIncomeCode(), + article.getExpenseCode(), + article.getSourcePurpose(), + article.getCount(), + article.getUnitCode(), + article.getPrice(), + article.getMonth(), + article.getMonthlyInputStatusId(), + article.getCreatedAt(), + article.getCreatedBy(), + article.getUpdatedAt(), + article.getUpdatedBy())) + .collect(Collectors.toList()), + pageable, + contents.isEmpty() ? 0 : contents.get(0).getTotal()); + } + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java new file mode 100644 index 00000000..60e629d4 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/GetBanksMapper.java @@ -0,0 +1,17 @@ +package app.module.front.usecase.info.bank.getBanks.adapters.persistence; + +import app.module.front.usecase.info.bank.getBanks.adapters.persistence.model.GetBanksDto; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +@Mapper +public interface GetBanksMapper { + List getBanks( + @Param("pageable") Pageable pageable, @Param("cmd") GetBanksCmd cmd); + + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java new file mode 100644 index 00000000..8ea9f471 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/adapters/persistence/model/GetBanksDto.java @@ -0,0 +1,41 @@ +package app.module.front.usecase.info.bank.getBanks.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +public class GetBanksDto { + + private Long id; + private Long householdSeq; + + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; + + private Long total; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java new file mode 100644 index 00000000..ed2c3d81 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortIn.java @@ -0,0 +1,12 @@ +package app.module.front.usecase.info.bank.getBanks.ports; + +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetBanksPortIn { + + Page operate(Pageable pageable, GetBanksCmd command); + +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java new file mode 100644 index 00000000..06032003 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/GetBanksPortOut.java @@ -0,0 +1,12 @@ +package app.module.front.usecase.info.bank.getBanks.ports; + +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface GetBanksPortOut { + + Page operate(Pageable pageable, GetBanksCmd command); + +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java new file mode 100644 index 00000000..74a07b28 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/GetBanksService.java @@ -0,0 +1,23 @@ +package app.module.front.usecase.info.bank.getBanks.ports.application; + +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortIn; +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortOut; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetBanksService implements GetBanksPortIn { + + private final GetBanksPortOut portOut; + + @Override + public Page operate(Pageable pageable, GetBanksCmd command) { + return portOut.operate(pageable, command); + } + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java new file mode 100644 index 00000000..7d28cec1 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanks.java @@ -0,0 +1,41 @@ +package app.module.front.usecase.info.bank.getBanks.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBanks { + + private Long id; + private Long householdSeq; + + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + private String month; + + private Long monthlyInputStatusId; + + private LocalDateTime createdAt; + private String createdBy; + private LocalDateTime updatedAt; + private String updatedBy; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java new file mode 100644 index 00000000..ed9ad650 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java @@ -0,0 +1,16 @@ +package app.module.front.usecase.info.bank.getBanks.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBanksCmd { + + private Long monthlyInputStatusId; + private Long householdSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java new file mode 100644 index 00000000..1f4d1edd --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksDao.java @@ -0,0 +1,26 @@ +package app.module.front.usecase.info.bank.removeBanks.adapters.persistence; + +import app.module.core.config.application.util.CommonUtil; +import app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model.RemoveBanksDto; +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortOut; +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.time.LocalDateTime; + +@Repository +@RequiredArgsConstructor +class RemoveBanksDao implements RemoveBanksPortOut { + + private final RemoveBanksMapper mapper; + + @Override + public void operate(RemoveBanksCmd command) { + String loginUser = CommonUtil.getLoginUsername();; + LocalDateTime now = LocalDateTime.now(); + + mapper.deleteBanks( + new RemoveBanksDto(command.getMonthlyInputStatusId(), command.getHouseholdSeq(), command.getTransferType(), now, loginUser, now, loginUser)); + } +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java new file mode 100644 index 00000000..8bcf3faf --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/RemoveBanksMapper.java @@ -0,0 +1,9 @@ +package app.module.front.usecase.info.bank.removeBanks.adapters.persistence; + +import app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model.RemoveBanksDto; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveBanksMapper { + void deleteBanks(RemoveBanksDto param); +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java new file mode 100644 index 00000000..092ba512 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/adapters/persistence/model/RemoveBanksDto.java @@ -0,0 +1,20 @@ +package app.module.front.usecase.info.bank.removeBanks.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +public class RemoveBanksDto { + private Long monthlyInputStatusId; + private Long householdSeq; + private String transferType; + private LocalDateTime updatedAt; + private String updatedBy; + private LocalDateTime deletedAt; + private String deletedBy; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java new file mode 100644 index 00000000..522f6a59 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortIn.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.info.bank.removeBanks.ports; + +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; + +public interface RemoveBanksPortIn { + void operate(RemoveBanksCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java new file mode 100644 index 00000000..80999619 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/RemoveBanksPortOut.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.info.bank.removeBanks.ports; + +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; + +public interface RemoveBanksPortOut { + void operate(RemoveBanksCmd command); +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java new file mode 100644 index 00000000..63ef4bb8 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/RemoveBanksService.java @@ -0,0 +1,19 @@ +package app.module.front.usecase.info.bank.removeBanks.ports.application; + +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortIn; +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortOut; +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class RemoveBanksService implements RemoveBanksPortIn { + + private final RemoveBanksPortOut portOut; + + @Override + public void operate(RemoveBanksCmd command) { + portOut.operate(command); + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java new file mode 100644 index 00000000..026724bb --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bank/removeBanks/ports/application/domain/RemoveBanksCmd.java @@ -0,0 +1,17 @@ +package app.module.front.usecase.info.bank.removeBanks.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class RemoveBanksCmd { + private Long monthlyInputStatusId; + private Long householdSeq; + + private String transferType; +} diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java new file mode 100644 index 00000000..680fd404 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java @@ -0,0 +1,112 @@ +package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web; + +import app.module.core.config.application.enums.MonthStatus; +import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.uicode.view.ports.UICodeViewPortIn; +import app.module.core.usecase.uicode.view.ports.application.domain.UICodeView; +import app.module.front.config.application.response.ApiResponse; +import app.module.front.config.application.util.AuthUtil; +import app.module.front.usecase.info.bank.createBank.ports.CreateBankPortIn; +import app.module.front.usecase.info.bank.createBank.ports.application.domain.CreateBankCmd; +import app.module.front.usecase.info.bank.removeBanks.ports.RemoveBanksPortIn; +import app.module.front.usecase.info.bank.removeBanks.ports.application.domain.RemoveBanksCmd; +import app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model.CreateBankInputProductReqVO; +import app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model.CreateBankInputReqVO; +import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; +import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; +import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; +import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.UpdateMonthlyInputStatusPortIn; +import app.module.front.usecase.info.monthly.updateMonthlyInputStatus.ports.application.domain.UpdateMonthlyInputStatusCmd; +import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.CreateForestProductPortIn; +import app.module.front.usecase.info.monthlyProduct.createForestProduct.ports.application.domain.CreateForestProductCmd; +import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.RemoveMonthForestProductsPortIn; +import app.module.front.usecase.info.monthlyProduct.removeMonthForestProducts.ports.application.domain.RemoveMonthForestProductsCmd; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@Controller +@RequiredArgsConstructor +class CreateBankInputController { + + + private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; + private final CreateBankPortIn createBankPortIn; + private final UpdateMonthlyInputStatusPortIn updateMonthlyInputStatusPortIn; + + private final RemoveBanksPortIn removeBanksPortIn; + + private final CoreUtil coreUtil; + private final UICodeViewPortIn uiCodeViewPortIn; + + @PostMapping(path = "/api/front/info/bank/create") + ResponseEntity operate(@RequestBody @Valid CreateBankInputReqVO reqVO, BindingResult bindingResult){ + if (bindingResult.hasErrors()) { + return coreUtil.getErrorInfo(bindingResult); + } + + + GetMonthlyInputStatus currentMonthlyInfo = + getMonthlyInputStatusPortIn.operate( + new GetMonthlyInputStatusCmd( + reqVO.getId(), AuthUtil.getUserSeq())).orElse(null); + + + + if(currentMonthlyInfo!=null) { + //TODO 트렌젝션 고려 + removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), "code.bank.input")); + + if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님. + for (CreateBankInputProductReqVO item : reqVO.getBankList()) { + + UICodeView code = uiCodeViewPortIn.connect(item.getTransferCategoryCode()).orElse(null); + if(code != null) { + createBankPortIn.operate(new CreateBankCmd( + AuthUtil.getUserSeq(), + "code.bank.input", + item.getCropCode(), + item.getTransferCategoryCode(), + item.getTransferCategory(), + code.getCodeType().equals("INPUT") ? code.getCodeValue() : null, + code.getCodeType().equals("OUTPUT") ?code.getCodeValue() : null, + item.getSourcePurpose(), + item.getCount(), + item.getUnitCode(), + item.getPrice(), + currentMonthlyInfo.getMonth(), + currentMonthlyInfo.getId() + )); + } + } + + updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( + currentMonthlyInfo.getId(), + AuthUtil.getUserSeq(), + currentMonthlyInfo.getMonth(), + currentMonthlyInfo.getBankAutoTransferInputStatus(), + MonthStatus.REGISTERED, + currentMonthlyInfo.getBankAutoTransferOutputStatus() + )); + } else { + updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( + currentMonthlyInfo.getId(), + AuthUtil.getUserSeq(), + currentMonthlyInfo.getMonth(), + currentMonthlyInfo.getBankAutoTransferInputStatus(), + MonthStatus.NOTHING, + currentMonthlyInfo.getBankAutoTransferOutputStatus() + )); + } + return ResponseEntity.ok(ApiResponse.success(null)); + } else { + return ResponseEntity.ok(ApiResponse.failure(null)); + } + + + } +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java index a93297f1..022feaf6 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java @@ -3,13 +3,19 @@ package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.config.application.util.AuthUtil; +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortIn; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.GetPrevMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatus; import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatusCmd; +import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProducts; +import app.module.front.usecase.info.monthlyProduct.getMonthlyForestProducts.ports.application.domain.GetMonthlyForestProductsCmd; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; @@ -29,13 +35,14 @@ class GetBankInputUIController { private final GetPrevMonthlyInputStatusPortIn prevMonthlyInputStatusPortIn; private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; - + private final GetBanksPortIn getBanksPortIn; private final UICodeListPortIn uiCodeListPortIn; @GetMapping(path = "/info/bank/create/input/{id}") public String operate(Model model, - @PathVariable Long id) { + @PathVariable Long id + ,@PageableDefault(sort = "createAt", direction = Sort.Direction.DESC, page = 0, size = 100) Pageable pageable) { String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")); @@ -54,6 +61,22 @@ class GetBankInputUIController { new GetMonthlyInputStatusCmd( id, AuthUtil.getUserSeq())).orElse(null); + + Page pastList = Page.empty(); + if (pastMonthlyInfo != null) { + pastList = getBanksPortIn.operate( + pageable, + new GetBanksCmd(pastMonthlyInfo.getId(), AuthUtil.getUserSeq())); + } + + Page currentList = Page.empty(); + if (currentMonthlyInfo != null) { + currentList = getBanksPortIn.operate( + pageable, + new GetBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq())); + } + + //수정 가능 여부 판단 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter); @@ -66,6 +89,11 @@ class GetBankInputUIController { model.addAttribute("pastMonthlyInfo", pastMonthlyInfo); model.addAttribute("currentMonthlyInfo", currentMonthlyInfo); + + model.addAttribute("pastBankList", pastList); + model.addAttribute("bankList", currentList); + + model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java new file mode 100644 index 00000000..bd2dcf54 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputProductReqVO.java @@ -0,0 +1,31 @@ +package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model; + +import lombok.*; + +import java.math.BigDecimal; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class CreateBankInputProductReqVO { + + private Long id; + private String transferType; + + private String cropCode; + private String transferCategoryCode; + private String transferCategory; + + private String incomeCode; + private String expenseCode; + + private String sourcePurpose; + + private Integer count; + private String unitCode; + private Integer price; + + +} diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java new file mode 100644 index 00000000..df640af8 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java @@ -0,0 +1,29 @@ +package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web.model; + +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode +public class CreateBankInputReqVO { + + + private Boolean status; + private Long id; + private List bankList; + + public List getBankList() { + return bankList != null ? bankList : new ArrayList<>(); + } + + public void setBankList(List bankList) { + this.bankList = bankList; + } + + +} diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java index 4c128c38..71ae7e38 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/RemoveMonthForestProductsDao.java @@ -21,6 +21,6 @@ class RemoveMonthForestProductsDao implements RemoveMonthForestProductsPortOut { LocalDateTime now = LocalDateTime.now(); mapper.deleteForestProducts( - new RemoveMonthForestProductsParam(command.getId(), command.getHouseholdSeq(), now, loginUser, now, loginUser)); + new RemoveMonthForestProductsParam(command.getMonthlyInputStatusId(), command.getHouseholdSeq(), now, loginUser, now, loginUser)); } } diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java index 24adb835..bb0c2129 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/adapters/persistence/model/RemoveMonthForestProductsParam.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Setter @AllArgsConstructor public class RemoveMonthForestProductsParam { - private Long id; + private Long monthlyInputStatusId; private Long householdSeq; private LocalDateTime updatedAt; private String updatedBy; diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java index 97211788..42d6c25c 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyProduct/removeMonthForestProducts/ports/application/domain/RemoveMonthForestProductsCmd.java @@ -10,6 +10,6 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class RemoveMonthForestProductsCmd { - private Long id; + private Long monthlyInputStatusId; private Long householdSeq; } diff --git a/front/src/main/resources/mappers/bank/CreateBankMapper.xml b/front/src/main/resources/mappers/bank/CreateBankMapper.xml new file mode 100644 index 00000000..62f87f4d --- /dev/null +++ b/front/src/main/resources/mappers/bank/CreateBankMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + SELECT nextval('bank_auto_transfer_seq') + + + INSERT INTO bank_auto_transfer ( + id, + household_seq, + transfer_type, + crop_code, + transfer_category_code, + transfer_category, + income_code, + expense_code, + source_purpose, + count, + unit_code, + price, + month, + monthly_input_status_id, + created_at, + created_by, + updated_at, + updated_by, + is_deleted + ) VALUES ( + #{id}, + #{householdSeq}, + #{transferType}, + #{cropCode}, + #{transferCategoryCode}, + #{transferCategory}, + #{incomeCode}, + #{expenseCode}, + #{sourcePurpose}, + #{count}, + #{unitCode}, + #{price}, + #{month}, + #{monthlyInputStatusId}, + #{createdAt}, + #{createdBy}, + #{createdAt}, + #{createdBy}, + false + ) + + + + \ No newline at end of file diff --git a/front/src/main/resources/mappers/bank/GetBanksMapper.xml b/front/src/main/resources/mappers/bank/GetBanksMapper.xml new file mode 100644 index 00000000..06873d5a --- /dev/null +++ b/front/src/main/resources/mappers/bank/GetBanksMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/front/src/main/resources/mappers/bank/RemoveBanksMapper.xml b/front/src/main/resources/mappers/bank/RemoveBanksMapper.xml new file mode 100644 index 00000000..b0149009 --- /dev/null +++ b/front/src/main/resources/mappers/bank/RemoveBanksMapper.xml @@ -0,0 +1,16 @@ + + + + + UPDATE bank_auto_transfer + SET + WHERE + household_seq = #{householdSeq} + AND monthly_input_status_id = #{monthlyInputStatusId} + AND transfer_type = #{transferType} + + + + \ No newline at end of file diff --git a/front/src/main/resources/mappers/product/CreateForestProductMapper.xml b/front/src/main/resources/mappers/product/CreateForestProductMapper.xml index a21fed76..b7039c13 100644 --- a/front/src/main/resources/mappers/product/CreateForestProductMapper.xml +++ b/front/src/main/resources/mappers/product/CreateForestProductMapper.xml @@ -7,7 +7,7 @@ - SELECT nextval('notice_seq') + SELECT nextval('monthly_input_status_seq') INSERT INTO forest_product ( diff --git a/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml b/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml index 553ccd6f..aca44673 100644 --- a/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml +++ b/front/src/main/resources/mappers/product/RemoveMonthForestProductsMapper.xml @@ -9,7 +9,7 @@ SET WHERE household_seq = #{householdSeq} - AND monthly_input_status_id = #{id} + AND monthly_input_status_id = #{monthlyInputStatusId}
diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index dd963b61..28417a0b 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -53,7 +53,7 @@
-
@@ -97,7 +97,7 @@ -
+"/api/front/info/bank/create"
+ + + +
diff --git a/core/src/main/resources/sql/schema/01_drop-all.sql b/core/src/main/resources/sql/schema/01_drop-all.sql index 49bf4058..3f9b3d64 100644 --- a/core/src/main/resources/sql/schema/01_drop-all.sql +++ b/core/src/main/resources/sql/schema/01_drop-all.sql @@ -12,7 +12,6 @@ DROP TABLE IF EXISTS notice_has_upload_file; DROP TABLE IF EXISTS notice; -- 조사원(관리자) 연관 테이블 -DROP TABLE IF EXISTS researcher_household_visit; DROP TABLE IF EXISTS researcher_has_household; DROP TABLE IF EXISTS researcher_has_area; DROP TABLE IF EXISTS research_area; @@ -64,6 +63,7 @@ DROP TABLE IF EXISTS front_user; -- household DROP TABLE IF EXISTS household_has_role; DROP TABLE IF EXISTS household; +DROP TABLE IF EXISTS household_visit; -- article DROP TABLE IF EXISTS article_has_upload_file; @@ -90,7 +90,6 @@ DROP SEQUENCE IF EXISTS address_seq; DROP SEQUENCE IF EXISTS input_day_group_seq; DROP SEQUENCE IF EXISTS operation_log_seq; -DROP SEQUENCE IF EXISTS researcher_household_visit_seq; DROP SEQUENCE IF EXISTS researcher_has_household_seq; DROP SEQUENCE IF EXISTS researcher_has_area_seq; DROP SEQUENCE IF EXISTS research_area_seq; @@ -119,6 +118,7 @@ DROP SEQUENCE IF EXISTS front_user_social_seq; DROP SEQUENCE IF EXISTS household_seq; DROP SEQUENCE IF EXISTS household_has_role_seq; +DROP SEQUENCE IF EXISTS household_visit_seq; DROP SEQUENCE IF EXISTS article_seq; DROP SEQUENCE IF EXISTS article_comment_seq; 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 2cf59a61..00a0f781 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -1008,48 +1008,47 @@ COMMENT ON COLUMN researcher_has_household.deleted_by IS '삭제자'; COMMENT ON COLUMN researcher_has_household.is_deleted IS '삭제여부'; --- 3. researcher_household_visit +-- 3. household_visit -- ============================================ --- TABLE : researcher_household_visit --- DESC : 조사원 임가 방문 정보 테이블 +-- TABLE : household_visit +-- DESC : 임가 방문 정보 테이블 -- ============================================ -CREATE SEQUENCE researcher_household_visit_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; +CREATE SEQUENCE household_visit_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; -CREATE TABLE researcher_household_visit ( - id bigint DEFAULT nextval('researcher_household_visit_seq') NOT NULL, -- 조사원임가방문정보 ID (PK) - admin_seq bigint NOT NULL, -- 관리자 일련번호 (조사원) - household_seq bigint NOT NULL, -- 임가 일련번호 - is_gift_sent boolean, -- 답례품 전달 여부 - memo varchar(255), -- 메모 - visit_date date, -- 방문 날짜(yyyy-mm-dd) - 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, -- 삭제 여부 +CREATE TABLE household_visit ( + id bigint DEFAULT nextval('household_visit_seq') NOT NULL, -- 조사원임가방문정보 ID (PK) + household_seq bigint NOT NULL, -- 임가 일련번호 + management_type varchar(20) NOT NULL, -- 관리분야 (VISIT, CALL, ETC) + is_gift_sent boolean, -- 답례품 전달 여부 + content varchar(255), -- 메모 + visit_date date, -- 방문 날짜(yyyy-mm-dd) + 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, -- 삭제 여부 - CONSTRAINT researcher_household_visit_pkey PRIMARY KEY (id), - CONSTRAINT fk_researcher_household_visit__admin FOREIGN KEY (admin_seq) REFERENCES admin(seq), - CONSTRAINT fk_researcher_household_visit__household FOREIGN KEY (household_seq) REFERENCES household(seq) + CONSTRAINT household_visit_pkey PRIMARY KEY (id), + CONSTRAINT fk_household_visit__household FOREIGN KEY (household_seq) REFERENCES household(seq) ); -COMMENT ON TABLE researcher_household_visit IS '조사원 임가 방문 정보 테이블'; +COMMENT ON TABLE household_visit IS '조사원 임가 방문 정보 테이블'; -COMMENT ON COLUMN researcher_household_visit.id IS '조사원임가방문정보 ID'; -COMMENT ON COLUMN researcher_household_visit.admin_seq IS '관리자 일련번호(조사원)'; -COMMENT ON COLUMN researcher_household_visit.household_seq IS '임가 일련번호'; -COMMENT ON COLUMN researcher_household_visit.is_gift_sent IS '답례품 전달 여부'; -COMMENT ON COLUMN researcher_household_visit.memo IS '메모'; -COMMENT ON COLUMN researcher_household_visit.visit_date IS '방문날짜(yyyy-mm-dd)'; -COMMENT ON COLUMN researcher_household_visit.created_at IS '생성일'; -COMMENT ON COLUMN researcher_household_visit.created_by IS '생성자'; -COMMENT ON COLUMN researcher_household_visit.updated_at IS '수정일'; -COMMENT ON COLUMN researcher_household_visit.updated_by IS '수정자'; -COMMENT ON COLUMN researcher_household_visit.deleted_at IS '삭제일'; -COMMENT ON COLUMN researcher_household_visit.deleted_by IS '삭제자'; -COMMENT ON COLUMN researcher_household_visit.is_deleted IS '삭제여부'; +COMMENT ON COLUMN household_visit.id IS '조사원임가방문정보 ID'; +COMMENT ON COLUMN household_visit.household_seq IS '임가 일련번호'; +COMMENT ON COLUMN household_visit.management_type IS '관리분야 (VISIT, CALL, ETC)'; +COMMENT ON COLUMN household_visit.is_gift_sent IS '답례품 전달 여부'; +COMMENT ON COLUMN household_visit.content IS '내용'; +COMMENT ON COLUMN household_visit.visit_date IS '방문날짜(yyyy-mm-dd)'; +COMMENT ON COLUMN household_visit.created_at IS '생성일'; +COMMENT ON COLUMN household_visit.created_by IS '생성자'; +COMMENT ON COLUMN household_visit.updated_at IS '수정일'; +COMMENT ON COLUMN household_visit.updated_by IS '수정자'; +COMMENT ON COLUMN household_visit.deleted_at IS '삭제일'; +COMMENT ON COLUMN household_visit.deleted_by IS '삭제자'; +COMMENT ON COLUMN household_visit.is_deleted IS '삭제여부'; -- 조사원 연관 테이블 종료 diff --git a/core/src/main/resources/sql/schema/04_create-view.sql b/core/src/main/resources/sql/schema/04_create-view.sql index cf32e3a5..ae2e3748 100644 --- a/core/src/main/resources/sql/schema/04_create-view.sql +++ b/core/src/main/resources/sql/schema/04_create-view.sql @@ -74,9 +74,10 @@ GROUP BY rhh.household_seq; -- ============================================ CREATE VIEW v_household_researcher AS SELECT - rhh.household_seq, - a.name AS researcher_name, - a.phone AS researcher_phone + a.seq AS admin_seq, + rhh.household_seq AS household_seq, + a.name AS researcher_name, + a.phone AS researcher_phone FROM researcher_has_household rhh JOIN admin a ON rhh.admin_seq = a.seq WHERE rhh.is_deleted = false; \ No newline at end of file