From c287c2706a0202649ad8d55343e31b7fbbcc855c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Thu, 24 Jul 2025 16:28:34 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=BB=A4=EB=A9=98=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/sql/data/04_second_open.sql | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index 2584475a..c4767219 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -790,12 +790,25 @@ CREATE TABLE public.receipt_has_record ( CONSTRAINT receipt_has_record_pkey PRIMARY KEY (receipt_type_id, file_id) ); ---- 첨부파일 컬럼 추가 -COMMENT ON COLUMN public.upload_file.mapping_id IS '첨부파일 매핑 ID'; + +COMMENT ON TABLE public.receipt_has_record IS '영수증 매핑 테이블'; +COMMENT ON COLUMN public.receipt_has_record."type" IS '종류(INCOME,EXPENSE)'; +COMMENT ON COLUMN public.receipt_has_record.file_id IS '파일 ID'; +COMMENT ON COLUMN public.receipt_has_record.receipt_type_id IS '영수증 타입 ID'; +COMMENT ON COLUMN public.receipt_has_record.created_at IS '생성일'; +COMMENT ON COLUMN public.receipt_has_record.created_by IS '생성자'; +COMMENT ON COLUMN public.receipt_has_record.updated_at IS '수정일'; +COMMENT ON COLUMN public.receipt_has_record.updated_by IS '수정자'; +COMMENT ON COLUMN public.receipt_has_record.deleted_at IS '삭제일'; +COMMENT ON COLUMN public.receipt_has_record.deleted_by IS '삭제자'; + + ALTER TABLE public.upload_file ADD ocr text NULL; COMMENT ON COLUMN public.upload_file.ocr IS 'ocr'; +--- 첨부파일 컬럼 추가 +COMMENT ON COLUMN public.upload_file.mapping_id IS '첨부파일 매핑 ID'; From b1fbdc85dc265473fe514c47982c001f33203926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Thu, 24 Jul 2025 16:57:10 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=BB=A4=EB=A9=98=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/resources/sql/data/04_second_open.sql | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index c4767219..607f7dc4 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -772,6 +772,15 @@ created_by varchar(255) null, CONSTRAINT term_agreement_pkey PRIMARY KEY (id) ); +COMMENT ON COLUMN public.term_agreement.id IS '동의 이력 ID'; +COMMENT ON COLUMN public.term_agreement.seq IS '사용자 seq'; +COMMENT ON COLUMN public.term_agreement."type" IS '동의타입'; +COMMENT ON COLUMN public.term_agreement.previous_data IS '이전데이터'; +COMMENT ON COLUMN public.term_agreement.created_at IS '생성일'; +COMMENT ON COLUMN public.term_agreement.created_by IS '생성자'; +COMMENT ON TABLE public.term_agreement IS '사용자 동의 이력 테이블'; + + -- ============================================ -- 영수증 매핑 테이블 -- ============================================ From de41a1f52d1d474f65d60e08fd2503d75fe92ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 25 Jul 2025 18:42:33 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=9E=84=EC=82=B0=EB=AC=BC=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EA=B1=B4=EC=88=98=20=EC=9D=BC=EC=B9=98=20=EC=8B=9C?= =?UTF-8?q?=ED=82=A4=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/info/monthly/{id}.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/front/src/main/resources/templates/info/monthly/{id}.html b/front/src/main/resources/templates/info/monthly/{id}.html index 679f71a0..90e16c6e 100644 --- a/front/src/main/resources/templates/info/monthly/{id}.html +++ b/front/src/main/resources/templates/info/monthly/{id}.html @@ -239,12 +239,14 @@ const header = document.getElementById('listHeader'); const count = document.getElementById('listCount'); const total = ENV.data.productList.length; + const totalItems = document.getElementById('totalItems'); header.style.display = total > 0 ? '' : 'none'; status.style.display = total > 0 ? 'none' : ''; callPastInfoBtn.style.display = total > 0 ? 'none' : ''; count.textContent = total; + totalItems.textContent = total; btn.disabled = isChecked; From 8914cc5f704be5a2e7494389ff33e909da2d404d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Fri, 25 Jul 2025 19:05:08 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=A7=81=EC=A0=91=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EA=B0=92=20=EC=95=88=EB=82=98=EC=98=A4=EB=8A=94=EA=B1=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/info/bank/input.html | 2 +- .../resources/templates/info/bank/output.html | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index 8bf132e4..e2aec841 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -478,7 +478,7 @@ const field = form.elements.namedItem(key); if (field) { field.value = val; - if(key === 'transferCategoryCode' && (val === "code.bank.input.self" || val === "code.bank.input.1" || val === "code.bank.input.4")){ + if(key === 'transferCategoryCode' && (val !== "code.bank.input.10" && val !== "code.bank.input.12" && val !== "code.bank.input.13")){ document.getElementById(val+"_value").value = product["transferCategory"]; } if(key === 'unitCode' && val === "code.count.unit.self"){ diff --git a/front/src/main/resources/templates/info/bank/output.html b/front/src/main/resources/templates/info/bank/output.html index ed314924..5a51a527 100644 --- a/front/src/main/resources/templates/info/bank/output.html +++ b/front/src/main/resources/templates/info/bank/output.html @@ -472,7 +472,7 @@ const field = form.elements.namedItem(key); if (field) { field.value = val; - if (key === 'transferCategoryCode' && val === "code.bank.input.self") { + if (key === 'transferCategoryCode' && val === "code.bank.output.self") { document.getElementById(val + "_value").value = product["transferCategory"]; } if (key === 'unitCode' && val === "code.count.unit.self") { @@ -481,6 +481,22 @@ } }); + + + if (product.transferCategoryCode === "code.bank.output.self") { + const transferCategoryInput = document.getElementById(product.transferCategoryCode + "_value"); + if (transferCategoryInput) { + transferCategoryInput.value = product.transferCategory || ""; + } + } + + // 단위 입력 필드 표시 여부 처리 + if (product.unitCode === "code.count.unit.self") { + const unitDiv = document.getElementById("unitDiv"); + if (unitDiv) { + unitDiv.style.display = ""; + } + } ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode); ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode); document.getElementById("unit").value = product.unit;