diff --git a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java index ed9ad650..3ea44033 100644 --- a/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java +++ b/front/src/main/java/app/module/front/usecase/info/bank/getBanks/ports/application/domain/GetBanksCmd.java @@ -13,4 +13,5 @@ public class GetBanksCmd { private Long monthlyInputStatusId; private Long householdSeq; + private String transferType; } diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java index 680fd404..4f715ee1 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/CreateBankInputController.java @@ -59,21 +59,27 @@ class CreateBankInputController { if(currentMonthlyInfo!=null) { //TODO 트렌젝션 고려 - removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), "code.bank.input")); + removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), reqVO.getTransferType())); if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님. for (CreateBankInputProductReqVO item : reqVO.getBankList()) { UICodeView code = uiCodeViewPortIn.connect(item.getTransferCategoryCode()).orElse(null); if(code != null) { + String incomdeCode = null; + String expenseCode = null; + if(reqVO.getTransferType().equals("code.bank.input")){ + incomdeCode = !code.getId().equals(reqVO.getTransferType()+".99") && code.getCodeType().equals("INPUT") ? code.getCodeValue() : null; + expenseCode = !code.getId().equals(reqVO.getTransferType()+".99") && code.getCodeType().equals("OUTPUT") ?code.getCodeValue() : null; + } createBankPortIn.operate(new CreateBankCmd( AuthUtil.getUserSeq(), - "code.bank.input", + reqVO.getTransferType(), item.getCropCode(), item.getTransferCategoryCode(), item.getTransferCategory(), - code.getCodeType().equals("INPUT") ? code.getCodeValue() : null, - code.getCodeType().equals("OUTPUT") ?code.getCodeValue() : null, + incomdeCode, + expenseCode, item.getSourcePurpose(), item.getCount(), item.getUnitCode(), @@ -89,8 +95,8 @@ class CreateBankInputController { AuthUtil.getUserSeq(), currentMonthlyInfo.getMonth(), currentMonthlyInfo.getBankAutoTransferInputStatus(), - MonthStatus.REGISTERED, - currentMonthlyInfo.getBankAutoTransferOutputStatus() + reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferInputStatus(), + reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.REGISTERED : currentMonthlyInfo.getBankAutoTransferOutputStatus() )); } else { updateMonthlyInputStatusPortIn.operate(new UpdateMonthlyInputStatusCmd( @@ -98,8 +104,8 @@ class CreateBankInputController { AuthUtil.getUserSeq(), currentMonthlyInfo.getMonth(), currentMonthlyInfo.getBankAutoTransferInputStatus(), - MonthStatus.NOTHING, - currentMonthlyInfo.getBankAutoTransferOutputStatus() + reqVO.getTransferType().equals("code.bank.input") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferInputStatus(), + reqVO.getTransferType().equals("code.bank.output") ? MonthStatus.NOTHING : currentMonthlyInfo.getBankAutoTransferOutputStatus() )); } return ResponseEntity.ok(ApiResponse.success(null)); 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 index 022feaf6..4fdf53e9 100644 --- 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 @@ -66,14 +66,14 @@ class GetBankInputUIController { if (pastMonthlyInfo != null) { pastList = getBanksPortIn.operate( pageable, - new GetBanksCmd(pastMonthlyInfo.getId(), AuthUtil.getUserSeq())); + new GetBanksCmd(pastMonthlyInfo.getId(), AuthUtil.getUserSeq(),"code.bank.input")); } Page currentList = Page.empty(); if (currentMonthlyInfo != null) { currentList = getBanksPortIn.operate( pageable, - new GetBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq())); + new GetBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(),"code.bank.input")); } diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java index df640af8..79af3aad 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/model/CreateBankInputReqVO.java @@ -15,6 +15,7 @@ public class CreateBankInputReqVO { private Boolean status; private Long id; + private String transferType; private List bankList; public List getBankList() { 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 index eab5d60e..09d2e19f 100644 --- 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 @@ -3,6 +3,9 @@ package app.module.front.usecase.info.bankUI.getBankOutputUI.adapters.web; import app.module.core.config.application.enums.MonthStatus; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.config.application.util.AuthUtil; +import app.module.front.usecase.info.bank.getBanks.ports.GetBanksPortIn; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanks; +import app.module.front.usecase.info.bank.getBanks.ports.application.domain.GetBanksCmd; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatusCmd; @@ -33,14 +36,18 @@ import java.util.NoSuchElementException; class GetBankOutputUIController { + private final GetPrevMonthlyInputStatusPortIn prevMonthlyInputStatusPortIn; private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; - + private final GetBanksPortIn getBanksPortIn; private final UICodeListPortIn uiCodeListPortIn; + + @GetMapping(path = "/info/bank/create/output/{id}") - String operate(Model model, - @PathVariable Long id) { + public 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("yyyyMM")); @@ -59,6 +66,22 @@ class GetBankOutputUIController { new GetMonthlyInputStatusCmd( id, AuthUtil.getUserSeq())).orElse(null); + + Page pastList = Page.empty(); + if (pastMonthlyInfo != null) { + pastList = getBanksPortIn.operate( + pageable, + new GetBanksCmd(pastMonthlyInfo.getId(), AuthUtil.getUserSeq(),"code.bank.output")); + } + + Page currentList = Page.empty(); + if (currentMonthlyInfo != null) { + currentList = getBanksPortIn.operate( + pageable, + new GetBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(),"code.bank.output")); + } + + //수정 가능 여부 판단 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter); @@ -71,14 +94,30 @@ class GetBankOutputUIController { model.addAttribute("pastMonthlyInfo", pastMonthlyInfo); model.addAttribute("currentMonthlyInfo", currentMonthlyInfo); - model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); + + model.addAttribute("pastBankList", pastList); + model.addAttribute("bankList", currentList); + + + model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output")); model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); model.addAttribute("MonthStatus", MonthStatus.class); model.addAttribute("editable", editable); + return "info/bank/output"; } + @GetMapping(path = "/api/front/info/bank/create/output/from") + public String operateForm(Model model) { + + + model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output")); + model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); + model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); + + return "info/bank/outputForm"; + } } \ No newline at end of file diff --git a/front/src/main/resources/mappers/bank/GetBanksMapper.xml b/front/src/main/resources/mappers/bank/GetBanksMapper.xml index 06873d5a..38790be9 100644 --- a/front/src/main/resources/mappers/bank/GetBanksMapper.xml +++ b/front/src/main/resources/mappers/bank/GetBanksMapper.xml @@ -38,6 +38,10 @@ AND a.household_seq = #{cmd.householdSeq} + + AND a.transfer_type = #{cmd.transferType} + + ORDER BY diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index 28417a0b..df94663b 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -7,7 +7,7 @@

- 은행 자동이체(수입) 내역 0건 등록 되었습니다. + 은행 자동이체(수입) 내역 [[${bankList.totalElements}]]건 등록 되었습니다.

수입 내역을 등록해 주세요.

@@ -428,6 +428,7 @@ { status: ENV.elementRefs.noDataCheckbox.checked, id: ENV.data.id, + transferType:"code.bank.input", bankList: ENV.data.bankList }, function (rstData, status) { diff --git a/front/src/main/resources/templates/info/bank/output.html b/front/src/main/resources/templates/info/bank/output.html index 0a9f4b49..e2b81ef6 100644 --- a/front/src/main/resources/templates/info/bank/output.html +++ b/front/src/main/resources/templates/info/bank/output.html @@ -7,7 +7,7 @@

- 은행 자동이체(지출) 내역 0건 등록 되었습니다. + 은행 자동이체(지출) 내역 [[${bankList.totalElements}]]건 등록 되었습니다.

지출 내역을 등록해 주세요.

@@ -53,7 +53,7 @@
-
@@ -78,199 +78,11 @@ "/api/front/info/bank/create"
+ ` + +
diff --git a/front/src/main/resources/templates/info/bank/outputForm.html b/front/src/main/resources/templates/info/bank/outputForm.html new file mode 100644 index 00000000..e97428ce --- /dev/null +++ b/front/src/main/resources/templates/info/bank/outputForm.html @@ -0,0 +1,164 @@ + + + + + + +
+ + +

필수입력

+ +
+ +
+ +
+
+

+ 지출의 종류 + * +

+
+
+ + + +
+
+

지출의 종류

+ +
+
+
    + +
  • +
  • +
    +
+
+
+
+ + +
+
+ +
+
    +
  • 수입 대상을 입력해 주세요.
  • +
  • +
+
+
+
+
+
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+
+ +
+
    +
  • 예 : 2, 2.5
  • +
+
+ +
+
+

+ 단위 +

+
+
+ + +
+
+

단위

+ +
+
+
    + +
  • option1 +
  • +
    +
+
+
+
+
+
+ +
+ +
+ +
+
+ +
+
+ + 원 +
+ +
    +
  • 예 : 30000
  • +
+
+
+ +
+
+ +
+
+ + + + + + + + \ No newline at end of file