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 028786f8..7c5edc55 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -690,6 +690,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 '사용자 동의 이력 테이블'; + + -- ============================================ -- 영수증 매핑 테이블 -- ============================================ @@ -708,12 +717,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'; 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; 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;