From 438bb25f6b8ba9d6e074a3dfc0b2a0fcab923982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 16 Jun 2025 18:16:15 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EC=88=98=20=EC=88=98?= =?UTF-8?q?=EC=9E=85/=EC=A7=80=EC=B6=9C=EC=9D=98=20=EC=A2=85=EB=A5=98=20se?= =?UTF-8?q?lectbox=20=EC=97=90=EC=84=9C=20input=20=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/CreateDailyExpenseCmd.java | 1 - .../persistence/model/DailyExpenseDto.java | 2 - .../service/DailyExpenseServiceImpl.java | 3 - .../expense/web/DailyExpenseUIController.java | 1 - .../web/model/CreateDailyExpenseReqVO.java | 6 +- .../CreateDailyExpenseValidator.java | 12 --- .../model/CreateDailyIncomeCmd.java | 1 - .../persistence/model/DailyIncomeDto.java | 2 - .../service/DailyIncomeServiceImpl.java | 3 - .../income/web/DailyIncomeUIController.java | 1 - .../web/model/CreateDailyIncomeReqVO.java | 6 +- .../validator/CreateDailyIncomeValidator.java | 12 --- .../mappers/daily/DailyExpenseMapper.xml | 7 +- .../mappers/daily/DailyIncomeMapper.xml | 7 +- .../templates/record/expense/form.html | 42 ++-------- .../templates/record/expense/index.html | 63 ++++----------- .../templates/record/income/form.html | 42 ++-------- .../templates/record/income/index.html | 76 ++++++------------- 18 files changed, 62 insertions(+), 225 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/CreateDailyExpenseCmd.java b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/CreateDailyExpenseCmd.java index 530cba85..f82d5425 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/CreateDailyExpenseCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/CreateDailyExpenseCmd.java @@ -16,7 +16,6 @@ public class CreateDailyExpenseCmd extends FrontAuditCommand { private String inputType; private Boolean credit; private String incomeMarkCode; - private String categoryCode; private String categorySelf; private String sourcePurpose; private Integer quantity; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/DailyExpenseDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/DailyExpenseDto.java index d80e0572..c88f262f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/DailyExpenseDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/DailyExpenseDto.java @@ -11,8 +11,6 @@ public class DailyExpenseDto { // TODO : SELF, OCR private String inputType; private Boolean credit; - private String categoryCode; - private String categoryLabel; private String categorySelf; private String sourcePurpose; private Integer quantity; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseServiceImpl.java index e7a28dad..dc1582f9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseServiceImpl.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseServiceImpl.java @@ -41,11 +41,9 @@ public class DailyExpenseServiceImpl implements DailyExpenseService { private List getRefineIncomeList(DailyExpenseUIReqVO reqVO) { List list = DailyExpenseMapper.getDailyExpenseList(reqVO); - List recordIncome = uiCodeListPortIn.connect("code.record.expense"); List recordUnit = uiCodeListPortIn.connect("code.record.unit"); for (DailyExpenseDto dto : list) { - dto.setCategoryLabel(this.getCodeLabel(dto.getCategoryCode(), recordIncome)); dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); } @@ -79,7 +77,6 @@ public class DailyExpenseServiceImpl implements DailyExpenseService { formVO.getInputType(), formVO.getCredit(), (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 - formVO.getCategoryCode(), formVO.getCategorySelf(), formVO.getSourcePurpose(), formVO.getQuantity(), diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseUIController.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseUIController.java index 244f4e89..3087ee97 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseUIController.java @@ -82,7 +82,6 @@ public class DailyExpenseUIController { } } - model.addAttribute("recordExpense", uiCodeListPortIn.connect("code.record.expense")); model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/model/CreateDailyExpenseReqVO.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/CreateDailyExpenseReqVO.java index 98cfa541..8ead5ffb 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/web/model/CreateDailyExpenseReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/CreateDailyExpenseReqVO.java @@ -26,14 +26,10 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO { * 외상판매 여부 */ private Boolean credit; - /** - * 지출의 종류 코드 - */ - @NotBlank(message = "지출 종류를 선택해 주세요.") - private String categoryCode; /** * 지출의 종류 직접입력 */ + @NotBlank(message = "지출 종류를 입력해 주세요.") private String categorySelf; /** * 용도 diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/validator/CreateDailyExpenseValidator.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/validator/CreateDailyExpenseValidator.java index bcddce87..dd45ea2c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/web/validator/CreateDailyExpenseValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/validator/CreateDailyExpenseValidator.java @@ -20,18 +20,6 @@ public class CreateDailyExpenseValidator implements Validator { public void validate(Object target, Errors errors) { CreateDailyExpenseReqVO vo = (CreateDailyExpenseReqVO) target; - if (StringUtils.isBlank(vo.getCategoryCode())) { - errors.rejectValue( - "categoryCode", "valid.common.required", - "지출 종류를 선택해 주세요."); - } - - if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) { - errors.rejectValue( - "categorySelf", "valid.common.required", - "지출 종류를 입력해 주세요."); - } - if (vo.getPrice() == null && vo.getEstimatedValue() == null) { errors.rejectValue( "price", "valid.common.required", diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java index 9128fed2..f6757f64 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java @@ -18,7 +18,6 @@ public class CreateDailyIncomeCmd extends FrontAuditCommand { private Boolean credit; private String cropCode; private String expenseMarkCode; - private String categoryCode; private String categorySelf; private String sourcePurpose; private Integer quantity; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java index 239a2814..d9779d4e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java @@ -15,8 +15,6 @@ public class DailyIncomeDto { private Boolean credit; private String cropCode; private String cropLabel; - private String categoryCode; - private String categoryLabel; private String categorySelf; private String sourcePurpose; private Integer quantity; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java index a5139add..85bbf660 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java @@ -41,12 +41,10 @@ public class DailyIncomeServiceImpl implements DailyIncomeService { private List getRefineIncomeList(DailyIncomeUIReqVO reqVO) { List list = dailyIncomeMapper.getDailyIncomeList(reqVO); - List recordIncome = uiCodeListPortIn.connect("code.record.income"); List recordCrop = uiCodeListPortIn.connect("code.record.crop"); List recordUnit = uiCodeListPortIn.connect("code.record.unit"); for (DailyIncomeDto dto : list) { - dto.setCategoryLabel(this.getCodeLabel(dto.getCategoryCode(), recordIncome)); dto.setCropLabel(this.getCodeLabel(dto.getCropCode(), recordCrop)); dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); } @@ -82,7 +80,6 @@ public class DailyIncomeServiceImpl implements DailyIncomeService { formVO.getCredit(), formVO.getCropCode(), (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 - formVO.getCategoryCode(), formVO.getCategorySelf(), formVO.getSourcePurpose(), formVO.getQuantity(), diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java index 0871c772..eceba931 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java @@ -80,7 +80,6 @@ public class DailyIncomeUIController { } } - model.addAttribute("recordIncome", uiCodeListPortIn.connect("code.record.income")); model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java index ff804f6c..22b7a73a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/model/CreateDailyIncomeReqVO.java @@ -30,14 +30,10 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { * 재배형태 코드 */ private String cropCode; - /** - * 수입의 종류 코드 - */ - @NotBlank(message = "수입 종류를 선택해 주세요.") - private String categoryCode; /** * 수입의 종류 직접입력 */ + @NotBlank(message = "수입 종류를 입력해 주세요.") private String categorySelf; /** * 수입원 diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java index 7f632e69..22748706 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java @@ -23,18 +23,6 @@ public class CreateDailyIncomeValidator implements Validator { public void validate(Object target, Errors errors) { CreateDailyIncomeReqVO vo = (CreateDailyIncomeReqVO) target; - if (StringUtils.isBlank(vo.getCategoryCode())) { - errors.rejectValue( - "categoryCode", "valid.common.required", - "수입 종류를 선택해 주세요."); - } - - if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) { - errors.rejectValue( - "categorySelf", "valid.common.required", - "수입 종류를 입력해 주세요."); - } - if (vo.getPrice() == null && vo.getEstimatedValue() == null) { errors.rejectValue( "price", "valid.common.required", diff --git a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml index 250daf14..ae27b180 100644 --- a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml @@ -5,7 +5,7 @@ select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit - , ds.crop_code, ds.category_code, ds.category_self, ds.source_purpose + , ds.crop_code, ds.category_self, ds.source_purpose , ds.quantity, ds.unit_code, ds.price, ds.estimated_value from daily_income ds @@ -29,13 +29,13 @@ insert into daily_income ( - daily_record_seq, input_type, is_credit, expense_mark_code, crop_code, category_code, category_self, source_purpose + daily_record_seq, input_type, is_credit, expense_mark_code, crop_code, category_self, source_purpose , quantity, unit_code, price, estimated_value , is_deleted , ) values ( #{dailyRecordSeq} - , #{inputType}, #{credit}, #{expenseMarkCode}, #{cropCode}, #{categoryCode}, #{categorySelf}, #{sourcePurpose} + , #{inputType}, #{credit}, #{expenseMarkCode}, #{cropCode}, #{categorySelf}, #{sourcePurpose} , #{quantity}, #{unitCode}, #{price}, #{estimatedValue} , false , @@ -47,7 +47,6 @@ , is_credit = #{credit} , expense_mark_code = #{expenseMarkCode} , crop_code = #{cropCode} - , category_code = #{categoryCode} , category_self = #{categorySelf} , source_purpose = #{sourcePurpose} , quantity = #{quantity} diff --git a/front/src/main/resources/templates/record/expense/form.html b/front/src/main/resources/templates/record/expense/form.html index 73299692..40ba9fa6 100644 --- a/front/src/main/resources/templates/record/expense/form.html +++ b/front/src/main/resources/templates/record/expense/form.html @@ -54,42 +54,14 @@
-
-
-

- 지출의 종류 - * -

+
+
+
-
- - -
-
-

지출의 종류

- -
-
-
    -
  • -
-
-
-
-
-
- -
-
    -
  • 지출 종류를 입력해 주세요.
  • -
+
+
diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 6487c851..d13acff2 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -63,7 +63,7 @@
-

[[${item.categoryLabel}]] [[${item.categorySelf}]]

+

[[${item.categorySelf}]]

@@ -150,8 +150,8 @@ remove: /*[[|/api/record/expense/${reqVO.searchMonth}/${reqVO.groupNo}/remove|]]*/'removeUrl', reset: /*[[|/api/record/expense/${reqVO.searchMonth}/${reqVO.groupNo}/reset|]]*/'resetUrl', }, - month: [[${reqVO.searchMonth}]], - groupNo: [[${reqVO.groupNo}]], + month: /*[[${reqVO.searchMonth}]]*/'month', + groupNo: /*[[${reqVO.groupNo}]]*/'groupNo', submitted: false, }; @@ -209,6 +209,17 @@ // }); }, _bindModelUI() { + etUI.initUI(); + + const $select2 = document.querySelector('#unitCode'); + const selectboxInstance2 = new etUI.components.SelectBox(); + selectboxInstance2.core.init($select2, { + selectItemCallback({selectValue, dataValue}){ + console.log('selectItemCallback', selectValue, dataValue) + $('input[name="unitCode"]').val(dataValue) + } + }); + let $formWrap = $(bind.form.selector).find('form'); $formWrap.on('keyup', 'input[name="price"]', function() { // TODO : UI disabled @@ -239,47 +250,9 @@ function(rstHtml, status) { $('.modal01').find('.modal-content').html(rstHtml); - // TODO - etUI.components.SelectBox().core.init(document.querySelector('#categoryCode')); - etUI.components.SelectBox().core.init(document.querySelector('#unitCode')); - - /* - etUI.components.SelectBox().core.init(document.querySelector('#categoryCode'), { - onChange: function() { - console.log('sssssssssss') - }, - selectItemCallback: function() { - // TODO : console.log ? - console.log(1111) - } - }); - - etUI.components.SelectBox().core.init(document.querySelector('#unitCode'), { - onChange: function() { - console.log('sssssssssss') - }, - selectItemCallback: function() { - console.log(3333) - } - }); - */ - - /*document.querySelector('#selectUnit').addEventListener('select:onChange', (e) => { - console.log(e.detail); - console.log(e.detail.value); - }); - - const selectbox2 = document.querySelector('.component-select'); - selectbox2.addEventListener('select:onChange', (e) => { - console.log(e.detail); - console.log(e.detail.value); - }); -*/ - - //document.queerySelector('#unitSelect') - const modal01 = document.querySelector(".modal01").ui; modal01.open(); + formControl._bindModelUI(); }, function(code, rstData) { @@ -290,12 +263,6 @@ ); }, createVaild() { - const f = document.reqModalForm; - - // TODO : setter - f.categoryCode.value = document.querySelector('#categoryCode').value !== undefined ? document.querySelector('#categoryCode').value : ''; - f.unitCode.value = document.querySelector('#unitCode').value !== undefined ? document.querySelector('#unitCode').value : ''; - formControl.create(); }, create() { diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index b6b47c05..f618bf41 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -84,42 +84,14 @@
-
-
-

- 수입의 종류 - * -

+
+
+
-
- - -
-
-

수입의 종류

- -
-
-
    -
  • -
-
-
-
-
-
- -
-
    -
  • 수입 종류를 입력해 주세요.
  • -
+
+
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 60a75075..f74136e5 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -62,7 +62,7 @@
-

[[${item.categoryLabel}]] [[${item.categorySelf}]]

+

[[${item.categorySelf}]]

@@ -153,8 +153,8 @@ remove: /*[[|/api/record/income/${reqVO.searchMonth}/${reqVO.groupNo}/remove|]]*/'removeUrl', reset: /*[[|/api/record/income/${reqVO.searchMonth}/${reqVO.groupNo}/reset|]]*/'resetUrl', }, - month: [[${reqVO.searchMonth}]], - groupNo: [[${reqVO.groupNo}]], + month: /*[[${reqVO.searchMonth}]]*/'month', + groupNo: /*[[${reqVO.groupNo}]]*/'groupNo', submitted: false, }; @@ -209,7 +209,27 @@ // }); }, _bindModelUI() { - let $formWrap = $(bind.form.selector).find('form'); + etUI.initUI(); + + const $select1 = document.querySelector('#cropCode'); + const selectboxInstance1 = new etUI.components.SelectBox(); + selectboxInstance1.core.init($select1, { + selectItemCallback({selectValue, dataValue}){ + console.log('selectItemCallback', selectValue, dataValue) + $('input[name="cropCode"]').val(dataValue) + } + }); + + const $select2 = document.querySelector('#unitCode'); + const selectboxInstance2 = new etUI.components.SelectBox(); + selectboxInstance2.core.init($select2, { + selectItemCallback({selectValue, dataValue}){ + console.log('selectItemCallback', selectValue, dataValue) + $('input[name="unitCode"]').val(dataValue) + } + }); + + const $formWrap = $(bind.form.selector).find('form'); $formWrap.on('keyup', 'input[name="price"]', function() { // TODO : UI disabled if ($(this).val() === '') { @@ -239,48 +259,9 @@ function(rstHtml, status) { $('.modal01').find('.modal-content').html(rstHtml); - // TODO - etUI.components.SelectBox().core.init(document.querySelector('#categoryCode')); - etUI.components.SelectBox().core.init(document.querySelector('#cropCode')); - etUI.components.SelectBox().core.init(document.querySelector('#unitCode')); - - /* - etUI.components.SelectBox().core.init(document.querySelector('#categoryCode'), { - onChange: function() { - console.log('sssssssssss') - }, - selectItemCallback: function() { - // TODO : console.log ? - console.log(1111) - } - }); - - etUI.components.SelectBox().core.init(document.querySelector('#unitCode'), { - onChange: function() { - console.log('sssssssssss') - }, - selectItemCallback: function() { - console.log(3333) - } - }); - */ - - /*document.querySelector('#selectUnit').addEventListener('select:onChange', (e) => { - console.log(e.detail); - console.log(e.detail.value); - }); - - const selectbox2 = document.querySelector('.component-select'); - selectbox2.addEventListener('select:onChange', (e) => { - console.log(e.detail); - console.log(e.detail.value); - }); -*/ - - //document.queerySelector('#unitSelect') - const modal01 = document.querySelector(".modal01").ui; modal01.open(); + formControl._bindModelUI(); }, function(code, rstData) { @@ -291,13 +272,6 @@ ); }, createVaild() { - const f = document.reqModalForm; - - // TODO : setter - f.categoryCode.value = document.querySelector('#categoryCode').value !== undefined ? document.querySelector('#categoryCode').value : ''; - f.cropCode.value = document.querySelector('#cropCode').value !== undefined ? document.querySelector('#cropCode').value : ''; - f.unitCode.value = document.querySelector('#unitCode').value !== undefined ? document.querySelector('#unitCode').value : ''; - formControl.create(); }, create() {