diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java index d005d0bb..f846d590 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java @@ -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 forestries = mapper.getDailyForestryRecords(cmd); List farmings = mapper.getDailyFarmingRecords(cmd); + Long carryOver = mapper.getMonthlyCarryOver(cmd); + return Optional.of( new GetDailyRecordStatusDetail(status, incomes, works, expenses, powers, forestries, - farmings)); + farmings, carryOver)); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java index 2e5160e5..cd075cfa 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java @@ -20,4 +20,5 @@ public interface GetDailyRecordStatusDetailMapper { List getDailyPowerRecords(GetDailyRecordStatusCmd cmd); List getDailyForestryRecords(GetDailyRecordStatusCmd cmd); List getDailyFarmingRecords(GetDailyRecordStatusCmd cmd); + Long getMonthlyCarryOver(GetDailyRecordStatusCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java index a0c1e47d..2f659c67 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java @@ -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); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java index f3f43cc4..06456a85 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java @@ -18,4 +18,5 @@ public class GetDailyRecordStatusDetail { List powers; // 동력사용시간 List forestries; // 자가임업 List farmings; // 자가농업 + Long monthlyCarryOver; //월초이월금 } diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index ccbb3dd8..b4e961ad 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -309,5 +309,15 @@ ORDER BY dr.start_date asc, df.created_at asc + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html index 4389bbb4..6a6061f2 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -72,6 +72,13 @@ + + +
@@ -435,7 +442,7 @@ ajaxUtil._ajaxMethod( '/api/household/dailyRecordStatus', - { recordSeq: id }, + { recordSeq: id, recordMonth: f.recordMonth.value }, function(response) { // 성공 console.log("일계부 등록 상세 데이터 : ", response); @@ -462,6 +469,18 @@ gridPowerTable(response.status.powerStatus, response.powers); gridForestryTable(response.status.forestryStatus, response.forestries); gridFarmingTable(response.status.farmingStatus, response.farmings); + + if (groupNo === 1) { + console.log(groupNo, response.monthlyCarryOver) + if (response.monthlyCarryOver != null) { + $('#carryOver').text(Number(response.monthlyCarryOver).toLocaleString() + '원'); + } else { + $('#carryOver').text('계산중입니다.'); + } + $('._monthlyCarryOver').show(); + } else { + $('._monthlyCarryOver').hide(); + } }, function (code, rstData) { // 실패 console.log("error : ", code);