From 36b2f7302a92f6c8557b4262d8afff40b2e56e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 14 Jul 2025 10:37:09 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9E=85=EB=A0=A5=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=97=90=EC=84=9C=20=EA=B7=B8=EB=A3=B9Count?= =?UTF-8?q?=20=EB=8C=80=EC=8B=A0=20childrenCount=20=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/DailyExpenseMonthDto.java | 3 +- .../model/DailyFarmingMonthDto.java | 3 +- .../model/DailyForestryMonthDto.java | 3 +- .../model/DailyIncomeMonthDto.java | 3 +- .../persistence/model/DailyPowerMonthDto.java | 3 +- .../adapters/web/DailyStatusUIController.java | 70 +++++++++++++------ .../status/ports/DailyStatusHasChildren.java | 7 ++ .../persistence/model/DailyWorkMonthDto.java | 6 +- .../status/daily/detail-expense.html | 2 +- .../status/daily/detail-farming.html | 2 +- .../status/daily/detail-forestry.html | 2 +- .../templates/status/daily/detail-income.html | 2 +- .../templates/status/daily/detail-power.html | 2 +- .../templates/status/daily/detail-work.html | 2 +- 14 files changed, 75 insertions(+), 35 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java index 4d279872..6d716083 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.expense.adapters.persistence.model; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import java.util.List; @Getter @Setter -public class DailyExpenseMonthDto { +public class DailyExpenseMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java index 536adebb..87faf87f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.farming.adapters.persistence.model; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -9,7 +10,7 @@ import java.util.List; @Getter @Setter -public class DailyFarmingMonthDto { +public class DailyFarmingMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java index ed1bff85..447dc5f1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.forestry.adapters.persistence.model; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -9,7 +10,7 @@ import java.util.List; @Getter @Setter -public class DailyForestryMonthDto { +public class DailyForestryMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java index c07ba2a7..cb8b9eab 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeMonthDto.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.income.adapters.persistence.model; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -10,7 +11,7 @@ import java.util.List; @Getter @Setter @ToString -public class DailyIncomeMonthDto { +public class DailyIncomeMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java index c7e18d93..564dc560 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.power.adapters.persistence.model; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import java.util.List; @Getter @Setter -public class DailyPowerMonthDto { +public class DailyPowerMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java index 340e81f0..c2c4a27e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java @@ -2,12 +2,14 @@ package app.module.front.usecase.daily.status.adapters.web; import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.exception.NoMatchingURIException; +import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; @@ -25,6 +27,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; +import java.util.Objects; + @Slf4j @Controller @RequiredArgsConstructor @@ -63,29 +68,54 @@ public class DailyStatusUIController { */ @GetMapping(path = "/{step}/{searchMonth}") public String detail(Model model, @PathVariable("step") String step, @PathVariable("searchMonth") String searchMonth) { - if (DailySort.INCOME.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.INCOME); - model.addAttribute("list", dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""))); - } else if (DailySort.WORK.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.WORK); - model.addAttribute("list", dailyWorkPortIn.monthList(new DailyWorkUIReqVO(searchMonth, ""))); - } else if (DailySort.EXPENSE.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.EXPENSE); - model.addAttribute("list", dailyExpensePortIn.monthList(new DailyExpenseUIReqVO(searchMonth, ""))); - } else if (DailySort.POWER.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.POWER); - model.addAttribute("list", dailyPowerPortIn.monthList(new DailyPowerUIReqVO(searchMonth, ""))); - } else if (DailySort.FORESTRY.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.FORESTRY); - model.addAttribute("list", dailyForestryPortIn.monthList(new DailyForestryUIReqVO(searchMonth, ""))); - } else if (DailySort.FARMING.name().equalsIgnoreCase(step)) { - model.addAttribute("step", DailySort.FARMING); - model.addAttribute("list", dailyFarmingPortIn.monthList(new DailyFarmingUIReqVO(searchMonth, ""))); - } else { - throw new NoMatchingURIException("잘못된 접근"); + switch (DailySort.valueOf(step.toUpperCase())) { + case INCOME -> { + processStep(model, DailySort.INCOME, + dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""))); + } + case WORK -> { + processStep(model, DailySort.WORK, + dailyWorkPortIn.monthList(new DailyWorkUIReqVO(searchMonth, ""))); + } + case EXPENSE -> { + processStep(model, DailySort.EXPENSE, + dailyExpensePortIn.monthList(new DailyExpenseUIReqVO(searchMonth, ""))); + } + case POWER -> { + processStep(model, DailySort.POWER, + dailyPowerPortIn.monthList(new DailyPowerUIReqVO(searchMonth, ""))); + } + case FORESTRY -> { + processStep(model, DailySort.EXPENSE, + dailyForestryPortIn.monthList(new DailyForestryUIReqVO(searchMonth, ""))); + } + case FARMING -> { + processStep(model, DailySort.FARMING, + dailyFarmingPortIn.monthList(new DailyFarmingUIReqVO(searchMonth, ""))); + } + default -> throw new NoMatchingURIException("잘못된 접근"); } model.addAttribute("searchMonth", searchMonth); return String.format("status/daily/detail-%s", step); } + + /** + * 일계부 입력 현황 상세 화면 처리 + * + * @param model Model + * @param step 단계 + * @param list 데이터 목록 + * @param 데이터 Model + */ + private void processStep(Model model, DailySort step, List list) { + int childrenCount = list.stream() + .filter(Objects::nonNull) + .mapToInt(dto -> dto.getChildren() != null ? dto.getChildren().size() : 0) + .sum(); + + model.addAttribute("step", step); + model.addAttribute("list", list); + model.addAttribute("childrenCount", childrenCount); + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java new file mode 100644 index 00000000..54b3eff1 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusHasChildren.java @@ -0,0 +1,7 @@ +package app.module.front.usecase.daily.status.ports; + +import java.util.List; + +public interface DailyStatusHasChildren { + List getChildren(); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java index 7adfef0d..d6c99877 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java @@ -1,19 +1,17 @@ package app.module.front.usecase.daily.work.adapters.persistence.model; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.status.ports.DailyStatusHasChildren; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import java.math.BigDecimal; import java.time.LocalDate; import java.util.List; @Slf4j @Getter @Setter -public class DailyWorkMonthDto { +public class DailyWorkMonthDto implements DailyStatusHasChildren { private Long dailyRecordSeq; private LocalDate startDate; private LocalDate endDate; diff --git a/front/src/main/resources/templates/status/daily/detail-expense.html b/front/src/main/resources/templates/status/daily/detail-expense.html index 5633aedf..d25e5b7f 100644 --- a/front/src/main/resources/templates/status/daily/detail-expense.html +++ b/front/src/main/resources/templates/status/daily/detail-expense.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-farming.html b/front/src/main/resources/templates/status/daily/detail-farming.html index 5e26e968..60370c07 100644 --- a/front/src/main/resources/templates/status/daily/detail-farming.html +++ b/front/src/main/resources/templates/status/daily/detail-farming.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-forestry.html b/front/src/main/resources/templates/status/daily/detail-forestry.html index 446ed63a..7337cfe0 100644 --- a/front/src/main/resources/templates/status/daily/detail-forestry.html +++ b/front/src/main/resources/templates/status/daily/detail-forestry.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-income.html b/front/src/main/resources/templates/status/daily/detail-income.html index d8f41789..14e38ae8 100644 --- a/front/src/main/resources/templates/status/daily/detail-income.html +++ b/front/src/main/resources/templates/status/daily/detail-income.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-power.html b/front/src/main/resources/templates/status/daily/detail-power.html index a7808e4d..d1a18c93 100644 --- a/front/src/main/resources/templates/status/daily/detail-power.html +++ b/front/src/main/resources/templates/status/daily/detail-power.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.

diff --git a/front/src/main/resources/templates/status/daily/detail-work.html b/front/src/main/resources/templates/status/daily/detail-work.html index bbe6bd07..05f65d2b 100644 --- a/front/src/main/resources/templates/status/daily/detail-work.html +++ b/front/src/main/resources/templates/status/daily/detail-work.html @@ -7,7 +7,7 @@

[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이
- [[${#lists.size(list)}]]건 등록 되었습니다. + [[${childrenCount}]]건 등록 되었습니다.