From 8d91f176ae97dcc914183bb4bf93838c13a088a4 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 14:43:56 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EC=88=98?= =?UTF-8?q?=EC=9E=85,=20=EC=A7=80=EC=B6=9C=EC=9D=98=20=EB=8B=A8=EC=9C=84?= =?UTF-8?q?=20=EC=A7=81=EC=A0=91=EC=9E=85=EB=A0=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/schema/02_create-record.sql | 18 +++++++++++------- .../config/constants/CommonConstants.java | 12 ++++++++++++ .../ports/application/DailyExpenseService.java | 8 +++++++- .../ports/application/DailyIncomeService.java | 9 ++++++++- .../mappers/daily/DailyExpenseMapper.xml | 7 ++++--- .../mappers/daily/DailyIncomeMapper.xml | 7 ++++--- .../resources/static/assets/styles/style.css | 3 +++ .../templates/record/expense/form.html | 7 ++++++- .../templates/record/expense/index.html | 5 +++++ .../templates/record/income/form.html | 5 +++++ .../templates/record/income/index.html | 9 +++++++++ 11 files changed, 74 insertions(+), 16 deletions(-) create mode 100644 front/src/main/java/app/module/front/config/constants/CommonConstants.java 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 4de5025a..e36363a5 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -145,11 +145,12 @@ CREATE TABLE daily_income ( is_credit boolean, -- 외상판매 여부 expense_mark_code varchar(10), -- 지출부호 crop_code varchar(255), -- 재배형태 코드 (매핑코드) - category_code varchar(255), -- 수입 종류(매핑코드) + 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, -- 현물(평가액) created_at timestamp(6), -- 생성일 @@ -172,11 +173,12 @@ 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.crop_code IS '재배형태 코드 (매핑코드)'; -COMMENT ON COLUMN daily_income.category_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 '수량'; -COMMENT ON COLUMN daily_income.unit_code IS '단위 (매핑코드)'; +COMMENT ON COLUMN daily_income.unit_code IS '단위(매핑코드)'; +COMMENT ON COLUMN daily_income.unit_self IS '단위(직접입력)'; COMMENT ON COLUMN daily_income.price IS '현금(원)'; COMMENT ON COLUMN daily_income.estimated_value IS '현물(평가액)'; COMMENT ON COLUMN daily_income.created_at IS '생성일'; @@ -200,11 +202,12 @@ CREATE TABLE daily_expense ( input_type varchar(5), -- 입력 구분(SELF, OCR) is_credit boolean, -- 외상판매 여부 income_mark_code varchar(10), -- 수입부호 TODO : 수입종류와 다른것인지 판단 필요. 일단 다르다는 전제조건으로 생성 - category_code varchar(255), -- 수입 종류(매핑코드) + category_code varchar(255), -- 수입 종류(매핑코드) TODO : 미사용 삭제하기 category_self varchar(30), -- 수입 종류(직접입력) source_purpose varchar(10), -- 수입원(용도) quantity decimal(6,2), -- 수량 unit_code varchar(255), -- 단위 (매핑코드) + unit_self varchar(30), -- 단위(직접입력) price integer, -- 현금(원) estimated_value integer, -- 현물(평가액) created_at timestamp(6), -- 생성일 @@ -226,11 +229,12 @@ COMMENT ON COLUMN daily_expense.daily_record_seq IS '일계부 작성상태 일 COMMENT ON COLUMN daily_expense.input_type IS '입력 구분(SELF, OCR)'; 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 '지출 종류(매핑코드)'; +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 '수량'; -COMMENT ON COLUMN daily_expense.unit_code IS '단위 (매핑코드)'; +COMMENT ON COLUMN daily_expense.unit_code IS '단위(매핑코드)'; +COMMENT ON COLUMN daily_expense.unit_self IS '단위(직접입력)'; COMMENT ON COLUMN daily_expense.price IS '현금(원)'; COMMENT ON COLUMN daily_expense.estimated_value IS '현물(평가액)'; COMMENT ON COLUMN daily_expense.created_at IS '생성일'; diff --git a/front/src/main/java/app/module/front/config/constants/CommonConstants.java b/front/src/main/java/app/module/front/config/constants/CommonConstants.java new file mode 100644 index 00000000..edb03e6a --- /dev/null +++ b/front/src/main/java/app/module/front/config/constants/CommonConstants.java @@ -0,0 +1,12 @@ +package app.module.front.config.constants; + +public class CommonConstants { + private CommonConstants() { + throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다."); + } + + /** + * 단위의 직접입력 코드 + */ + public static final String UNIT_CODE_SELF = "code.record.unit.self"; +} 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 bb5c1fb8..6c67275c 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 @@ -3,6 +3,7 @@ package app.module.front.usecase.daily.expense.ports.application; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import app.module.front.config.application.util.AuditUtil; +import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto; import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; @@ -53,7 +54,11 @@ public class DailyExpenseService implements DailyExpensePortIn { List recordUnit = uiCodeListPortIn.connect("code.record.unit"); for (DailyExpenseDto dto : list) { - dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); + if (CommonConstants.UNIT_CODE_SELF.equals(dto.getUnitCode())) { + dto.setUnitLabel(dto.getUnitSelf()); + } else { + dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); + } } return list; @@ -96,6 +101,7 @@ public class DailyExpenseService implements DailyExpensePortIn { formVO.getSourcePurpose(), formVO.getQuantity(), formVO.getUnitCode(), + formVO.getUnitSelf(), formVO.getPrice(), formVO.getEstimatedValue())); 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 a0dcded8..ed28c76b 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 @@ -3,6 +3,7 @@ package app.module.front.usecase.daily.income.ports.application; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import app.module.front.config.application.util.AuditUtil; +import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; @@ -55,7 +56,12 @@ public class DailyIncomeService implements DailyIncomePortIn { for (DailyIncomeDto dto : list) { dto.setCropLabel(this.getCodeLabel(dto.getCropCode(), recordCrop)); - dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); + + if (CommonConstants.UNIT_CODE_SELF.equals(dto.getUnitCode())) { + dto.setUnitLabel(dto.getUnitSelf()); + } else { + dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); + } } return list; @@ -99,6 +105,7 @@ public class DailyIncomeService implements DailyIncomePortIn { formVO.getSourcePurpose(), formVO.getQuantity(), formVO.getUnitCode(), + formVO.getUnitSelf(), formVO.getPrice(), formVO.getEstimatedValue())); diff --git a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml index d6b51152..cfa0ea57 100644 --- a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml @@ -6,7 +6,7 @@ resultType="app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto"> select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit , ds.category_self, ds.source_purpose - , ds.quantity, ds.unit_code, ds.price, ds.estimated_value + , ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value from daily_expense ds where ds.is_deleted = false @@ -30,13 +30,13 @@ insert into daily_expense ( daily_record_seq, input_type, is_credit, income_mark_code, category_self, source_purpose - , quantity, unit_code, price, estimated_value + , quantity, unit_code, unit_self, price, estimated_value , is_deleted , ) values ( #{dailyRecordSeq} , #{inputType}, #{credit}, #{incomeMarkCode}, #{categorySelf}, #{sourcePurpose} - , #{quantity}, #{unitCode}, #{price}, #{estimatedValue} + , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} , false , ) @@ -50,6 +50,7 @@ , source_purpose = #{sourcePurpose} , quantity = #{quantity} , unit_code = #{unitCode} + , unit_self = #{unitSelf} , price = #{price} , estimated_value = #{estimatedValue} where is_deleted = false diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index 7e416438..31af2f1a 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -6,7 +6,7 @@ resultType="app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto"> select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit , ds.crop_code, ds.category_self, ds.source_purpose - , ds.quantity, ds.unit_code, ds.price, ds.estimated_value + , ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value from daily_income ds where ds.is_deleted = false @@ -30,13 +30,13 @@ insert into daily_income ( daily_record_seq, input_type, is_credit, expense_mark_code, crop_code, category_self, source_purpose - , quantity, unit_code, price, estimated_value + , quantity, unit_code, unit_self, price, estimated_value , is_deleted , ) values ( #{dailyRecordSeq} , #{inputType}, #{credit}, #{expenseMarkCode}, #{cropCode}, #{categorySelf}, #{sourcePurpose} - , #{quantity}, #{unitCode}, #{price}, #{estimatedValue} + , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} , false , ) @@ -51,6 +51,7 @@ , source_purpose = #{sourcePurpose} , quantity = #{quantity} , unit_code = #{unitCode} + , unit_self = #{unitSelf} , price = #{price} , estimated_value = #{estimatedValue} where is_deleted = false diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index fa2559c0..03718244 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -8321,6 +8321,9 @@ button.swiper-pagination-bullet { } .form-group .input-flex-group .d-flex .component-input { margin-top: 0; + -webkit-box-flex: 1; + -webkit-flex: 1; + flex: 1; } .form-desc { diff --git a/front/src/main/resources/templates/record/expense/form.html b/front/src/main/resources/templates/record/expense/form.html index 5457b42d..4f6b6dbd 100644 --- a/front/src/main/resources/templates/record/expense/form.html +++ b/front/src/main/resources/templates/record/expense/form.html @@ -92,7 +92,7 @@

- + @@ -114,6 +114,11 @@
+
+
+ +
+
diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 9f4ba583..edccc0c7 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -164,6 +164,11 @@ selectItemCallback({selectValue, dataValue}){ console.log('selectItemCallback', selectValue, dataValue) $('input[name="unitCode"]').val(dataValue) + + // TODO : ui js 에서 show 적용유무 파악하기 + if (dataValue === 'code.record.unit.self') { + $('#unitCode').parent().find('.component-input').addClass('show'); + } } }); diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index f68845cc..0cf33515 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -144,6 +144,11 @@ +
+
+ +
+
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 8c6ef9da..df3d4e6a 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -177,6 +177,11 @@ selectItemCallback({selectValue, dataValue}){ console.log('selectItemCallback', selectValue, dataValue) $('input[name="unitCode"]').val(dataValue) + + // TODO : ui js 에서 show 적용유무 파악하기 + if (dataValue === 'code.record.unit.self') { + $('#unitCode').parent().find('.component-input').addClass('show'); + } } }); @@ -201,7 +206,11 @@ // data set selectboxInstance1.setValue($formWrap.find('input[name="cropCode"]').val()); + //selectboxInstance1.update(); + selectboxInstance2.setValue($formWrap.find('input[name="unitCode"]').val()); + //selectboxInstance2.update(); + if ($price.val() === '' && $estimatedValue.val() !== '') { modalControl._priceDisabled($price); } else if ($price.val() !== '' && $estimatedValue.val() === '') {