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 facc7e53..71f45956 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 @@ -35,8 +35,7 @@ class GetBankInputUIController { @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) { + @PathVariable Long id) { String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")); 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 16c9b8e9..eab5d60e 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 @@ -1,10 +1,17 @@ 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.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; 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 app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.GetPrevMonthlyInputStatusPortIn; +import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatus; +import app.module.front.usecase.info.monthly.getPrevMonthlyInputStatus.ports.application.domain.GetPrevMonthlyInputStatusCmd; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -17,6 +24,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import java.time.LocalDate; +import java.time.YearMonth; import java.time.format.DateTimeFormatter; import java.util.NoSuchElementException; @@ -25,15 +33,51 @@ import java.util.NoSuchElementException; class GetBankOutputUIController { - private final GetMonthlyInputStatussPortIn portIn; + private final GetPrevMonthlyInputStatusPortIn prevMonthlyInputStatusPortIn; + private final GetMonthlyInputStatusPortIn getMonthlyInputStatusPortIn; + + private final UICodeListPortIn uiCodeListPortIn; @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) { + @PathVariable Long id) { String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")); + + // 전달 입력 상태 취득 , 데이터가 없을 경우 null + // 이전달 입력상태:NONE일 경우도 null + + GetPrevMonthlyInputStatus pastMonthlyInfo = + prevMonthlyInputStatusPortIn.operate( + new GetPrevMonthlyInputStatusCmd( + id, AuthUtil.getUserSeq())).orElse(null); + + //이번달 달 입력 상태 취득 + GetMonthlyInputStatus currentMonthlyInfo = + getMonthlyInputStatusPortIn.operate( + new GetMonthlyInputStatusCmd( + id, AuthUtil.getUserSeq())).orElse(null); + + //수정 가능 여부 판단 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); + YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter); + + LocalDate maxMonth = yearMonth.plusMonths(1).atDay(15); + LocalDate today = LocalDate.now(); + boolean editable = !today.isAfter(maxMonth); + + + model.addAttribute("pastMonthlyInfo", pastMonthlyInfo); + model.addAttribute("currentMonthlyInfo", currentMonthlyInfo); + + model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input")); + 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"; } diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index dbe8ea49..538b54db 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -36,6 +36,14 @@ +