From 693de9259f9a0945ae418ffb0c2ce2355e25d575 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Tue, 17 Jun 2025 21:45:39 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91=20(9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/AdminDetailsService.java | 1 + .../application/security/AdminUser.java | 3 + .../config/application/util/AdminUtil.java | 10 + .../GetBankAutoTransferRecordsDao.java | 24 ++ .../GetBankAutoTransferRecordsMapper.java | 17 + .../GetBankAutoTransferRecordsController.java | 24 ++ .../model/GetAutoTransferRecordsReqVO.java | 15 + .../model/GetAutoTransferRecordsResVO.java | 13 + .../GetBankAutoTransferRecordsPortIn.java | 9 + .../GetBankAutoTransferRecordsPortOut.java | 9 + .../GetBankAutoTransferRecordsService.java | 20 ++ .../GetBankAutoTransferExpenseRecords.java | 20 ++ .../GetBankAutoTransferIncomeRecords.java | 21 ++ .../domain/GetBankAutoTransferRecords.java | 16 + .../domain/GetBankAutoTransferRecordsCmd.java | 15 + .../domain/GetDailyExpenseRecords.java | 2 +- .../domain/GetDailyIncomeRecords.java | 2 +- .../GetForestProductsStatusDao.java | 11 +- .../GetForestProductsStatusMapper.java | 1 + .../GetForestProductsStatusController.java | 5 +- .../model/GetForestProductsStatusReqVO.java | 2 +- .../ports/GetForestProductsStatusPortIn.java | 5 +- .../ports/GetForestProductsStatusPortOut.java | 5 +- .../GetForestProductsStatusService.java | 9 +- .../domain/GetForestProductsStatusCmd.java | 2 +- .../domain/GetForestProductsStatusResult.java | 16 + .../GetHouseholdVisitInfosDao.java | 20 ++ .../GetHouseholdVisitInfosMapper.java | 11 + .../web/GetHouseholdVisitInfosController.java | 26 ++ .../model/GetHouseholdVisitInfosReqVO.java | 15 + .../model/GetHouseholdVisitInfosResVO.java | 13 + .../ports/GetHouseholdVisitInfosPortIn.java | 9 + .../ports/GetHouseholdVisitInfosPortOut.java | 9 + .../GetHouseholdVisitInfosService.java | 20 ++ .../domain/GetHouseholdVisitInfos.java | 20 ++ .../domain/GetHouseholdVisitInfosCmd.java | 15 + .../web/GetHouseholdsStatusController.java | 2 + .../domain/GetHouseholdsStatus.java | 3 +- .../domain/GetHouseholdsStatusCmd.java | 2 + .../GetBankAutoTransferRecordsMapper.xml | 43 +++ .../GetDailyRecordStatusDetailMapper.xml | 4 +- .../GetForestProductsStatusMapper.xml | 12 +- .../GetHouseholdVisitInfosMapper.xml | 20 ++ .../household/GetHouseholdsStatusMapper.xml | 6 + admin/src/main/resources/static/ui/uiUtil.js | 30 +- .../templates/household/households/{seq}.html | 321 ++++++++++++++++-- .../main/resources/sql/schema/01_drop-all.sql | 4 +- .../resources/sql/schema/02_create-all.sql | 69 ++-- .../resources/sql/schema/04_create-view.sql | 7 +- 49 files changed, 861 insertions(+), 97 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java create mode 100644 admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml create mode 100644 admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index 81b5e6a4..aa2f1b77 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -41,6 +41,7 @@ public class AdminDetailsService implements UserDetailsService { boolean accountDisabled = Optional.ofNullable(adminUser.getAccountDisabled()).orElse(false); return new AdminUser( + adminUser.getSeq(), adminUser.getId(), adminUser.getPassword(), adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null), diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index 4ed17db2..67b1291a 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -7,10 +7,12 @@ import org.springframework.security.core.userdetails.User; @Getter public class AdminUser extends User { + private Long seq; private String roleId; private long remainPasswordDays; public AdminUser( + Long seq, String username, String password, String roleId, @@ -28,6 +30,7 @@ public class AdminUser extends User { credentialsNonExpired, accountNonLocked, authorities); + this.seq = seq; this.roleId = roleId; this.remainPasswordDays = remainPasswordDays; } diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index bace4659..e4cc9778 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -33,4 +33,14 @@ public class AdminUtil { AdminUser user = (AdminUser) authentication.getPrincipal(); return user.getRoleId().isEmpty() ? null : user.getRoleId(); } + + public static Long getLoginUserSeq() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) { + return null; + } + + AdminUser user = (AdminUser) authentication.getPrincipal(); + return user.getSeq(); + } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java new file mode 100644 index 00000000..6b236410 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsDao.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.persistence; + +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords; +import java.util.Collections; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; +import java.util.List; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetBankAutoTransferRecordsDao implements GetBankAutoTransferRecordsPortOut { + private final GetBankAutoTransferRecordsMapper mapper; + + @Override + public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) { + return new GetBankAutoTransferRecords( + mapper.getBankAutoTransferIncomeRecords(cmd), // 수입 + mapper.getBankAutoTransferExpenseRecords(cmd)); // 지출 + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java new file mode 100644 index 00000000..55e8cb25 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/persistence/GetBankAutoTransferRecordsMapper.java @@ -0,0 +1,17 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.persistence; + +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferExpenseRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferIncomeRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetBankAutoTransferRecordsMapper { + // 은행자동이체 수입 + List getBankAutoTransferIncomeRecords( + GetBankAutoTransferRecordsCmd cmd); + // 은행자동이체 지출 + List getBankAutoTransferExpenseRecords( + GetBankAutoTransferRecordsCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java new file mode 100644 index 00000000..c697da7a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/GetBankAutoTransferRecordsController.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web; + +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model.GetAutoTransferRecordsReqVO; +import app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model.GetAutoTransferRecordsResVO; + +@RestController +@RequiredArgsConstructor +class GetBankAutoTransferRecordsController { + private final GetBankAutoTransferRecordsPortIn portIn; + + @GetMapping(path = "/api/household/bankAutoTransfer") + ResponseEntity operate(GetAutoTransferRecordsReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(portIn.operate( + new GetBankAutoTransferRecordsCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java new file mode 100644 index 00000000..fcbf5de6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsReqVO.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetAutoTransferRecordsReqVO { + private Long householdSeq; + private String recordMonth; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java new file mode 100644 index 00000000..de30ca1e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/adapters/web/model/GetAutoTransferRecordsResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetAutoTransferRecordsResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java new file mode 100644 index 00000000..201dc71b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.ports; + +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import java.util.List; + +public interface GetBankAutoTransferRecordsPortIn { + GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java new file mode 100644 index 00000000..f9d467b9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/GetBankAutoTransferRecordsPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.ports; + +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import java.util.List; + +public interface GetBankAutoTransferRecordsPortOut { + GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java new file mode 100644 index 00000000..c93dcda7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/GetBankAutoTransferRecordsService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecords; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain.GetBankAutoTransferRecordsCmd; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortIn; +import app.module.admin.usecase.household.getBankAutoTransferRecords.ports.GetBankAutoTransferRecordsPortOut; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetBankAutoTransferRecordsService implements GetBankAutoTransferRecordsPortIn { + private final GetBankAutoTransferRecordsPortOut portOut; + + @Override + public GetBankAutoTransferRecords operate(GetBankAutoTransferRecordsCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java new file mode 100644 index 00000000..2299a127 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferExpenseRecords { + private Long id; + private String categoryText; + private String categorySelf; + private String sourcePurpose; + private Integer count; + private String unitText; + private Integer price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java new file mode 100644 index 00000000..36103540 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferIncomeRecords { + private Long id; + private String cropText; + private String categoryText; + private String categorySelf; + private String sourcePurpose; + private Integer count; + private String unitText; + private Integer price; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java new file mode 100644 index 00000000..9413ac76 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecords.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferRecords { + List incomes; + List expenses; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java new file mode 100644 index 00000000..bec51c4a --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferRecordsCmd.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.getBankAutoTransferRecords.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetBankAutoTransferRecordsCmd { + private Long householdSeq; + private String recordMonth; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index 2dc93b54..99606a0d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -14,12 +14,12 @@ public class GetDailyExpenseRecords { private Long id; private String inputType; private Boolean isCredit; - private String categoryCode; private String categorySelf; private String sourcePurpose; private BigDecimal quantity; private String unitCode; private String unitText; + private String unitSelf; 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/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index 4ab787b8..a829dd41 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -16,12 +16,12 @@ public class GetDailyIncomeRecords { 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 unitSelf; private String price; private String estimatedValue; private String updatedBy; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java index d50a44ce..c445a507 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusDao.java @@ -3,6 +3,7 @@ package app.module.admin.usecase.household.getForestProductsStatus.adapters.pers import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut; import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -13,7 +14,13 @@ class GetForestProductsStatusDao implements GetForestProductsStatusPortOut { private final GetForestProductsStatusMapper mapper; @Override - public List operate(GetForestProductsStatusCmd cmd) { - return mapper.getForestProductsStatus(cmd); + public GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd) { + + // 임산물 등록 상태 조회 + String monthlyStatus = mapper.getMonthlyStatus(cmd); + // 임산물 목록 조회 + List forestProducts = mapper.getForestProductsStatus(cmd); + + return new GetForestProductsStatusResult(monthlyStatus, forestProducts); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java index 4a326b5e..7189b658 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/persistence/GetForestProductsStatusMapper.java @@ -7,5 +7,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface GetForestProductsStatusMapper { + String getMonthlyStatus(GetForestProductsStatusCmd cmd); List getForestProductsStatus(GetForestProductsStatusCmd cmd); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java index 013b79d7..f3c33691 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/GetForestProductsStatusController.java @@ -3,6 +3,7 @@ package app.module.admin.usecase.household.getForestProductsStatus.adapters.web; import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn; import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -18,10 +19,10 @@ class GetForestProductsStatusController { private final GetForestProductsStatusPortIn portIn; @GetMapping(path = "/api/household/forestProducts") - ResponseEntity> operate( + ResponseEntity operate( GetForestProductsStatusReqVO reqVO) { return ResponseEntity.status(HttpStatus.OK) .body(portIn.operate( - new GetForestProductsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getMonth()))); + new GetForestProductsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth()))); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java index 0ddf5c24..80a70f6e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/adapters/web/model/GetForestProductsStatusReqVO.java @@ -11,5 +11,5 @@ import lombok.Setter; @EqualsAndHashCode public class GetForestProductsStatusReqVO { private Long householdSeq; - private String month; + private String recordMonth; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java index b9aa1d7d..8e9058f5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortIn.java @@ -1,9 +1,8 @@ package app.module.admin.usecase.household.getForestProductsStatus.ports; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import java.util.List; +import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; public interface GetForestProductsStatusPortIn { - List operate(GetForestProductsStatusCmd cmd); + GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java index 969a386f..ef691dad 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/GetForestProductsStatusPortOut.java @@ -1,9 +1,8 @@ package app.module.admin.usecase.household.getForestProductsStatus.ports; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; -import java.util.List; +import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; public interface GetForestProductsStatusPortOut { - List operate(GetForestProductsStatusCmd cmd); + GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd); } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java index de7f3a01..e98f6369 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/GetForestProductsStatusService.java @@ -1,11 +1,10 @@ package app.module.admin.usecase.household.getForestProductsStatus.ports.application; -import lombok.RequiredArgsConstructor; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatus; -import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortIn; import app.module.admin.usecase.household.getForestProductsStatus.ports.GetForestProductsStatusPortOut; -import java.util.List; +import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusCmd; +import app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain.GetForestProductsStatusResult; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service @@ -14,7 +13,7 @@ class GetForestProductsStatusService implements GetForestProductsStatusPortIn { private final GetForestProductsStatusPortOut portOut; @Override - public List operate(GetForestProductsStatusCmd cmd) { + public GetForestProductsStatusResult operate(GetForestProductsStatusCmd cmd) { return portOut.operate(cmd); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java index 873f5576..be0efd7c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusCmd.java @@ -11,5 +11,5 @@ import lombok.Setter; @EqualsAndHashCode public class GetForestProductsStatusCmd { private Long householdSeq; - private String month; + private String recordMonth; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java new file mode 100644 index 00000000..fca2b04c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getForestProductsStatus/ports/application/domain/GetForestProductsStatusResult.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getForestProductsStatus.ports.application.domain; + +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetForestProductsStatusResult { + private String monthlyStatus; + private List forestProducts; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java new file mode 100644 index 00000000..a9b688a0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosDao.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.persistence; + +import java.util.Collections; +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; +import java.util.List; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class GetHouseholdVisitInfosDao implements GetHouseholdVisitInfosPortOut { + private final GetHouseholdVisitInfosMapper mapper; + + @Override + public List operate(GetHouseholdVisitInfosCmd cmd) { + return mapper.getHouseholdVisitInfos(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java new file mode 100644 index 00000000..42a5d79d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/persistence/GetHouseholdVisitInfosMapper.java @@ -0,0 +1,11 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.persistence; + +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface GetHouseholdVisitInfosMapper { + List getHouseholdVisitInfos(GetHouseholdVisitInfosCmd cmd); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java new file mode 100644 index 00000000..e5539dd3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/GetHouseholdVisitInfosController.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web; + +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.GetMapping; +import app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model.GetHouseholdVisitInfosReqVO; +import app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model.GetHouseholdVisitInfosResVO; + +@RestController +@RequiredArgsConstructor +class GetHouseholdVisitInfosController { + private final GetHouseholdVisitInfosPortIn portIn; + + @GetMapping(path = "/api/household/visitInfos") + ResponseEntity> operate( + GetHouseholdVisitInfosReqVO reqVO) { + return ResponseEntity.status(HttpStatus.OK).body(portIn.operate( + new GetHouseholdVisitInfosCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth()))); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java new file mode 100644 index 00000000..2f599c9b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosReqVO.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfosReqVO { + private Long householdSeq; + private String recordMonth; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java new file mode 100644 index 00000000..08aac2e9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/adapters/web/model/GetHouseholdVisitInfosResVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfosResVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java new file mode 100644 index 00000000..641d6e5e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortIn.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import java.util.List; + +public interface GetHouseholdVisitInfosPortIn { + List operate(GetHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java new file mode 100644 index 00000000..5abe4f21 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/GetHouseholdVisitInfosPortOut.java @@ -0,0 +1,9 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.ports; + +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import java.util.List; + +public interface GetHouseholdVisitInfosPortOut { + List operate(GetHouseholdVisitInfosCmd cmd); +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java new file mode 100644 index 00000000..af7ae630 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/GetHouseholdVisitInfosService.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application; + +import lombok.RequiredArgsConstructor; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfos; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain.GetHouseholdVisitInfosCmd; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortIn; +import app.module.admin.usecase.household.getHouseholdVisitInfos.ports.GetHouseholdVisitInfosPortOut; +import java.util.List; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class GetHouseholdVisitInfosService implements GetHouseholdVisitInfosPortIn { + private final GetHouseholdVisitInfosPortOut portOut; + + @Override + public List operate(GetHouseholdVisitInfosCmd cmd) { + return portOut.operate(cmd); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java new file mode 100644 index 00000000..046a1fab --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfos.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfos { + private Long id; + private String visitDate; + private String managementType; + private String content; + private Boolean isGiftSent; + private String updatedBy; + private String updatedAt; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java new file mode 100644 index 00000000..e7672dad --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdVisitInfos/ports/application/domain/GetHouseholdVisitInfosCmd.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.getHouseholdVisitInfos.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdVisitInfosCmd { + private Long householdSeq; + private String recordMonth; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index d4ea1c3c..682b4ec6 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.getHouseholdsStatus.adapters.web; +import app.module.admin.config.application.util.AdminUtil; import app.module.admin.usecase.household.getHouseholdsStatus.ports.GetHouseholdsStatusPortIn; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatus; import app.module.admin.usecase.household.getHouseholdsStatus.ports.application.domain.GetHouseholdsStatusCmd; @@ -42,6 +43,7 @@ class GetHouseholdsStatusController { reqVO.getResearcherField(), reqVO.getResearcherValue(), reqVO.getIsPanel(), + AdminUtil.getLoginUserSeq(), reqVO.getUserRole(), reqVO.getUserRegionMainCode() )) diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java index 005e1729..adade0c7 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatus.java @@ -11,7 +11,8 @@ import lombok.Setter; @NoArgsConstructor @EqualsAndHashCode public class GetHouseholdsStatus { - private Integer householdSeq; + private Long adminSeq; + private Long householdSeq; private String householdNum; private String householdName; private String householdPhone; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java index 0a798cb9..57f44a56 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/ports/application/domain/GetHouseholdsStatusCmd.java @@ -40,6 +40,8 @@ public class GetHouseholdsStatusCmd { private String researcherValue; // 패널 유지 여부 private Boolean isPanel; + // 로그인한 유저 seq + private Long adminSeq; // 로그인한 유저 역할 private String userRole; // 로그인한 유저 실사 지역 diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml new file mode 100644 index 00000000..d3d2e4d0 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml @@ -0,0 +1,43 @@ + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index be9c5584..a2d5565f 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -26,12 +26,12 @@ di.is_credit, /* 외상판매여부 */ di.crop_code, /* 재배형태 코드 */ ui_crop.code_text AS crop_text, /* 재배형태 코드 텍스트 */ - di.category_code, /* 수입 종류 코드 */ -- TODO(ks) : 수입의 종류 코드형태 맞는지 체크할 것 di.category_self, /* 수입 종류(직접입력) */ di.source_purpose, /* 수입원(용도) */ di.quantity, /* 수량 */ di.unit_code, /* 단위 코드 */ ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ + di.unit_self, /* 단위(직접입력) */ di.price, /* 현금 */ di.estimated_value, /* 현물평가액 */ di.updated_by, /* 최종수정자 */ @@ -77,12 +77,12 @@ SELECT de.id, /* 지출 id */ de.input_type, /* 입력구분 */ de.is_credit, /* 외상판매여부 */ - de.category_code, /* 재배형태 코드 */ de.category_self, /* 지출 종류 코드 */ de.source_purpose, /* 지출원(용도) */ de.quantity, /* 수량 */ de.unit_code, /* 단위 */ ui_unit.code_text AS unit_text, /* 단위 코드 텍스트 */ + de.unit_self, /* 단위(직접입력) */ de.price, /* 현금 */ de.estimated_value, /* 현물평가액 */ de.updated_by, /* 최종수정자 */ diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml index ac3fa2e3..f9e95670 100644 --- a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml @@ -3,6 +3,16 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml new file mode 100644 index 00000000..1e01a02f --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetHouseholdVisitInfosMapper.xml @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index f84ff8ac..17a188d9 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -26,6 +26,7 @@ COUNT(*) OVER () AS total FROM ( SELECT + r.admin_seq AS adminSeq, h.seq AS householdSeq, h.household_num AS householdNum, h.owner_name AS householdName, @@ -179,6 +180,11 @@ + + /* 조사원일 경우 매핑된 임가만 노출 */ + AND hvr.adminSeq = #{cmd.adminSeq} + + ORDER BY hvr.householdNum ASC OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY diff --git a/admin/src/main/resources/static/ui/uiUtil.js b/admin/src/main/resources/static/ui/uiUtil.js index 9a96a5fe..06803740 100644 --- a/admin/src/main/resources/static/ui/uiUtil.js +++ b/admin/src/main/resources/static/ui/uiUtil.js @@ -42,25 +42,28 @@ let uiUtil = { curPageNo = parseInt(curPageNo); const firstPage = 0; + const isFirstPage = curPageNo === 0; let frag1 = `
-
+
+
+ +
+
+

수입 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + +
선택재배형태수입의 종류대상수입원수량단위현금(원)
+
+ + +
+
+

지출 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택지출의 종류용도수량단위현금(원)
+
+
-
+
+
+
+

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택방문일관리분야내용최종 수정자답례품 전달
+
@@ -530,6 +627,12 @@ className: 'gray' } }; + + const managementType = { + VISIT: "방문조사", + CALL: "전화상담", + ETC: "기타" + }; + + + + diff --git a/core/src/main/resources/sql/schema/01_drop-all.sql b/core/src/main/resources/sql/schema/01_drop-all.sql index 49bf4058..3f9b3d64 100644 --- a/core/src/main/resources/sql/schema/01_drop-all.sql +++ b/core/src/main/resources/sql/schema/01_drop-all.sql @@ -12,7 +12,6 @@ DROP TABLE IF EXISTS notice_has_upload_file; DROP TABLE IF EXISTS notice; -- 조사원(관리자) 연관 테이블 -DROP TABLE IF EXISTS researcher_household_visit; DROP TABLE IF EXISTS researcher_has_household; DROP TABLE IF EXISTS researcher_has_area; DROP TABLE IF EXISTS research_area; @@ -64,6 +63,7 @@ DROP TABLE IF EXISTS front_user; -- household DROP TABLE IF EXISTS household_has_role; DROP TABLE IF EXISTS household; +DROP TABLE IF EXISTS household_visit; -- article DROP TABLE IF EXISTS article_has_upload_file; @@ -90,7 +90,6 @@ DROP SEQUENCE IF EXISTS address_seq; DROP SEQUENCE IF EXISTS input_day_group_seq; DROP SEQUENCE IF EXISTS operation_log_seq; -DROP SEQUENCE IF EXISTS researcher_household_visit_seq; DROP SEQUENCE IF EXISTS researcher_has_household_seq; DROP SEQUENCE IF EXISTS researcher_has_area_seq; DROP SEQUENCE IF EXISTS research_area_seq; @@ -119,6 +118,7 @@ DROP SEQUENCE IF EXISTS front_user_social_seq; DROP SEQUENCE IF EXISTS household_seq; DROP SEQUENCE IF EXISTS household_has_role_seq; +DROP SEQUENCE IF EXISTS household_visit_seq; DROP SEQUENCE IF EXISTS article_seq; DROP SEQUENCE IF EXISTS article_comment_seq; 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 2cf59a61..00a0f781 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -1008,48 +1008,47 @@ COMMENT ON COLUMN researcher_has_household.deleted_by IS '삭제자'; COMMENT ON COLUMN researcher_has_household.is_deleted IS '삭제여부'; --- 3. researcher_household_visit +-- 3. household_visit -- ============================================ --- TABLE : researcher_household_visit --- DESC : 조사원 임가 방문 정보 테이블 +-- TABLE : household_visit +-- DESC : 임가 방문 정보 테이블 -- ============================================ -CREATE SEQUENCE researcher_household_visit_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; +CREATE SEQUENCE household_visit_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; -CREATE TABLE researcher_household_visit ( - id bigint DEFAULT nextval('researcher_household_visit_seq') NOT NULL, -- 조사원임가방문정보 ID (PK) - admin_seq bigint NOT NULL, -- 관리자 일련번호 (조사원) - household_seq bigint NOT NULL, -- 임가 일련번호 - is_gift_sent boolean, -- 답례품 전달 여부 - memo varchar(255), -- 메모 - visit_date date, -- 방문 날짜(yyyy-mm-dd) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제 여부 +CREATE TABLE household_visit ( + id bigint DEFAULT nextval('household_visit_seq') NOT NULL, -- 조사원임가방문정보 ID (PK) + household_seq bigint NOT NULL, -- 임가 일련번호 + management_type varchar(20) NOT NULL, -- 관리분야 (VISIT, CALL, ETC) + is_gift_sent boolean, -- 답례품 전달 여부 + content varchar(255), -- 메모 + visit_date date, -- 방문 날짜(yyyy-mm-dd) + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted boolean DEFAULT false NOT NULL, -- 삭제 여부 - CONSTRAINT researcher_household_visit_pkey PRIMARY KEY (id), - CONSTRAINT fk_researcher_household_visit__admin FOREIGN KEY (admin_seq) REFERENCES admin(seq), - CONSTRAINT fk_researcher_household_visit__household FOREIGN KEY (household_seq) REFERENCES household(seq) + CONSTRAINT household_visit_pkey PRIMARY KEY (id), + CONSTRAINT fk_household_visit__household FOREIGN KEY (household_seq) REFERENCES household(seq) ); -COMMENT ON TABLE researcher_household_visit IS '조사원 임가 방문 정보 테이블'; +COMMENT ON TABLE household_visit IS '조사원 임가 방문 정보 테이블'; -COMMENT ON COLUMN researcher_household_visit.id IS '조사원임가방문정보 ID'; -COMMENT ON COLUMN researcher_household_visit.admin_seq IS '관리자 일련번호(조사원)'; -COMMENT ON COLUMN researcher_household_visit.household_seq IS '임가 일련번호'; -COMMENT ON COLUMN researcher_household_visit.is_gift_sent IS '답례품 전달 여부'; -COMMENT ON COLUMN researcher_household_visit.memo IS '메모'; -COMMENT ON COLUMN researcher_household_visit.visit_date IS '방문날짜(yyyy-mm-dd)'; -COMMENT ON COLUMN researcher_household_visit.created_at IS '생성일'; -COMMENT ON COLUMN researcher_household_visit.created_by IS '생성자'; -COMMENT ON COLUMN researcher_household_visit.updated_at IS '수정일'; -COMMENT ON COLUMN researcher_household_visit.updated_by IS '수정자'; -COMMENT ON COLUMN researcher_household_visit.deleted_at IS '삭제일'; -COMMENT ON COLUMN researcher_household_visit.deleted_by IS '삭제자'; -COMMENT ON COLUMN researcher_household_visit.is_deleted IS '삭제여부'; +COMMENT ON COLUMN household_visit.id IS '조사원임가방문정보 ID'; +COMMENT ON COLUMN household_visit.household_seq IS '임가 일련번호'; +COMMENT ON COLUMN household_visit.management_type IS '관리분야 (VISIT, CALL, ETC)'; +COMMENT ON COLUMN household_visit.is_gift_sent IS '답례품 전달 여부'; +COMMENT ON COLUMN household_visit.content IS '내용'; +COMMENT ON COLUMN household_visit.visit_date IS '방문날짜(yyyy-mm-dd)'; +COMMENT ON COLUMN household_visit.created_at IS '생성일'; +COMMENT ON COLUMN household_visit.created_by IS '생성자'; +COMMENT ON COLUMN household_visit.updated_at IS '수정일'; +COMMENT ON COLUMN household_visit.updated_by IS '수정자'; +COMMENT ON COLUMN household_visit.deleted_at IS '삭제일'; +COMMENT ON COLUMN household_visit.deleted_by IS '삭제자'; +COMMENT ON COLUMN household_visit.is_deleted IS '삭제여부'; -- 조사원 연관 테이블 종료 diff --git a/core/src/main/resources/sql/schema/04_create-view.sql b/core/src/main/resources/sql/schema/04_create-view.sql index cf32e3a5..ae2e3748 100644 --- a/core/src/main/resources/sql/schema/04_create-view.sql +++ b/core/src/main/resources/sql/schema/04_create-view.sql @@ -74,9 +74,10 @@ GROUP BY rhh.household_seq; -- ============================================ CREATE VIEW v_household_researcher AS SELECT - rhh.household_seq, - a.name AS researcher_name, - a.phone AS researcher_phone + a.seq AS admin_seq, + rhh.household_seq AS household_seq, + a.name AS researcher_name, + a.phone AS researcher_phone FROM researcher_has_household rhh JOIN admin a ON rhh.admin_seq = a.seq WHERE rhh.is_deleted = false; \ No newline at end of file