@@ -210,6 +219,7 @@
f.id.value = data.id;
f.codeText.value = data.codeText;
f.codeValue.value = data.codeValue;
+ f.codeType.value = data.codeType;
f.msgCode.value = data.msgCode;
f.orderNo.value = data.orderNo;
f.parentId.value = data.parentId;
@@ -309,6 +319,7 @@
f.orderNo.value = '';
f.codeText.value = '';
f.codeValue.value = '';
+ f.codeType.value = '';
f.msgCode.value = '';
f.inUse.value = 'true';
}
diff --git a/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/SaveUiCodeController.java b/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/SaveUiCodeController.java
index ef0d80ba..fc2656fb 100644
--- a/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/SaveUiCodeController.java
+++ b/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/SaveUiCodeController.java
@@ -58,6 +58,7 @@ class SaveUiCodeController {
reqVO.getOrderNo(),
reqVO.getCodeText(),
reqVO.getCodeValue(),
+ reqVO.getCodeType(),
reqVO.getMsgCode(),
reqVO.getInUse()),
"create".equals(reqVO.getMode()));
diff --git a/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/model/SaveUiCodeReqVO.java b/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/model/SaveUiCodeReqVO.java
index 40df1296..6200077a 100644
--- a/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/model/SaveUiCodeReqVO.java
+++ b/api/src/main/java/app/module/api/usecases/uicode/saveUiCode/adapters/web/model/SaveUiCodeReqVO.java
@@ -38,6 +38,11 @@ public class SaveUiCodeReqVO {
@Schema(description = "코드값", example = "120")
private String codeValue;
+
+ @NotBlank(message = "{valid.common.required}")
+ @Schema(description = "코드타입", example = "120")
+ private String codeType;
+
@Schema(description = "다국어 코드", example = "string")
private String msgCode;
diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java
index c4e1b3f0..49e2f545 100644
--- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java
+++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/UICode.java
@@ -23,6 +23,8 @@ public class UICode extends AuditEntity {
private String codeValue;
+ private String codeType;
+
private String msgCode;
private Boolean inUse;
diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java
index d5b27828..332d572a 100644
--- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java
+++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java
@@ -33,36 +33,36 @@ public class InitUICodeData implements ApplicationRunner {
// root 노드 - code
uiCodeSavePortIn.connect(
- new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false);
+ new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null,null, true), false);
// code - board
uiCodeSavePortIn.connect(
- new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false);
+ new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null,null, true), false);
// code - board - rows
uiCodeSavePortIn.connect(
- new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,
+ new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null,null,
true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 0, "10", "10", null, true),
+ UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 0, "10", "10", null, null,true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 1, "20", "20", null, true),
+ UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 1, "20", "20", null,null, true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 2, "50", "50", null, true),
+ UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 2, "50", "50", null, null,true),
false);
uiCodeSavePortIn.connect(
new UICodeSaveCommand(
- UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 3, "100", "100", null, true),
+ UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 3, "100", "100", null,null, true),
false);
}
}
diff --git a/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/domain/UICodeElement.java b/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/domain/UICodeElement.java
index 6d491f08..fa8bc189 100644
--- a/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/domain/UICodeElement.java
+++ b/core/src/main/java/app/module/core/usecase/uicode/list/ports/application/domain/UICodeElement.java
@@ -15,6 +15,7 @@ public class UICodeElement {
private Integer orderNo;
private String codeText;
private String codeValue;
+ private String codeType;
private String msgCode;
private Boolean inUse;
}
diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java
index 0c761bc4..a31ec87f 100644
--- a/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java
+++ b/core/src/main/java/app/module/core/usecase/uicode/save/adapters/persistence/UICodeSaveDao.java
@@ -27,6 +27,7 @@ class UICodeSaveDao implements UICodeSavePortOut {
saveCommand.getOrderNo(),
saveCommand.getCodeText(),
saveCommand.getCodeValue(),
+ saveCommand.getCodeType(),
saveCommand.getMsgCode(),
saveCommand.getInUse()
);
diff --git a/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java b/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java
index 0757649d..dc8db895 100644
--- a/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java
+++ b/core/src/main/java/app/module/core/usecase/uicode/save/ports/application/domain/UICodeSaveCommand.java
@@ -13,6 +13,7 @@ public class UICodeSaveCommand {
private Integer orderNo;
private String codeText;
private String codeValue;
+ private String codeType;
private String msgCode;
private Boolean inUse;
}
diff --git a/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/domain/UICodeView.java b/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/domain/UICodeView.java
index 9b4e18b4..68c35687 100644
--- a/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/domain/UICodeView.java
+++ b/core/src/main/java/app/module/core/usecase/uicode/view/ports/application/domain/UICodeView.java
@@ -14,6 +14,7 @@ public class UICodeView {
private Integer orderNo;
private String codeText;
private String codeValue;
+ private String codeType;
private String msgCode;
private Boolean inUse;
}
diff --git a/core/src/main/resources/mappers/uicode/UICodeListMapper.xml b/core/src/main/resources/mappers/uicode/UICodeListMapper.xml
index c38b74a7..8758e31d 100644
--- a/core/src/main/resources/mappers/uicode/UICodeListMapper.xml
+++ b/core/src/main/resources/mappers/uicode/UICodeListMapper.xml
@@ -10,6 +10,7 @@
order_no,
code_text,
code_value,
+ code_type,
msg_code,
in_use
FROM uicode
diff --git a/core/src/main/resources/mappers/uicode/UICodeSaveMapper.xml b/core/src/main/resources/mappers/uicode/UICodeSaveMapper.xml
index 098f080c..de5bb258 100644
--- a/core/src/main/resources/mappers/uicode/UICodeSaveMapper.xml
+++ b/core/src/main/resources/mappers/uicode/UICodeSaveMapper.xml
@@ -9,6 +9,7 @@
order_no,
code_text,
code_value,
+ code_type,
msg_code,
in_use,
)
@@ -16,6 +17,7 @@
#{parentId},
#{orderNo},
#{codeText},
+ #{codeType},
#{codeValue},
#{msgCode},
#{inUse},
@@ -28,6 +30,7 @@
order_no = #{orderNo},
code_text = #{codeText},
code_value = #{codeValue},
+ code_type = #{codeType},
msg_code = #{msgCode},
in_use = #{inUse},
diff --git a/core/src/main/resources/mappers/uicode/UICodeViewMapper.xml b/core/src/main/resources/mappers/uicode/UICodeViewMapper.xml
index aa2d8bcc..970d1032 100644
--- a/core/src/main/resources/mappers/uicode/UICodeViewMapper.xml
+++ b/core/src/main/resources/mappers/uicode/UICodeViewMapper.xml
@@ -12,6 +12,7 @@
order_no,
code_text,
code_value,
+ code_type,
msg_code,
in_use
FROM uicode
diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java
new file mode 100644
index 00000000..79670563
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java
@@ -0,0 +1,40 @@
+package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web;
+
+import app.module.core.config.application.enums.MonthStatus;
+import app.module.front.config.application.util.AuthUtil;
+import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn;
+import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss;
+import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.NoSuchElementException;
+
+@Controller
+@RequiredArgsConstructor
+class GetBankInputUIController {
+
+
+ private final GetMonthlyInputStatussPortIn portIn;
+
+
+ @GetMapping(path = "/info/bank/create/input/{id}")
+ String operate(Model model,
+ @PathVariable Long id,
+ @PageableDefault(sort = "createAt", direction = Sort.Direction.DESC, page = 0, size = 100) Pageable pageable) {
+
+ String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+
+ return "info/bank/input";
+ }
+}
\ No newline at end of file
diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java
new file mode 100644
index 00000000..ddf58a95
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankOutputUI/adapters/web/GetBankOutputUIController.java
@@ -0,0 +1,40 @@
+package app.module.front.usecase.info.bankUI.getBankOutputUI.adapters.web;
+
+import app.module.core.config.application.enums.MonthStatus;
+import app.module.front.config.application.util.AuthUtil;
+import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.GetMonthlyInputStatussPortIn;
+import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatuss;
+import app.module.front.usecase.info.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.NoSuchElementException;
+
+@Controller
+@RequiredArgsConstructor
+class GetBankOutputUIController {
+
+
+ private final GetMonthlyInputStatussPortIn portIn;
+
+ @GetMapping(path = "/info/bank/create/output/{id}")
+ String operate(Model model,
+ @PathVariable Long id,
+ @PageableDefault(sort = "createAt", direction = Sort.Direction.DESC, page = 0, size = 100) Pageable pageable) {
+
+ String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+
+ return "info/bank/output";
+ }
+
+}
\ No newline at end of file
diff --git a/front/src/main/resources/templates/info/bank/banks.html b/front/src/main/resources/templates/info/bank/banks.html
index 89f725eb..3b4b1e78 100644
--- a/front/src/main/resources/templates/info/bank/banks.html
+++ b/front/src/main/resources/templates/info/bank/banks.html
@@ -16,25 +16,25 @@
-
+
수입
미등록
-
+
수입
등록완료
-
+
지출
미등록
-
+
지출
등록완료
diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html
index 2a6cb7f6..e1061fdc 100644
--- a/front/src/main/resources/templates/info/bank/input.html
+++ b/front/src/main/resources/templates/info/bank/input.html
@@ -2,32 +2,285 @@
-
+
- 이번달의
- 은행 자동이체 내역 입력 현황을
- 확인하세요.
+ 은행 자동이체(수입) 내역 0건 등록 되었습니다.
+ 수입 내역을 등록해 주세요.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/front/src/main/resources/templates/info/bank/output.html b/front/src/main/resources/templates/info/bank/output.html
index 2a6cb7f6..c67fa604 100644
--- a/front/src/main/resources/templates/info/bank/output.html
+++ b/front/src/main/resources/templates/info/bank/output.html
@@ -7,27 +7,192 @@
- 이번달의
- 은행 자동이체 내역 입력 현황을
- 확인하세요.
+ 은행 자동이체(지출) 내역 0건 등록 되었습니다.
+ 지출 내역을 등록해 주세요.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
필수입력
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+