[FO] 입력현황 상세에서 그룹Count 대신 childrenCount 로 변경

This commit is contained in:
김현주
2025-07-14 10:37:09 +09:00
parent 794bbfb7ea
commit 36b2f7302a
14 changed files with 75 additions and 35 deletions

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 <T> 데이터 Model
*/
private <T extends DailyStatusHasChildren> void processStep(Model model, DailySort step, List<T> 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);
}
}

View File

@@ -0,0 +1,7 @@
package app.module.front.usecase.daily.status.ports;
import java.util.List;
public interface DailyStatusHasChildren {
List<?> getChildren();
}

View File

@@ -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;

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>