From 2415a3090e7e25d04098d1608913ec569d308d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 8 Jul 2025 14:54:59 +0900 Subject: [PATCH] =?UTF-8?q?[2=EC=B0=A8][FO]=20=EC=9E=85=EB=A0=A5=ED=98=84?= =?UTF-8?q?=ED=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/DailyExpenseDao.java | 19 ++-- .../persistence/DailyExpenseMapper.java | 12 ++- .../persistence/model/DailyExpenseDto.java | 4 + .../model/DailyExpenseMonthDto.java | 16 ++++ .../expense/ports/DailyExpensePortIn.java | 11 ++- .../expense/ports/DailyExpensePortOut.java | 10 ++ .../application/DailyExpenseService.java | 38 ++++++-- .../adapters/persistence/DailyFarmingDao.java | 5 + .../persistence/DailyFarmingMapper.java | 14 ++- .../persistence/model/DailyFarmingDto.java | 4 + .../model/DailyFarmingMonthDto.java | 17 ++++ .../farming/ports/DailyFarmingPortIn.java | 13 ++- .../farming/ports/DailyFarmingPortOut.java | 10 ++ .../application/DailyFarmingService.java | 37 ++++++-- .../persistence/DailyForestryDao.java | 5 + .../persistence/DailyForestryMapper.java | 14 ++- .../persistence/model/DailyForestryDto.java | 4 + .../model/DailyForestryMonthDto.java | 17 ++++ .../forestry/ports/DailyForestryPortIn.java | 11 ++- .../forestry/ports/DailyForestryPortOut.java | 10 ++ .../application/DailyForestryService.java | 36 +++++-- .../adapters/persistence/DailyIncomeDao.java | 16 ++-- .../income/ports/DailyIncomePortOut.java | 2 +- .../ports/application/DailyIncomeService.java | 1 - .../adapters/persistence/DailyPowerDao.java | 20 ++-- .../persistence/DailyPowerMapper.java | 12 ++- .../persistence/model/DailyPowerDto.java | 4 + .../persistence/model/DailyPowerMonthDto.java | 16 ++++ .../daily/power/ports/DailyPowerPortIn.java | 12 ++- .../daily/power/ports/DailyPowerPortOut.java | 10 ++ .../ports/application/DailyPowerService.java | 35 +++++-- .../adapters/web/DailyStatusUIController.java | 58 +++++------ .../adapters/persistence/DailyWorkDao.java | 19 ++-- .../adapters/persistence/DailyWorkMapper.java | 12 ++- .../persistence/model/DailyWorkDto.java | 3 + .../persistence/model/DailyWorkMonthDto.java | 21 ++++ .../daily/work/ports/DailyWorkPortIn.java | 13 ++- .../daily/work/ports/DailyWorkPortOut.java | 10 +- .../ports/application/DailyWorkService.java | 38 ++++++-- .../mappers/daily/DailyExpenseMapper.xml | 13 +++ .../mappers/daily/DailyFarmingMapper.xml | 15 ++- .../mappers/daily/DailyForestryMapper.xml | 15 ++- .../mappers/daily/DailyPowerMapper.xml | 12 +++ .../mappers/daily/DailyWorkMapper.xml | 15 +++ .../status/daily/detail-expense.html | 63 ++++++++++++ .../status/daily/detail-farming.html | 55 +++++++++++ .../status/daily/detail-forestry.html | 55 +++++++++++ .../templates/status/daily/detail-power.html | 51 ++++++++++ .../templates/status/daily/detail-work.html | 95 +++++++++++++++++++ 49 files changed, 889 insertions(+), 109 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java create mode 100644 front/src/main/resources/templates/status/daily/detail-expense.html create mode 100644 front/src/main/resources/templates/status/daily/detail-farming.html create mode 100644 front/src/main/resources/templates/status/daily/detail-forestry.html create mode 100644 front/src/main/resources/templates/status/daily/detail-power.html create mode 100644 front/src/main/resources/templates/status/daily/detail-work.html diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java index b191844a..96b99bca 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseDao.java @@ -15,22 +15,27 @@ import java.util.List; @Repository @RequiredArgsConstructor public class DailyExpenseDao implements DailyExpensePortOut { - private final DailyExpenseMapper dailyExpenseMapper; + private final DailyExpenseMapper mapper; @Override public List list(GetDailyExpenseCmd command) { - return dailyExpenseMapper.getDailyExpenseList(command); + return mapper.getDailyExpenseList(command); + } + + @Override + public List monthList(GetDailyExpenseCmd command) { + return mapper.getDailyExpenseMonthList(command); } @Override public void create(GetDailyExpenseCmd findCmd, CreateDailyExpenseCmd command) { - Integer existCount = dailyExpenseMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount == 0) { - dailyExpenseMapper.createDailyExpense(command); + mapper.createDailyExpense(command); log.debug("[CreateDailyExpense] record={}", command); } else { - dailyExpenseMapper.updateDailyExpense(command); + mapper.updateDailyExpense(command); log.debug("[UpdateDailyExpense] record={}", command); } @@ -38,9 +43,9 @@ public class DailyExpenseDao implements DailyExpensePortOut { @Override public void remove(GetDailyExpenseCmd findCmd, RemoveDailyExpenseCmd command) { - Integer existCount = dailyExpenseMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount != 0) { - dailyExpenseMapper.removeDailyExpense(command); + mapper.removeDailyExpense(command); log.debug("[RemoveDailyExpense] record={}", command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseMapper.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseMapper.java index 84226198..18c497c4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/DailyExpenseMapper.java @@ -5,6 +5,8 @@ import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyEx import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -12,13 +14,21 @@ import java.util.List; @Mapper public interface DailyExpenseMapper { /** - * 일계부 지출 목록 조회 + * 특정 그룹일의 일계부 지출 목록 조회 * * @param command 검색 조건 * @return 수입 목록 */ List getDailyExpenseList(GetDailyExpenseCmd command); + /** + * 특정월의 일계부 지출 목록 조회 + * + * @param command 검색 조건 + * @return 지출 목록 + */ + List getDailyExpenseMonthList(GetDailyExpenseCmd command); + /** * 일계부 지출 데이터 존재 여부 * diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java index aa9eb01f..fd30337f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java @@ -4,6 +4,8 @@ import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import lombok.Getter; import lombok.Setter; +import java.time.LocalDate; + @Getter @Setter public class DailyExpenseDto { @@ -19,6 +21,8 @@ public class DailyExpenseDto { private String unitSelf; private Long price; private Long estimatedValue; + private LocalDate startDate; + private LocalDate endDate; /** * 수정 가능 여부 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 new file mode 100644 index 00000000..4d279872 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseMonthDto.java @@ -0,0 +1,16 @@ +package app.module.front.usecase.daily.expense.adapters.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; +import java.util.List; + +@Getter +@Setter +public class DailyExpenseMonthDto { + private Long dailyRecordSeq; + private LocalDate startDate; + private LocalDate endDate; + private List children; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortIn.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortIn.java index 4bd24569..e29525e7 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortIn.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.expense.ports; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto; +import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto; import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO; @@ -9,13 +10,21 @@ import java.util.List; public interface DailyExpensePortIn { /** - * 일계부 지출 조회 + * 특정 그룹일의 일계부 지출 조회 * * @param reqVO 검색 조건 * @return 지출 목록 */ List list(DailyExpenseUIReqVO reqVO); + /** + * 특정월의 일계부 수입 조회 + * + * @param reqVO 검색 조건 + * @return 수입 목록 + */ + List monthList(DailyExpenseUIReqVO reqVO); + /** * 일계부 지출 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java index 3bbf6130..edefcebd 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/DailyExpensePortOut.java @@ -4,6 +4,8 @@ import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyEx import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import java.util.List; @@ -16,6 +18,14 @@ public interface DailyExpensePortOut { */ List list(GetDailyExpenseCmd command); + /** + * 일계부 지출 조회 + * + * @param command 검색 조건 + * @return 지출 목록 + */ + List monthList(GetDailyExpenseCmd command); + /** * 일계부 지출 등록 * diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java index 39aa5e4c..d47bfeff 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java @@ -7,6 +7,7 @@ import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElemen import app.module.front.config.application.util.AuditUtil; import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto; +import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseMonthDto; import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.adapters.web.model.RemoveDailyExpenseReqVO; @@ -15,11 +16,13 @@ import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut; import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; -import app.module.core.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -30,12 +33,30 @@ public class DailyExpenseService implements DailyExpensePortIn { @Override public List list(DailyExpenseUIReqVO reqVO) { - return this.getRefineList(reqVO); + return this.getRefineList(reqVO, true); + } + + @Override + public List monthList(DailyExpenseUIReqVO reqVO) { + List list = this.getRefineList(reqVO, false); + + List monthList = new ArrayList<>(); + List recordSeqList = list.stream().map(DailyExpenseDto::getDailyRecordSeq).distinct().toList(); + for (Long seq : recordSeqList) { + DailyExpenseMonthDto month = new DailyExpenseMonthDto(); + month.setDailyRecordSeq(seq); + month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyExpenseDto::getStartDate).findFirst().orElse(null)); + month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyExpenseDto::getEndDate).findFirst().orElse(null)); + month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList())); + monthList.add(month); + } + + return monthList; } @Override public DailyExpenseDto detail(DailyExpenseUIReqVO reqVO) { - List list = this.getRefineList(reqVO); + List list = this.getRefineList(reqVO, true); if (list.isEmpty()) { return null; } @@ -46,14 +67,17 @@ public class DailyExpenseService implements DailyExpensePortIn { /** * 목록 데이터 조회 * - * @param reqVO 검색 조건 + * @param reqVO 검색 조건 + * @param dayGroup 일 그룹 조건(true=일, false=월) * @return 공통 처리된 목록 */ - private List getRefineList(DailyExpenseUIReqVO reqVO) { - List list = portOut.list(new GetDailyExpenseCmd(reqVO.getSearchMonth(), + private List getRefineList(DailyExpenseUIReqVO reqVO, boolean dayGroup) { + GetDailyExpenseCmd command = new GetDailyExpenseCmd(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq(), - reqVO.getId())); + reqVO.getId()); + + List list = dayGroup ? portOut.list(command) : portOut.monthList(command); List recordUnit = uiCodeListPortIn.connect("code.record.unit"); diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java index ec3c1261..4eaf8f31 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java @@ -22,6 +22,11 @@ public class DailyFarmingDao implements DailyFarmingPortOut { return mapper.getDailyFarmingList(command); } + @Override + public List monthList(GetDailyFarmingCmd command) { + return mapper.getDailyFarmingMonthList(command); + } + @Override public void create(GetDailyFarmingCmd findCmd, CreateDailyFarmingCmd command) { Integer existCount = mapper.getRecordExistCount(findCmd); diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java index b7b321b6..2aa6eca1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java @@ -4,6 +4,8 @@ import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFa import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -11,13 +13,21 @@ import java.util.List; @Mapper public interface DailyFarmingMapper { /** - * 일계부 자가농업 목록 조회 + * 특정 그룹일의 일계부 자가농업 목록 조회 * * @param command 검색 조건 - * @return 수입 목록 + * @return 자가농업 목록 */ List getDailyFarmingList(GetDailyFarmingCmd command); + /** + * 특정월의 일계부 자가농업 목록 조회 + * + * @param command 검색 조건 + * @return 자가농업 목록 + */ + List getDailyFarmingMonthList(GetDailyFarmingCmd command); + /** * 일계부 자가농업 데이터 존재 여부 * diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java index 43c35436..ab4ad574 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java @@ -3,6 +3,8 @@ package app.module.front.usecase.daily.farming.adapters.persistence.model; import lombok.Getter; import lombok.Setter; +import java.time.LocalDate; + @Getter @Setter public class DailyFarmingDto { @@ -17,6 +19,8 @@ public class DailyFarmingDto { private String unitLabel; private String unitSelf; private Long estimatedValue; + 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 new file mode 100644 index 00000000..536adebb --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingMonthDto.java @@ -0,0 +1,17 @@ +package app.module.front.usecase.daily.farming.adapters.persistence.model; + +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; +import java.util.List; + +@Getter +@Setter +public class DailyFarmingMonthDto { + private Long dailyRecordSeq; + private LocalDate startDate; + private LocalDate endDate; + private List children; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java index 6ec84319..00e541e1 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java @@ -2,21 +2,32 @@ package app.module.front.usecase.daily.farming.ports; import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingMonthDto; import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; +import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import java.util.List; public interface DailyFarmingPortIn { /** - * 일계부 자가농업 조회 + * 특정 그룹일의 일계부 자가농업 조회 * * @param reqVO 검색 조건 * @return 자가농업 목록 */ List list(DailyFarmingUIReqVO reqVO); + /** + * 특정월의 일계부 자가농업 조회 + * + * @param reqVO 검색 조건 + * @return 자가농업 목록 + */ + List monthList(DailyFarmingUIReqVO reqVO); + /** * 일계부 자가농업 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java index 1e0d007a..6b189a3b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java @@ -5,6 +5,8 @@ import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFa import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import java.util.List; @@ -17,6 +19,14 @@ public interface DailyFarmingPortOut { */ List list(GetDailyFarmingCmd command); + /** + * 일계부 자가농업 조회 + * + * @param command 검색 조건 + * @return 자가농업 목록 + */ + List monthList(GetDailyFarmingCmd command); + /** * 일계부 자가농업 등록 * diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java index 6aa9110a..9dfd75da 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java @@ -7,6 +7,7 @@ import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElemen import app.module.front.config.application.util.AuditUtil; import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingMonthDto; import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO; @@ -19,8 +20,11 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; @Slf4j @Service @@ -33,12 +37,30 @@ public class DailyFarmingService implements DailyFarmingPortIn { @Override public List list(DailyFarmingUIReqVO reqVO) { - return this.getRefineList(reqVO); + return this.getRefineList(reqVO, true); + } + + @Override + public List monthList(DailyFarmingUIReqVO reqVO) { + List list = this.getRefineList(reqVO, false); + + List monthList = new ArrayList<>(); + List recordSeqList = list.stream().map(DailyFarmingDto::getDailyRecordSeq).distinct().toList(); + for (Long seq : recordSeqList) { + DailyFarmingMonthDto month = new DailyFarmingMonthDto(); + month.setDailyRecordSeq(seq); + month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyFarmingDto::getStartDate).findFirst().orElse(null)); + month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyFarmingDto::getEndDate).findFirst().orElse(null)); + month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList())); + monthList.add(month); + } + + return monthList; } @Override public DailyFarmingDto detail(DailyFarmingUIReqVO reqVO) { - List list = this.getRefineList(reqVO); + List list = this.getRefineList(reqVO, true); if (list.isEmpty()) { return null; } @@ -49,14 +71,17 @@ public class DailyFarmingService implements DailyFarmingPortIn { /** * 목록 데이터 조회 * - * @param reqVO 검색 조건 + * @param reqVO 검색 조건 + * @param dayGroup 일 그룹 조건(true=일, false=월) * @return 공통 처리된 목록 */ - private List getRefineList(DailyFarmingUIReqVO reqVO) { - List list = portOut.list(new GetDailyFarmingCmd(reqVO.getSearchMonth(), + private List getRefineList(DailyFarmingUIReqVO reqVO, boolean dayGroup) { + GetDailyFarmingCmd command = new GetDailyFarmingCmd(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq(), - reqVO.getId())); + reqVO.getId()); + + List list = dayGroup ? portOut.list(command) : portOut.monthList(command); List recordFarming = uiCodeListPortIn.connect("code.record.farming"); List recordUnit = uiCodeListPortIn.connect("code.record.unit"); diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryDao.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryDao.java index 1c11aeb9..4b260bed 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryDao.java @@ -22,6 +22,11 @@ public class DailyForestryDao implements DailyForestryPortOut { return mapper.getDailyForestryList(command); } + @Override + public List monthList(GetDailyForestryCmd command) { + return mapper.getDailyForestryMonthList(command); + } + @Override public void create(GetDailyForestryCmd findCmd, CreateDailyForestryCmd command) { Integer existCount = mapper.getRecordExistCount(findCmd); diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java index 5f135fbc..16c00b4b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/DailyForestryMapper.java @@ -5,6 +5,8 @@ import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyF import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -12,13 +14,21 @@ import java.util.List; @Mapper public interface DailyForestryMapper { /** - * 일계부 자가임업 목록 조회 + * 특정 그룹일의 일계부 자가임업 목록 조회 * * @param command 검색 조건 - * @return 수입 목록 + * @return 자가임업 목록 */ List getDailyForestryList(GetDailyForestryCmd command); + /** + * 특정월의 일계부 자가임업 목록 조회 + * + * @param command 검색 조건 + * @return 자가임업 목록 + */ + List getDailyForestryMonthList(GetDailyForestryCmd command); + /** * 일계부 자가임업 데이터 존재 여부 * diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java index 0a72fad6..dbf8c3da 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryDto.java @@ -3,6 +3,8 @@ package app.module.front.usecase.daily.forestry.adapters.persistence.model; import lombok.Getter; import lombok.Setter; +import java.time.LocalDate; + @Getter @Setter public class DailyForestryDto { @@ -15,6 +17,8 @@ public class DailyForestryDto { private String unitLabel; private String unitSelf; private Long estimatedValue; + 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 new file mode 100644 index 00000000..ed1bff85 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/persistence/model/DailyForestryMonthDto.java @@ -0,0 +1,17 @@ +package app.module.front.usecase.daily.forestry.adapters.persistence.model; + +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; +import java.util.List; + +@Getter +@Setter +public class DailyForestryMonthDto { + private Long dailyRecordSeq; + private LocalDate startDate; + private LocalDate endDate; + private List children; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortIn.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortIn.java index c35261a5..25f9173e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortIn.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.forestry.ports; import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto; +import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryMonthDto; import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO; @@ -9,13 +10,21 @@ import java.util.List; public interface DailyForestryPortIn { /** - * 일계부 자가임업 조회 + * 특정 그룹일의 일계부 자가임업 조회 * * @param reqVO 검색 조건 * @return 자가임업 목록 */ List list(DailyForestryUIReqVO reqVO); + /** + * 특정월의 일계부 자가임업 조회 + * + * @param reqVO 검색 조건 + * @return 자가임업 목록 + */ + List monthList(DailyForestryUIReqVO reqVO); + /** * 일계부 자가임업 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java index 53acc933..75f946c2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/DailyForestryPortOut.java @@ -4,6 +4,8 @@ import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyF import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import java.util.List; @@ -16,6 +18,14 @@ public interface DailyForestryPortOut { */ List list(GetDailyForestryCmd command); + /** + * 일계부 자가임업 조회 + * + * @param command 검색 조건 + * @return 자가임업 목록 + */ + List monthList(GetDailyForestryCmd command); + /** * 일계부 자가임업 등록 * diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java index ec823cc5..85386bf7 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java @@ -7,6 +7,7 @@ import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElemen import app.module.front.config.application.util.AuditUtil; import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryDto; +import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyForestryMonthDto; import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.adapters.web.model.RemoveDailyForestryReqVO; @@ -15,12 +16,14 @@ import app.module.front.usecase.daily.forestry.ports.DailyForestryPortOut; import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd; -import app.module.core.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; @Slf4j @Service @@ -32,12 +35,30 @@ public class DailyForestryService implements DailyForestryPortIn { @Override public List list(DailyForestryUIReqVO reqVO) { - return this.getRefineList(reqVO); + return this.getRefineList(reqVO, false); + } + + @Override + public List monthList(DailyForestryUIReqVO reqVO) { + List list = this.getRefineList(reqVO, false); + + List monthList = new ArrayList<>(); + List recordSeqList = list.stream().map(DailyForestryDto::getDailyRecordSeq).distinct().toList(); + for (Long seq : recordSeqList) { + DailyForestryMonthDto month = new DailyForestryMonthDto(); + month.setDailyRecordSeq(seq); + month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyForestryDto::getStartDate).findFirst().orElse(null)); + month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyForestryDto::getEndDate).findFirst().orElse(null)); + month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList())); + monthList.add(month); + } + + return monthList; } @Override public DailyForestryDto detail(DailyForestryUIReqVO reqVO) { - List list = this.getRefineList(reqVO); + List list = this.getRefineList(reqVO, true); if (list.isEmpty()) { return null; } @@ -49,13 +70,16 @@ public class DailyForestryService implements DailyForestryPortIn { * 목록 데이터 조회 * * @param reqVO 검색 조건 + * @param dayGroup 일 그룹 조건(true=일, false=월) * @return 공통 처리된 목록 */ - private List getRefineList(DailyForestryUIReqVO reqVO) { - List list = portOut.list(new GetDailyForestryCmd(reqVO.getSearchMonth(), + private List getRefineList(DailyForestryUIReqVO reqVO, boolean dayGroup) { + GetDailyForestryCmd command = new GetDailyForestryCmd(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq(), - reqVO.getId())); + reqVO.getId()); + + List list = dayGroup ? portOut.list(command) : portOut.monthList(command); List recordUnit = uiCodeListPortIn.connect("code.record.unit"); diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java index 745ce531..4acee90b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java @@ -15,27 +15,27 @@ import java.util.List; @Service @RequiredArgsConstructor public class DailyIncomeDao implements DailyIncomePortOut { - private final DailyIncomeMapper dailyIncomeMapper; + private final DailyIncomeMapper mapper; @Override public List list(GetDailyIncomeCmd command) { - return dailyIncomeMapper.getDailyIncomeList(command); + return mapper.getDailyIncomeList(command); } @Override public List monthList(GetDailyIncomeCmd command) { - return dailyIncomeMapper.getDailyIncomeMonthList(command); + return mapper.getDailyIncomeMonthList(command); } @Override public void create(GetDailyIncomeCmd findCmd, CreateDailyIncomeCmd command) { - Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount == 0) { - dailyIncomeMapper.createDailyIncome(command); + mapper.createDailyIncome(command); log.debug("[CreateDailyIncome] record={}", command); } else { - dailyIncomeMapper.updateDailyIncome(command); + mapper.updateDailyIncome(command); log.debug("[UpdateDailyIncome] record={}", command); } @@ -43,9 +43,9 @@ public class DailyIncomeDao implements DailyIncomePortOut { @Override public void remove(GetDailyIncomeCmd findCmd, RemoveDailyIncomeCmd command) { - Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount != 0) { - dailyIncomeMapper.removeDailyIncome(command); + mapper.removeDailyIncome(command); log.debug("[RemoveDailyIncome] record={}", command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java index 4a218f6d..9b1c76a4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java @@ -22,7 +22,7 @@ public interface DailyIncomePortOut { * @param command 검색 조건 * @return 수입 목록 */ - List monthList(GetDailyIncomeCmd command);; + List monthList(GetDailyIncomeCmd command); /** * 일계부 수입 등록 diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java index d76d3614..43417e68 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java @@ -45,7 +45,6 @@ public class DailyIncomeService implements DailyIncomePortIn { for (Long seq : recordSeqList) { DailyIncomeMonthDto month = new DailyIncomeMonthDto(); month.setDailyRecordSeq(seq); - month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getStartDate).findFirst().orElse(null)); month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyIncomeDto::getEndDate).findFirst().orElse(null)); month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList())); diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java index 65dfea7b..7c7ebb76 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerDao.java @@ -1,6 +1,5 @@ package app.module.front.usecase.daily.power.adapters.persistence; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; import app.module.front.usecase.daily.power.ports.DailyPowerPortOut; import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; @@ -16,22 +15,27 @@ import java.util.List; @Service @RequiredArgsConstructor public class DailyPowerDao implements DailyPowerPortOut { - private final DailyPowerMapper dailyPowerMapper; + private final DailyPowerMapper mapper; @Override public List list(GetDailyPowerCmd command) { - return dailyPowerMapper.getDailyPowerList(command); + return mapper.getDailyPowerList(command); + } + + @Override + public List monthList(GetDailyPowerCmd command) { + return mapper.getDailyPowerMonthList(command); } @Override public void create(GetDailyPowerCmd findCmd, CreateDailyPowerCmd command) { - Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount == 0) { - dailyPowerMapper.createDailyPower(command); + mapper.createDailyPower(command); log.debug("[CreateDailyPower] record={}", command); } else { - dailyPowerMapper.updateDailyPower(command); + mapper.updateDailyPower(command); log.debug("[UpdateDailyPower] record={}", command); } @@ -39,9 +43,9 @@ public class DailyPowerDao implements DailyPowerPortOut { @Override public void remove(GetDailyPowerCmd findCmd, RemoveDailyPowerCmd command) { - Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount != 0) { - dailyPowerMapper.removeDailyPower(command); + mapper.removeDailyPower(command); log.debug("[RemoveDailyPower] record={}", command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java index 9aaf12f0..c32b1345 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/DailyPowerMapper.java @@ -1,5 +1,7 @@ package app.module.front.usecase.daily.power.adapters.persistence; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; @@ -12,13 +14,21 @@ import java.util.List; @Mapper public interface DailyPowerMapper { /** - * 일계부 동력 사용시간 목록 조회 + * 특정 그룹일의 일계부 동력 사용시간 목록 조회 * * @param command 검색 조건 * @return 동력 사용시간 목록 */ List getDailyPowerList(GetDailyPowerCmd command); + /** + * 특정월의 일계부 동력 사용시간 목록 조회 + * + * @param command 검색 조건 + * @return 동력 사용시간 목록 + */ + List getDailyPowerMonthList(GetDailyPowerCmd command); + /** * 일계부 동력 사용시간 데이터 존재 여부 * diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java index 01950bec..da9d9b7a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java @@ -3,6 +3,8 @@ package app.module.front.usecase.daily.power.adapters.persistence.model; import lombok.Getter; import lombok.Setter; +import java.time.LocalDate; + @Getter @Setter public class DailyPowerDto { @@ -11,6 +13,8 @@ public class DailyPowerDto { private String equipmentName; private String ownedHours; private String leasedHours; + 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 new file mode 100644 index 00000000..c7e18d93 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerMonthDto.java @@ -0,0 +1,16 @@ +package app.module.front.usecase.daily.power.adapters.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; +import java.util.List; + +@Getter +@Setter +public class DailyPowerMonthDto { + private Long dailyRecordSeq; + private LocalDate startDate; + private LocalDate endDate; + private List children; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java index 081a2d00..d4dcfd14 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortIn.java @@ -1,7 +1,7 @@ package app.module.front.usecase.daily.power.ports; - import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerMonthDto; import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO; @@ -10,13 +10,21 @@ import java.util.List; public interface DailyPowerPortIn { /** - * 일계부 동력 사용시간 조회 + * 특정 그룹일의 일계부 동력 사용시간 조회 * * @param reqVO 검색 조건 * @return 동력 사용시간 목록 */ List list(DailyPowerUIReqVO reqVO); + /** + * 특정월의 일계부 동력 사용시간 조회 + * + * @param reqVO 검색 조건 + * @return 동력 사용시간 목록 + */ + List monthList(DailyPowerUIReqVO reqVO); + /** * 일계부 동력 사용시간 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java index 1aa38876..009389a9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/DailyPowerPortOut.java @@ -1,6 +1,8 @@ package app.module.front.usecase.daily.power.ports; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; @@ -17,6 +19,14 @@ public interface DailyPowerPortOut { */ List list(GetDailyPowerCmd command); + /** + * 일계부 동력 사용시간 조회 + * + * @param command 검색 조건 + * @return 동력 사용시간 목록 + */ + List monthList(GetDailyPowerCmd command); + /** * 일계부 동력 사용시간 등록 * diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java index 5658fb42..dd005987 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java @@ -3,6 +3,7 @@ package app.module.front.usecase.daily.power.ports.application; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.config.application.util.AuditUtil; import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerDto; +import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowerMonthDto; import app.module.front.usecase.daily.power.adapters.web.model.CreateDailyPowerReqVO; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import app.module.front.usecase.daily.power.adapters.web.model.RemoveDailyPowerReqVO; @@ -11,11 +12,13 @@ import app.module.front.usecase.daily.power.ports.DailyPowerPortOut; import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; -import app.module.core.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -25,12 +28,30 @@ public class DailyPowerService implements DailyPowerPortIn { @Override public List list(DailyPowerUIReqVO reqVO) { - return this.getRefineList(reqVO); + return this.getRefineList(reqVO, true); + } + + @Override + public List monthList(DailyPowerUIReqVO reqVO) { + List list = this.getRefineList(reqVO, false); + + List monthList = new ArrayList<>(); + List recordSeqList = list.stream().map(DailyPowerDto::getDailyRecordSeq).distinct().toList(); + for (Long seq : recordSeqList) { + DailyPowerMonthDto month = new DailyPowerMonthDto(); + month.setDailyRecordSeq(seq); + month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyPowerDto::getStartDate).findFirst().orElse(null)); + month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyPowerDto::getEndDate).findFirst().orElse(null)); + month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList())); + monthList.add(month); + } + + return monthList; } @Override public DailyPowerDto detail(DailyPowerUIReqVO reqVO) { - List list = this.getRefineList(reqVO); + List list = this.getRefineList(reqVO, true); if (list.isEmpty()) { return null; } @@ -44,11 +65,13 @@ public class DailyPowerService implements DailyPowerPortIn { * @param reqVO 검색 조건 * @return 공통 처리된 목록 */ - private List getRefineList(DailyPowerUIReqVO reqVO) { - return portOut.list(new GetDailyPowerCmd(reqVO.getSearchMonth(), + private List getRefineList(DailyPowerUIReqVO reqVO, boolean dayGroup) { + GetDailyPowerCmd command = new GetDailyPowerCmd(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq(), - reqVO.getId())); + reqVO.getId()); + + return dayGroup ? portOut.list(command) : portOut.monthList(command); } @Override 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 e94b6691..340e81f0 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,11 +2,20 @@ 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.income.adapters.persistence.model.DailyIncomeMonthDto; +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.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; +import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO; import app.module.front.usecase.daily.status.ports.DailyStatusPortIn; +import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; +import app.module.front.usecase.daily.work.ports.DailyWorkPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -16,8 +25,6 @@ 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; - @Slf4j @Controller @RequiredArgsConstructor @@ -25,6 +32,11 @@ import java.util.List; public class DailyStatusUIController { private final DailyStatusPortIn dailyStatusPortIn; private final DailyIncomePortIn dailyIncomePortIn; + private final DailyWorkPortIn dailyWorkPortIn; + private final DailyExpensePortIn dailyExpensePortIn; + private final DailyPowerPortIn dailyPowerPortIn; + private final DailyForestryPortIn dailyForestryPortIn; + private final DailyFarmingPortIn dailyFarmingPortIn; /** * 일계부 입력 현황 화면 @@ -54,31 +66,21 @@ public class DailyStatusUIController { 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)) { -// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")); -// -// model.addAttribute("step", DailySort.WORK); -// model.addAttribute("list", list); -// } else if (DailySort.EXPENSE.name().equalsIgnoreCase(step)) { -// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")); -// -// model.addAttribute("step", DailySort.EXPENSE); -// model.addAttribute("list", list); -// } else if (DailySort.POWER.name().equalsIgnoreCase(step)) { -// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")); -// -// model.addAttribute("step", DailySort.POWER); -// model.addAttribute("list", list); -// } else if (DailySort.FORESTRY.name().equalsIgnoreCase(step)) { -// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")); -// -// model.addAttribute("step", DailySort.FORESTRY); -// model.addAttribute("list", list); -// } else if (DailySort.FARMING.name().equalsIgnoreCase(step)) { -// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, "")); -// -// model.addAttribute("step", DailySort.FARMING); -// model.addAttribute("list", list); + } 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("잘못된 접근"); } diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java index 22f74dd1..4a744cff 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java @@ -15,22 +15,27 @@ import java.util.List; @Service @RequiredArgsConstructor public class DailyWorkDao implements DailyWorkPortOut { - private final DailyWorkMapper dailyWorkMapper; + private final DailyWorkMapper mapper; @Override public List list(GetDailyWorkCmd command) { - return dailyWorkMapper.getDailyWorkList(command); + return mapper.getDailyWorkList(command); + } + + @Override + public List monthList(GetDailyWorkCmd command) { + return mapper.getDailyWorkMonthList(command); } @Override public void create(GetDailyWorkCmd findCmd, CreateDailyWorkCmd command) { - Integer existCount = dailyWorkMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount == 0) { - dailyWorkMapper.createDailyWork(command); + mapper.createDailyWork(command); log.debug("[CreateDailyWork] record={}", command); } else { - dailyWorkMapper.updateDailyWork(command); + mapper.updateDailyWork(command); log.debug("[UpdateDailyWork] record={}", command); } @@ -38,9 +43,9 @@ public class DailyWorkDao implements DailyWorkPortOut { @Override public void remove(GetDailyWorkCmd findCmd, RemoveDailyWorkCmd command) { - Integer existCount = dailyWorkMapper.getRecordExistCount(findCmd); + Integer existCount = mapper.getRecordExistCount(findCmd); if (existCount != 0) { - dailyWorkMapper.removeDailyWork(command); + mapper.removeDailyWork(command); log.debug("[RemoveDailyWork] record={}", command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java index f2d67343..65c9172c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkMapper.java @@ -1,5 +1,7 @@ package app.module.front.usecase.daily.work.adapters.persistence; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd; import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.ports.application.domain.GetDailyWorkCmd; @@ -12,13 +14,21 @@ import java.util.List; @Mapper public interface DailyWorkMapper { /** - * 일계부 임업노동 목록 조회 + * 특정 그룹일의 일계부 임업노동 목록 조회 * * @param command 검색 조건 * @return 임업노동 목록 */ List getDailyWorkList(GetDailyWorkCmd command); + /** + * 특정월의 일계부 임업노동 목록 조회 + * + * @param command 검색 조건 + * @return 임업노동 목록 + */ + List getDailyWorkMonthList(GetDailyWorkCmd command); + /** * 일계부 임업노동 데이터 존재 여부 * diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java index 10617807..b8ef9171 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.time.LocalDate; @Slf4j @Getter @@ -35,6 +36,8 @@ public class DailyWorkDto { private String sharedFHours; private String volunteerMHours; private String volunteerFHours; + private LocalDate startDate; + private LocalDate endDate; /** * 수정 가능 여부 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 new file mode 100644 index 00000000..7adfef0d --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkMonthDto.java @@ -0,0 +1,21 @@ +package app.module.front.usecase.daily.work.adapters.persistence.model; + +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; +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 { + private Long dailyRecordSeq; + private LocalDate startDate; + private LocalDate endDate; + private List children; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java index c9951c31..df4af1bf 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortIn.java @@ -1,7 +1,10 @@ package app.module.front.usecase.daily.work.ports; +import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeMonthDto; +import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; +import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkMonthDto; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO; @@ -10,13 +13,21 @@ import java.util.List; public interface DailyWorkPortIn { /** - * 일계부 임업노동 조회 + * 특정 그룹일의 일계부 임업노동 조회 * * @param reqVO 검색 조건 * @return 임업노동 목록 */ List list(DailyWorkUIReqVO reqVO); + /** + * 특정월의 일계부 임업노동 조회 + * + * @param reqVO 검색 조건 + * @return 임업노동 목록 + */ + List monthList(DailyWorkUIReqVO reqVO); + /** * 일계부 임업노동 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortOut.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortOut.java index 3b6830e3..697dfb25 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/DailyWorkPortOut.java @@ -1,7 +1,5 @@ package app.module.front.usecase.daily.work.ports; - - import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd; import app.module.front.usecase.daily.work.ports.application.domain.GetDailyWorkCmd; @@ -18,6 +16,14 @@ public interface DailyWorkPortOut { */ List list(GetDailyWorkCmd command); + /** + * 일계부 임업노동 조회 + * + * @param command 검색 조건 + * @return 임업노동 목록 + */ + List monthList(GetDailyWorkCmd command); + /** * 일계부 임업노동 등록 * diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java index 558af87d..12acf4c2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java @@ -5,8 +5,8 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import app.module.front.config.application.util.AuditUtil; import app.module.front.config.constants.CommonConstants; -import app.module.core.usecase.daily.record.ports.application.DailyRecordService; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; +import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkMonthDto; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import app.module.front.usecase.daily.work.adapters.web.model.RemoveDailyWorkReqVO; @@ -18,7 +18,10 @@ import app.module.front.usecase.daily.work.ports.application.domain.RemoveDailyW import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -29,12 +32,30 @@ public class DailyWorkService implements DailyWorkPortIn { @Override public List list(DailyWorkUIReqVO reqVO) { - return this.getRefineList(reqVO); + return this.getRefineList(reqVO, true); + } + + @Override + public List monthList(DailyWorkUIReqVO reqVO) { + List list = this.getRefineList(reqVO, false); + + List monthList = new ArrayList<>(); + List recordSeqList = list.stream().map(DailyWorkDto::getDailyRecordSeq).distinct().toList(); + for (Long seq : recordSeqList) { + DailyWorkMonthDto month = new DailyWorkMonthDto(); + month.setDailyRecordSeq(seq); + month.setStartDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyWorkDto::getStartDate).findFirst().orElse(null)); + month.setEndDate(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).map(DailyWorkDto::getEndDate).findFirst().orElse(null)); + month.setChildren(list.stream().filter(f -> Objects.equals(f.getDailyRecordSeq(), seq)).collect(Collectors.toList())); + monthList.add(month); + } + + return monthList; } @Override public DailyWorkDto detail(DailyWorkUIReqVO reqVO) { - List list = this.getRefineList(reqVO); + List list = this.getRefineList(reqVO, true); if (list.isEmpty()) { return null; } @@ -45,14 +66,17 @@ public class DailyWorkService implements DailyWorkPortIn { /** * 목록 데이터 조회 * - * @param reqVO 검색 조건 + * @param reqVO 검색 조건 + * @param dayGroup 일 그룹 조건(true=일, false=월) * @return 공통 처리된 목록 */ - private List getRefineList(DailyWorkUIReqVO reqVO) { - List list = portOut.list(new GetDailyWorkCmd(reqVO.getSearchMonth(), + private List getRefineList(DailyWorkUIReqVO reqVO, boolean dayGroup) { + GetDailyWorkCmd command = new GetDailyWorkCmd(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq(), - reqVO.getId())); + reqVO.getId()); + + List list = dayGroup ? portOut.list(command) : portOut.monthList(command); List recordArea = uiCodeListPortIn.connect("code.record.area"); List recordUnit = uiCodeListPortIn.connect("code.record.unit"); diff --git a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml index eaa36da7..f33dea45 100644 --- a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml @@ -17,6 +17,19 @@ ds.id desc + + + + + + + + + +