From f491e2a2148276b56094353d90b4e80f67fface7 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 16 Jun 2025 17:36:23 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20-=20=EC=9E=84=EA=B0=80=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91=20(6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/GetDailyRecordStatusDao.java | 30 - .../GetDailyRecordStatusMapper.java | 17 - .../web/GetDailyRecordStatusController.java | 28 - .../web/model/GetDailyRecordStatusResVO.java | 18 - .../ports/GetDailyRecordStatusPortIn.java | 9 - .../ports/GetDailyRecordStatusPortOut.java | 9 - .../GetDailyRecordStatusService.java | 20 - .../GetDailyRecordStatusDetailDao.java | 38 ++ .../GetDailyRecordStatusDetailMapper.java | 23 + .../GetDailyRecordStatusDetailController.java | 27 + .../GetDailyRecordStatusDetailReqVO.java} | 6 +- .../GetDailyRecordStatusDetailResVO.java | 18 + .../GetDailyRecordStatusDetailPortIn.java | 9 + .../GetDailyRecordStatusDetailPortOut.java | 9 + .../GetDailyRecordStatusDetailService.java | 20 + .../domain/GetDailyExpenseRecords.java | 3 +- .../domain/GetDailyFarmingRecords.java | 23 + .../domain/GetDailyForestryRecords.java | 4 +- .../domain/GetDailyIncomeRecords.java | 6 +- .../domain/GetDailyPowerRecords.java | 4 +- .../domain/GetDailyRecordStatus.java | 19 + .../domain/GetDailyRecordStatusCmd.java | 4 +- .../domain/GetDailyRecordStatusDetail.java} | 7 +- .../domain/GetDailyWorkRecords.java | 32 + .../domain/GetDailyRecordsStatus.java | 1 + .../GetDailyRecordStatusDetailMapper.xml | 146 +++++ .../household/GetDailyRecordStatusMapper.xml | 89 --- .../household/GetDailyRecordsStatusMapper.xml | 15 +- admin/src/main/resources/static/ui/uiUtil.js | 4 + .../templates/household/households.html | 21 +- .../templates/household/households/{seq}.html | 555 +++++++++++++----- .../resources/sql/schema/02_create-all.sql | 4 +- .../resources/sql/schema/02_create-record.sql | 8 +- .../sql/schema/05_create-funtion.sql | 44 ++ 34 files changed, 863 insertions(+), 407 deletions(-) delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusDao.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusMapper.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/GetDailyRecordStatusController.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusResVO.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortIn.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortOut.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/GetDailyRecordStatusService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java rename admin/src/main/java/app/module/admin/usecase/household/{getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusReqVO.java => getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java} (51%) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java rename admin/src/main/java/app/module/admin/usecase/household/{getDailyRecordStatus => getDailyRecordStatusDetail}/ports/application/domain/GetDailyExpenseRecords.java (82%) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java rename admin/src/main/java/app/module/admin/usecase/household/{getDailyRecordStatus => getDailyRecordStatusDetail}/ports/application/domain/GetDailyForestryRecords.java (74%) rename admin/src/main/java/app/module/admin/usecase/household/{getDailyRecordStatus => getDailyRecordStatusDetail}/ports/application/domain/GetDailyIncomeRecords.java (80%) rename admin/src/main/java/app/module/admin/usecase/household/{getDailyRecordStatus => getDailyRecordStatusDetail}/ports/application/domain/GetDailyPowerRecords.java (76%) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java rename admin/src/main/java/app/module/admin/usecase/household/{getDailyRecordStatus => getDailyRecordStatusDetail}/ports/application/domain/GetDailyRecordStatusCmd.java (60%) rename admin/src/main/java/app/module/admin/usecase/household/{getDailyRecordStatus/ports/application/domain/GetDailyRecordStatus.java => getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java} (59%) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java create mode 100644 admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml delete mode 100644 admin/src/main/resources/mappers/household/GetDailyRecordStatusMapper.xml diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusDao.java deleted file mode 100644 index 946e56bf..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusDao.java +++ /dev/null @@ -1,30 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.adapters.persistence; - -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyForestryRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyIncomeRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyPowerRecords; -import java.util.List; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortOut; -import java.util.Optional; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class GetDailyRecordStatusDao implements GetDailyRecordStatusPortOut { - private final GetDailyRecordStatusMapper mapper; - - @Override - public Optional operate(GetDailyRecordStatusCmd cmd) { - - List incomes = mapper.getDailyIncomeRecords(cmd); - List expenses = mapper.getDailyExpenseRecords(cmd); - List powers = mapper.getDailyPowerRecords(cmd); - List forestries = mapper.getDailyForestryRecords(cmd); - - return Optional.of(new GetDailyRecordStatus(incomes, expenses, powers, forestries)); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusMapper.java deleted file mode 100644 index d8eb7cc2..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.adapters.persistence; - -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyForestryRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyIncomeRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyPowerRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetDailyRecordStatusMapper { - List getDailyIncomeRecords(GetDailyRecordStatusCmd cmd); - List getDailyExpenseRecords(GetDailyRecordStatusCmd cmd); - List getDailyPowerRecords(GetDailyRecordStatusCmd cmd); - List getDailyForestryRecords(GetDailyRecordStatusCmd cmd); -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/GetDailyRecordStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/GetDailyRecordStatusController.java deleted file mode 100644 index 7f7db381..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/GetDailyRecordStatusController.java +++ /dev/null @@ -1,28 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web; - -import app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model.GetDailyRecordStatusReqVO; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortIn; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -class GetDailyRecordStatusController { - private final GetDailyRecordStatusPortIn portIn; - - @GetMapping(path = "/api/household/dailyRecordStatus") - ResponseEntity operate( - GetDailyRecordStatusReqVO reqVO) { - - GetDailyRecordStatus recordView = - portIn.operate(new GetDailyRecordStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordSeq(), - reqVO.getRecordMonth())).orElse(null); - - return ResponseEntity.status(HttpStatus.OK).body(recordView); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusResVO.java deleted file mode 100644 index 8780f52b..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusResVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model; - -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyExpenseRecords; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyIncomeRecords; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@AllArgsConstructor -@EqualsAndHashCode -public class GetDailyRecordStatusResVO { - List incomes; // 수입 - List expenses; // 지출 -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortIn.java deleted file mode 100644 index 4ec3a312..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortIn.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports; - -import java.util.Optional; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd; - -public interface GetDailyRecordStatusPortIn { - Optional operate(GetDailyRecordStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortOut.java deleted file mode 100644 index 9ce70fdd..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortOut.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports; - -import java.util.Optional; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd; - -public interface GetDailyRecordStatusPortOut { - Optional operate(GetDailyRecordStatusCmd cmd); -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/GetDailyRecordStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/GetDailyRecordStatusService.java deleted file mode 100644 index beb478cb..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/GetDailyRecordStatusService.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports.application; - -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatus; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain.GetDailyRecordStatusCmd; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortIn; -import app.module.admin.usecase.household.getDailyRecordStatus.ports.GetDailyRecordStatusPortOut; -import java.util.Optional; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetDailyRecordStatusService implements GetDailyRecordStatusPortIn { - private final GetDailyRecordStatusPortOut portOut; - - @Override - public Optional operate(GetDailyRecordStatusCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java new file mode 100644 index 00000000..82070bbf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.persistence; + +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; +import java.util.List; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; +import java.util.Optional; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut { + private final GetDailyRecordStatusDetailMapper mapper; + + @Override + public Optional operate(GetDailyRecordStatusCmd cmd) { + + GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd); + List incomes = mapper.getDailyIncomeRecords(cmd); + List works = mapper.getDailyWorkRecords(cmd); + List expenses = mapper.getDailyExpenseRecords(cmd); + List powers = mapper.getDailyPowerRecords(cmd); + List forestries = mapper.getDailyForestryRecords(cmd); + List farmings = mapper.getDailyFarmingRecords(cmd); + + return Optional.of( + new GetDailyRecordStatusDetail(status, incomes, works, expenses, powers, forestries, + farmings)); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java new file mode 100644 index 00000000..4fdf0365 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailMapper.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.persistence; + +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyPowerRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetDailyRecordStatusDetailMapper { + GetDailyRecordStatus getDailyRecordStatus(GetDailyRecordStatusCmd cmd); + List getDailyIncomeRecords(GetDailyRecordStatusCmd cmd); + List getDailyWorkRecords(GetDailyRecordStatusCmd cmd); + List getDailyExpenseRecords(GetDailyRecordStatusCmd cmd); + List getDailyPowerRecords(GetDailyRecordStatusCmd cmd); + List getDailyForestryRecords(GetDailyRecordStatusCmd cmd); + List getDailyFarmingRecords(GetDailyRecordStatusCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java new file mode 100644 index 00000000..895f7782 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web; + +import app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model.GetDailyRecordStatusDetailReqVO; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +class GetDailyRecordStatusDetailController { + private final GetDailyRecordStatusDetailPortIn portIn; + + @GetMapping(path = "/api/household/dailyRecordStatus") + ResponseEntity operate( + GetDailyRecordStatusDetailReqVO reqVO) { + + GetDailyRecordStatusDetail recordView = + portIn.operate(new GetDailyRecordStatusCmd(reqVO.getRecordSeq())).orElse(null); + + return ResponseEntity.status(HttpStatus.OK).body(recordView); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java similarity index 51% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java index f59469ae..9e73e63d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model; +package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -9,8 +9,6 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetDailyRecordStatusReqVO { - private Long householdSeq; +public class GetDailyRecordStatusDetailReqVO { private Long recordSeq; - private String recordMonth; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java new file mode 100644 index 00000000..831a0251 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailResVO.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.adapters.web.model; + +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyRecordStatusDetailResVO { + List incomes; // 수입 + List expenses; // 지출 +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java new file mode 100644 index 00000000..7286776e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; + +public interface GetDailyRecordStatusDetailPortIn { + Optional operate(GetDailyRecordStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java new file mode 100644 index 00000000..87da659f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/GetDailyRecordStatusDetailPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports; + +import java.util.Optional; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; + +public interface GetDailyRecordStatusDetailPortOut { + Optional operate(GetDailyRecordStatusCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java new file mode 100644 index 00000000..52d137d6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/GetDailyRecordStatusDetailService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; +import app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; +import java.util.Optional; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetDailyRecordStatusDetailService implements GetDailyRecordStatusDetailPortIn { + private final GetDailyRecordStatusDetailPortOut portOut; + + @Override + public Optional operate(GetDailyRecordStatusCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java similarity index 82% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyExpenseRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index 52177087..2dc93b54 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; import lombok.AllArgsConstructor; @@ -19,6 +19,7 @@ public class GetDailyExpenseRecords { private String sourcePurpose; private BigDecimal quantity; private String unitCode; + private String unitText; private String price; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java new file mode 100644 index 00000000..bffbbd7c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyFarmingRecords.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; + +import java.math.BigDecimal; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyFarmingRecords { + private Long id; + private String productName; + private String usage; + private BigDecimal quantity; + private String unitCode; + private String unitText; + private String estimatedValue; + private String updatedBy; + private String updatedAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyForestryRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java similarity index 74% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyForestryRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java index 86d70026..82fb54f3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyForestryRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyForestryRecords.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; import lombok.AllArgsConstructor; @@ -15,6 +15,8 @@ public class GetDailyForestryRecords { private String productName; private String usage; private BigDecimal quantity; + private String unitCode; + private String unitText; private String estimatedValue; private String updatedBy; private String updatedAt; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java similarity index 80% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyIncomeRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index 5af60cc4..4ab787b8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -1,12 +1,10 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import org.joda.time.DateTime; @Getter @Setter @@ -17,11 +15,13 @@ public class GetDailyIncomeRecords { private String inputType; private Boolean isCredit; private String cropCode; + private String cropText; private String categoryCode; private String categorySelf; private String sourcePurpose; private BigDecimal quantity; private String unitCode; + private String unitText; private String price; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyPowerRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java similarity index 76% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyPowerRecords.java rename to admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java index 8f358161..207c21bc 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyPowerRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyPowerRecords.java @@ -1,7 +1,6 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; import java.math.BigDecimal; -import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -13,6 +12,7 @@ import lombok.Setter; @EqualsAndHashCode public class GetDailyPowerRecords { private Long id; + private String powerStatus; private String equipmentName; private BigDecimal ownedHours; private BigDecimal leasedHours; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java new file mode 100644 index 00000000..73ea6952 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatus.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyRecordStatus { + private String incomeStatus; + private String workStatus; + private String expenseStatus; + private String powerStatus; + private String forestryStatus; + private String farmingStatus; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java similarity index 60% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatusCmd.java rename to admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java index b1e26179..2f4bce20 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -10,7 +10,5 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class GetDailyRecordStatusCmd { - private Long householdSeq; private Long recordSeq; - private String recordMonth; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java similarity index 59% rename from admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatus.java rename to admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java index 89bb5ffa..9cfdd596 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusDetail.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; import java.util.List; import lombok.AllArgsConstructor; @@ -10,9 +10,12 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetDailyRecordStatus { +public class GetDailyRecordStatusDetail { + GetDailyRecordStatus status; List incomes; // 수입 + List works; // 임업노동 List expenses; // 지출 List powers; // 동력사용시간 List forestries; // 자가임업 + List farmings; // 자가농업 } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java new file mode 100644 index 00000000..eaed0fe9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyWorkRecords.java @@ -0,0 +1,32 @@ +package app.module.admin.usecase.household.getDailyRecordStatusDetail.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyWorkRecords { + private Long id; + private String itemCode; + private String workCode; + private String workLandArea; + private String harvestQuantity; + private String unitCode; + private String cropText; + private String ownerTime; + private String spouseTime; + private String familyMHours; + private String familyFHours; + private String hiredMHours; + private String hiredFHours; + private String sharedMHours; + private String sharedFHours; + private String volunteerMHours; + private String volunteerFHours; + private String updatedBy; + private String updatedAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java index 75394398..6e67d5d4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java @@ -18,4 +18,5 @@ public class GetDailyRecordsStatus { private String expenseStatus; private String powerStatus; private String forestryStatus; + private String farmingStatus; } diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml new file mode 100644 index 00000000..be9c5584 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusMapper.xml deleted file mode 100644 index a4b57238..00000000 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusMapper.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml index c9f84abd..3e8369dc 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml @@ -13,14 +13,15 @@ COUNT(DISTINCT dw.id) AS work_cnt, COUNT(DISTINCT de.id) AS expense_cnt, COUNT(DISTINCT dp.id) AS power_cnt, - COUNT(DISTINCT dfs.id) AS forestry_cnt + COUNT(DISTINCT dfs.id) AS forestry_cnt, + COUNT(distinct dfm.id) AS farming_cnt FROM daily_record dr LEFT JOIN daily_income di ON di.daily_record_seq = dr.id AND di.is_deleted = false LEFT JOIN daily_work dw ON dw.daily_record_seq = dr.id AND dw.is_deleted = false LEFT JOIN daily_expense de ON de.daily_record_seq = dr.id AND de.is_deleted = false LEFT JOIN daily_power dp ON dp.daily_record_seq = dr.id AND dp.is_deleted = false LEFT JOIN daily_forestry dfs ON dfs.daily_record_seq = dr.id AND dfs.is_deleted = false - -- TODO : 농업 자가소비량 테이블 수정 후 추가 + LEFT JOIN daily_farming dfm on dfm.daily_record_seq = dr.id and dfm.is_deleted = false WHERE dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} AND dr.is_deleted = false @@ -42,8 +43,14 @@ fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status, fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status, fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status, - fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status - -- TODO : 농업 자가소비량 테이블 수정 후 추가 + fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status, + fn_get_farming_status( + ddg.start_day, + dr.record_month, + mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), + dr.farming_status, + dc.farming_cnt + ) AS farming_status FROM daily_day_group ddg CROSS JOIN month_check mc LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index d25c7821..9a96a5fe 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -442,4 +442,8 @@ const showAudit = (auditItem, createdBy, createdAt, updatedBy, updatedAt) => { }) })(); +const ifNullDash = (value, fallback = '-') => { + return value !== null && value !== undefined && value !== '' ? value : fallback; +} + diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html index 8324b8a9..6efdf8c2 100644 --- a/admin/src/main/resources/templates/household/households.html +++ b/admin/src/main/resources/templates/household/households.html @@ -13,7 +13,7 @@
- + 5241
@@ -340,14 +340,14 @@ ${ct.regionMainName} ${ct.regionSubName} ${ct.regionDetailName} - ${isEmpty(ct.industryLargeName)} - ${isEmpty(ct.industryMiddleName)} + ${ifNullDash(ct.industryLargeName)} + ${ifNullDash(ct.industryMiddleName)} ${ct.progressPercent}% - ${isEmpty(ct.firstVisitDate)} - ${isEmpty(ct.secondVisitDate)} + ${ifNullDash(ct.firstVisitDate)} + ${ifNullDash(ct.secondVisitDate)} ${ct.isGiftSent ? "전달" : "미전달"} - ${isEmpty(ct.researcherName)} - ${isEmpty(ct.researcherPhone)} + ${ifNullDash(ct.researcherName)} + ${ifNullDash(ct.researcherPhone)} ` ); @@ -398,13 +398,6 @@ f.submit(); } - -
\ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households/{seq}.html b/admin/src/main/resources/templates/household/households/{seq}.html index aa67875a..233303e3 100644 --- a/admin/src/main/resources/templates/household/households/{seq}.html +++ b/admin/src/main/resources/templates/household/households/{seq}.html @@ -130,14 +130,31 @@
-
- 작성완료: 0 - 미작성: 0 - 미완료: 0 - 대기: 0 - 현황: 0% -
+
+
    +
  • +

    작성완료

    + 6건 +
  • +
  • +

    미작성

    + 6건 +
  • +
  • +

    미완료

    + 6건 +
  • +
  • +

    대기

    + 6건 +
  • +
  • +

    완료율

    + 56.12% +
  • +
+
@@ -148,7 +165,7 @@ - + @@ -160,109 +177,248 @@
지출 동력사용시간 임업 자가소비량농업 자가소비량
- + +
+
+

수입 (0건)

+
+
+ + + + +
+
+
+
+ - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + - -
수입 (0건)선택외상판매재배형태수입의 종류수입원수량단위현금(원)현물평가액최종 수정자
선택외상판매재배형태수입의 종류수입원수량단위현금(원)현물평가액최종 수정자
-
+ + + - -
- - - - - - - - - - - - - - - - - - - - + +
+
+

임업노동 투입 내역 (0건)

+
+
+ + + +
+
+
+
지출 (0건)
선택외상 또는 카드구입지출의 종류용도수량단위현금(원)현물평가액최종 수정자
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
노동투입시간
선택품목명작업명작업 면적단위수확량단위경영주배우자가족노동(남)가족노동(여)고용노동(남)고용노동(여)품앗이(남)품앗이(여)일손돕기(남)일손돕기(여)최종 수정자
-
+ + + - -
- - - - - - - - - - - - - - - - + +
+
+

지출 (0건)

+
+
+ + + + +
+
+
+
동력사용시간 (0건)
선택명칭자가 사용시간임가 사용시간최종 수정자
+ + + + + + + + + + + + + + - -
선택외상 또는 카드구입지출의 종류용도수량단위현금(원)현물평가액최종 수정자
-
+ + + - -
- - - - - - - - - - - - - - - - - - + +
+
+

동력사용시간 (0건)

+
+
+ + + +
+
+
+
자가임업 생산물 중 자가소비량 (0건)
선택생산물용도수량단위현물평가액최종 수정자
+ + + + + + + + + + - -
선택명칭자가 사용시간임가 사용시간최종 수정자
+ + + + + +
+
+

자가임업 생산물 중 자가소비량 (0건)

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + +
선택생산물용도수량단위현물평가액최종 수정자
+
+ + +
+
+

자가농업 생산물 중 자가소비량 (0건)

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + +
선택생산물용도수량단위현물평가액최종 수정자
+
@@ -413,7 +569,7 @@ ${item.expenseStatus} ${item.powerStatus} ${item.forestryStatus} - + ${item.farmingStatus} `; }); @@ -444,17 +600,15 @@ ajaxUtil._ajaxMethod( '/api/household/dailyRecordStatus', - { - householdSeq: f.householdSeq.value, - recordSeq: id, - recordMonth: f.recordMonth.value - }, + { recordSeq: id }, function(response) { // 성공 console.log("일계부 등록 상세 데이터~ : ", response); - gridIncomeTable(response.incomes); - gridExpenseTable(response.expenses); - gridPowerTable(response.powers); - gridForestryTable(response.forestries); + gridIncomeTable(response.status.incomeStatus, response.incomes); + gridWorkTable(response.status.workStatus, response.works); + gridExpenseTable(response.status.expenseStatus, response.expenses); + gridPowerTable(response.status.powerStatus, response.powers); + gridForestryTable(response.status.forestryStatus, response.forestries); + gridFarmingTable(response.status.farmingStatus, response.farmings); }, function (code, rstData) { // 실패 console.log("error : ", code); @@ -465,13 +619,13 @@ } // 수입 테이블 그리기 - const gridIncomeTable = (data) => { + const gridIncomeTable = (status, data) => { const tbody = $('#table-income tbody'); tbody.empty(); $('#incomeCount').text(data.length); if(data.length === 0) { - noData(tbody, 10); + noData(tbody, status, 10); return; } @@ -487,15 +641,68 @@
- 외상판매 - 재배형태 - 수입의 종류 - 수입원 - 수량 - 단위 - 현금(원) - 현물평가액 - 최종 수정자 + ${item.isCredit ? "Y" : "N"} + ${ifNullDash(item.cropText)} + + ${ifNullDash(item.categorySelf)} + ${ifNullDash(item.sourcePurpose)} + ${ifNullDash(item.quantity)} + ${ifNullDash(item.unitText)} + ${ifNullDash(item.price)} + ${ifNullDash(item.estimatedValue)} + + ${item.updatedBy}
+ (${item.updatedAt}) + + + `; + }); + + tbody.append(tmpl); + } + + // 임업노동 테이블 그리기 + const gridWorkTable = (status, data) => { + const tbody = $('#table-work tbody'); + tbody.empty(); + + $('#workCount').text(data.length); + if(data.length === 0) { + noData(tbody, status, 18); + return; + } + + let tmpl = ''; + $(data).each((idx, item) => { + tmpl += + ` + + +
+ +
+ + ${ifNullDash(item.itemCode)} + ${ifNullDash(item.workCode)} + ${ifNullDash(item.workLandArea)} + ${ifNullDash(item.harvestQuantity)} + ${ifNullDash(item.cropText)} + ${ifNullDash(item.ownerTime)} + ${ifNullDash(item.spouseTime)} + ${ifNullDash(item.familyMHours)} + ${ifNullDash(item.familyFHours)} + ${ifNullDash(item.hiredMHours)} + ${ifNullDash(item.hiredFHours)} + ${ifNullDash(item.sharedMHours)} + ${ifNullDash(item.sharedFHours)} + ${ifNullDash(item.volunteerMHours)} + ${ifNullDash(item.volunteerFHours)} + + ${item.updatedBy}
+ (${item.updatedAt}) + `; }); @@ -504,13 +711,13 @@ } // 지출 테이블 그리기 - const gridExpenseTable = (data) => { + const gridExpenseTable = (status, data) => { const tbody = $('#table-expense tbody'); tbody.empty(); $('#expenseCount').text(data.length); if(data.length === 0) { - noData(tbody, 9); + noData(tbody, status, 9); return; } @@ -526,14 +733,18 @@ - 외상 또는 카드구입 - 지출의 종류 - 용도 - 수량 - 단위 - 현금(원) - 현물평가액 - 최종 수정자 + ${item.isCredit ? "Y" : "N"} + + ${ifNullDash(item.categorySelf)} + ${ifNullDash(item.sourcePurpose)} + ${ifNullDash(item.quantity)} + ${ifNullDash(item.unitText)} + ${ifNullDash(item.price)} + ${ifNullDash(item.estimatedValue)} + + ${item.updatedBy}
+ (${item.updatedAt}) + `; }); @@ -542,13 +753,13 @@ } // 동력사용시간 테이블 그리기 - const gridPowerTable = (data) => { + const gridPowerTable = (status, data) => { const tbody = $('#table-power tbody'); tbody.empty(); $('#powerCount').text(data.length); if(data.length === 0) { - noData(tbody, 5); + noData(tbody, status, 5); return; } @@ -564,10 +775,13 @@ - 명칭 - 자가 사용시간 - 임가 사용시간 - 최종 수정자 + ${ifNullDash(item.equipmentName)} + ${ifNullDash(item.ownedHours)} + ${ifNullDash(item.leasedHours)} + + ${item.updatedBy}
+ (${item.updatedAt}) + `; }); @@ -576,13 +790,13 @@ } // 자가임업 테이블 그리기 - const gridForestryTable = (data) => { + const gridForestryTable = (status, data) => { const tbody = $('#table-forestry tbody'); tbody.empty(); $('#forestryCount').text(data.length); if(data.length === 0) { - noData(tbody, 7); + noData(tbody, status, 7); return; } @@ -598,12 +812,15 @@ - 생산물 - 용도 - 수량 - 단위 - 현물평가액 - 최종 수정자 + ${ifNullDash(item.productName)} + ${ifNullDash(item.usage)} + ${ifNullDash(item.quantity)} + ${ifNullDash(item.unitText)} + ${ifNullDash(item.estimatedValue)} + + ${item.updatedBy}
+ (${item.updatedAt}) + `; }); @@ -611,8 +828,50 @@ tbody.append(tmpl); } - const noData = (target, length) => { - $(target).append(`등록없음`); + // 자가농업 테이블 그리기 + const gridFarmingTable = (status, data) => { + const tbody = $('#table-farming tbody'); + tbody.empty(); + + $('#farmingCount').text(data.length); + if(data.length === 0) { + noData(tbody, status, 7); + return; + } + + let tmpl = ''; + $(data).each((idx, item) => { + tmpl += + ` + + +
+ +
+ + ${ifNullDash(item.productName)} + ${ifNullDash(item.usage)} + ${ifNullDash(item.quantity)} + ${ifNullDash(item.unitText)} + ${ifNullDash(item.estimatedValue)} + + ${item.updatedBy}
+ (${item.updatedAt}) + + + `; + }); + + tbody.append(tmpl); + } + + // nodata 처리 + const noData = (target, status, length) => { + const noDataText = status === 'TARGET' ? '등록이 필요합니다.' : '등록없음'; + + $(target).append(`${noDataText}`); } diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index 22d87a32..2cf59a61 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -1521,7 +1521,7 @@ CREATE TABLE work_input ( item_code varchar(255), work_name varchar(30) NOT NULL, work_code varchar(255), - word_land_area int, + work_land_area int, harvest_quantity decimal(7,2), unit_code varchar(10), month varchar(7) NOT NULL, @@ -1545,7 +1545,7 @@ COMMENT ON COLUMN work_input.item_name IS '품목명'; COMMENT ON COLUMN work_input.item_code IS '품목부호 (매핑코드)'; COMMENT ON COLUMN work_input.work_name IS '작업명'; COMMENT ON COLUMN work_input.work_code IS '작업부호 (매핑코드)'; -COMMENT ON COLUMN work_input.word_land_area IS '작업면적'; +COMMENT ON COLUMN work_input.work_land_area IS '작업면적'; COMMENT ON COLUMN work_input.harvest_quantity IS '수확량'; COMMENT ON COLUMN work_input.unit_code IS '단위 (코드매핑)'; COMMENT ON COLUMN work_input.month IS '조사시행 월 (yyyy-mm)'; diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql index d83bfbc9..4de5025a 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -255,7 +255,7 @@ CREATE TABLE daily_work ( item_mark_code varchar(255), work_code varchar(255) NOT NULL, work_mark_code varchar(255), - word_land_area int, + work_land_area int, harvest_quantity decimal(7,2), unit_code varchar(10), owner_time decimal(5,2), -- 경영주 노동시간 @@ -288,7 +288,7 @@ COMMENT ON COLUMN daily_work.item_code IS '품목명 (매핑코드)'; COMMENT ON COLUMN daily_work.item_mark_code IS '품목부호 (매핑코드)'; COMMENT ON COLUMN daily_work.work_code IS '작업명 (매핑코드)'; COMMENT ON COLUMN daily_work.work_mark_code IS '작업부호 (매핑코드)'; -COMMENT ON COLUMN daily_work.word_land_area IS '작업면적'; +COMMENT ON COLUMN daily_work.work_land_area IS '작업면적'; COMMENT ON COLUMN daily_work.harvest_quantity IS '수확량'; COMMENT ON COLUMN daily_work.unit_code IS '단위 (코드매핑)'; COMMENT ON COLUMN daily_work.owner_time IS '경영주 노동시간'; @@ -451,6 +451,7 @@ CREATE SEQUENCE daily_farming_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_farming ( id bigint DEFAULT nextval('daily_farming_seq') NOT NULL, -- 농업 자가소비량 내부키 + daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) week_date date, -- 입력차수일(yyyy-mm-dd) week smallint, -- 입력차수(1,2,3,4) income_code varchar(255), -- 수입 코드 (매핑코드) TODO : 필요유무 @@ -469,7 +470,8 @@ CREATE TABLE daily_farming ( deleted_by varchar(255), -- 삭제자 is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부 - CONSTRAINT daily_farming_pkey PRIMARY KEY (id) + CONSTRAINT daily_farming_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_farming__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) ); COMMENT ON TABLE daily_farming IS '자가농업 생산물 중 자가소비량'; diff --git a/core/src/main/resources/sql/schema/05_create-funtion.sql b/core/src/main/resources/sql/schema/05_create-funtion.sql index cf09eaf8..cda4f113 100644 --- a/core/src/main/resources/sql/schema/05_create-funtion.sql +++ b/core/src/main/resources/sql/schema/05_create-funtion.sql @@ -31,6 +31,50 @@ $$ LANGUAGE plpgsql; +DROP FUNCTION IF EXISTS fn_get_farming_status(INTEGER, VARCHAR, BOOLEAN, VARCHAR, BIGINT); +-- ============================================ +-- FUNCTION : fn_get_farming_status +-- DESC : 일계부 농업 데이터 상태 표시 문자열 반환 +-- - 농업 대상일(7,14,21,30일, 2월 28일) 체크 +-- - 미래일/대상아님/등록건수/등록없음/미작성 상태 반환 +-- PARAMS : start_day(시작일), +-- record_month(기록월), +-- is_future_day(미래일여부), +-- farming_status(농업상태), +-- farming_cnt(농업건수) +-- RETURN : TEXT (상태 표시 문자열) +-- ============================================ +CREATE OR REPLACE FUNCTION fn_get_farming_status( + start_day INTEGER, + record_month VARCHAR, + is_future_day BOOLEAN, + farming_status VARCHAR, + farming_cnt BIGINT +) + RETURNS TEXT AS $$ +BEGIN + -- 농업 대상일 체크 + IF NOT ( + start_day IN (7, 14, 21, 30) + OR (start_day = 28 AND SUBSTRING(record_month, 5, 2) = '02') + ) THEN + RETURN CASE WHEN is_future_day THEN '-' ELSE '대상아님' END; + END IF; + + -- 대상일인 경우 기존 로직 + IF is_future_day THEN + RETURN '-'; + ELSIF farming_status = 'TARGET' THEN + RETURN COALESCE(farming_cnt::text || '건', '0건'); + ELSIF farming_status IN ('TODAY_NONE', 'NONE') THEN + RETURN '등록없음'; + ELSE + RETURN '미작성'; + END IF; +END; +$$ LANGUAGE plpgsql; + + -- ============================================ -- FUNCTION : fn_monthly_input_status From 9786b755d190008aa41ef97bdd89a5753630f10f Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 16 Jun 2025 17:54:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9?= =?UTF-8?q?=20=EC=98=A4=ED=83=80=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/household/households.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html index 6efdf8c2..ea0af4c0 100644 --- a/admin/src/main/resources/templates/household/households.html +++ b/admin/src/main/resources/templates/household/households.html @@ -13,7 +13,7 @@
- 5241 +
From 9366d2177901ec24c89e375b2fb267078326391e Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 16 Jun 2025 18:39:47 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9?= =?UTF-8?q?=20=EC=9E=91=EC=97=85=20=EC=A4=91=20(7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/household/households/{seq}.html | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/admin/src/main/resources/templates/household/households/{seq}.html b/admin/src/main/resources/templates/household/households/{seq}.html index 233303e3..f9dedfde 100644 --- a/admin/src/main/resources/templates/household/households/{seq}.html +++ b/admin/src/main/resources/templates/household/households/{seq}.html @@ -684,9 +684,9 @@
- ${ifNullDash(item.itemCode)} + ${ifNullDash(item.itemCode)} ${ifNullDash(item.workCode)} - ${ifNullDash(item.workLandArea)} + ${ifNullDash(item.workLandArea)} ${ifNullDash(item.harvestQuantity)} ${ifNullDash(item.cropText)} ${ifNullDash(item.ownerTime)} @@ -735,12 +735,12 @@ ${item.isCredit ? "Y" : "N"} - ${ifNullDash(item.categorySelf)} + ${ifNullDash(item.categorySelf)} ${ifNullDash(item.sourcePurpose)} ${ifNullDash(item.quantity)} ${ifNullDash(item.unitText)} - ${ifNullDash(item.price)} - ${ifNullDash(item.estimatedValue)} + ${ifNullDash(item.price)} + ${ifNullDash(item.estimatedValue)} ${item.updatedBy}
(${item.updatedAt}) @@ -775,7 +775,7 @@
- ${ifNullDash(item.equipmentName)} + ${ifNullDash(item.equipmentName)} ${ifNullDash(item.ownedHours)} ${ifNullDash(item.leasedHours)} @@ -812,11 +812,11 @@ - ${ifNullDash(item.productName)} + ${ifNullDash(item.productName)} ${ifNullDash(item.usage)} - ${ifNullDash(item.quantity)} + ${ifNullDash(item.quantity)} ${ifNullDash(item.unitText)} - ${ifNullDash(item.estimatedValue)} + ${ifNullDash(item.estimatedValue)} ${item.updatedBy}
(${item.updatedAt}) @@ -851,11 +851,11 @@ - ${ifNullDash(item.productName)} + ${ifNullDash(item.productName)} ${ifNullDash(item.usage)} - ${ifNullDash(item.quantity)} + ${ifNullDash(item.quantity)} ${ifNullDash(item.unitText)} - ${ifNullDash(item.estimatedValue)} + ${ifNullDash(item.estimatedValue)} ${item.updatedBy}
(${item.updatedAt})