[BO] 월초이월금
This commit is contained in:
@@ -7,6 +7,9 @@ import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDe
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus;
|
||||
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
|
||||
import app.module.core.config.application.enums.FileStorageType;
|
||||
@@ -58,8 +61,10 @@ class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut
|
||||
List<GetDailyForestryRecords> forestries = mapper.getDailyForestryRecords(cmd);
|
||||
List<GetDailyFarmingRecords> farmings = mapper.getDailyFarmingRecords(cmd);
|
||||
|
||||
Long carryOver = mapper.getMonthlyCarryOver(cmd);
|
||||
|
||||
return Optional.of(
|
||||
new GetDailyRecordStatusDetail(status, incomes, works, expenses, powers, forestries,
|
||||
farmings));
|
||||
farmings, carryOver));
|
||||
}
|
||||
}
|
||||
@@ -20,4 +20,5 @@ public interface GetDailyRecordStatusDetailMapper {
|
||||
List<GetDailyPowerRecords> getDailyPowerRecords(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyForestryRecords> getDailyForestryRecords(GetDailyRecordStatusCmd cmd);
|
||||
List<GetDailyFarmingRecords> getDailyFarmingRecords(GetDailyRecordStatusCmd cmd);
|
||||
Long getMonthlyCarryOver(GetDailyRecordStatusCmd cmd);
|
||||
}
|
||||
|
||||
@@ -44,6 +44,12 @@ class GetDailyRecordStatusDetailController {
|
||||
GetDailyRecordStatusDetail recordView =
|
||||
portIn.operate(new GetDailyRecordStatusCmd(reqVO.getRecordSeq())).orElse(null);
|
||||
|
||||
if (recordView != null) {
|
||||
if (!LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(reqVO.getRecordMonth()) && recordView.getMonthlyCarryOver() == null) {
|
||||
recordView.setMonthlyCarryOver(0L);
|
||||
}
|
||||
}
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(recordView);
|
||||
}
|
||||
|
||||
|
||||
@@ -18,4 +18,5 @@ public class GetDailyRecordStatusDetail {
|
||||
List<GetDailyPowerRecords> powers; // 동력사용시간
|
||||
List<GetDailyForestryRecords> forestries; // 자가임업
|
||||
List<GetDailyFarmingRecords> farmings; // 자가농업
|
||||
Long monthlyCarryOver; //월초이월금
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user