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 5307aabc..e7a28dad 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 @@ -54,14 +54,15 @@ public class DailyExpenseServiceImpl implements DailyExpenseService { /** * 코드명 조회 - * @param code 코드 + * + * @param codeId 코드 * @param codeList 공통 코드 목록 - * @return + * @return 코드명 */ - private String getCodeLabel(String code, List codeList) { + private String getCodeLabel(String codeId, List codeList) { String returnValue = null; for (UICodeElement codeSetup : codeList) { - if (codeSetup.getCodeValue().equalsIgnoreCase(code)) { + if (codeSetup.getId().equalsIgnoreCase(codeId)) { returnValue = codeSetup.getCodeText(); break; } 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 ff2d1833..a5139add 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 @@ -56,14 +56,15 @@ public class DailyIncomeServiceImpl implements DailyIncomeService { /** * 코드명 조회 - * @param code 코드 + * + * @param codeId 코드 * @param codeList 공통 코드 목록 - * @return + * @return 코드명 */ - private String getCodeLabel(String code, List codeList) { + private String getCodeLabel(String codeId, List codeList) { String returnValue = null; for (UICodeElement codeSetup : codeList) { - if (codeSetup.getCodeValue().equalsIgnoreCase(code)) { + if (codeSetup.getId().equalsIgnoreCase(codeId)) { returnValue = codeSetup.getCodeText(); break; } diff --git a/front/src/main/resources/templates/record/expense/form.html b/front/src/main/resources/templates/record/expense/form.html index fbb04659..73299692 100644 --- a/front/src/main/resources/templates/record/expense/form.html +++ b/front/src/main/resources/templates/record/expense/form.html @@ -77,9 +77,8 @@
  • -
  • 직접 입력
@@ -143,9 +142,9 @@
diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 2b541062..b6b47c05 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -72,7 +72,7 @@
@@ -107,9 +107,8 @@
  • -
  • 직접 입력
@@ -173,9 +172,9 @@