From 866ec501f52bdf44229cd7a99373327afe7a35f2 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Sat, 14 Jun 2025 20:51:10 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8,=20=EC=83=81=EC=84=B8=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EC=A4=91=20(4)?= 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/GetDailyRecordStatusReqVO.java | 16 + .../web/model/GetDailyRecordStatusResVO.java | 18 + .../ports/GetDailyRecordStatusPortIn.java | 9 + .../ports/GetDailyRecordStatusPortOut.java | 9 + .../GetDailyRecordStatusService.java | 20 + .../domain/GetDailyExpenseRecords.java | 26 + .../domain/GetDailyForestryRecords.java | 21 + .../domain/GetDailyIncomeRecords.java | 29 + .../domain/GetDailyPowerRecords.java | 21 + .../domain/GetDailyRecordStatus.java | 18 + .../domain/GetDailyRecordStatusCmd.java | 16 + .../web/GetDailyRecordsStatusController.java | 39 + .../web/model/GetDailyRecordsStatusReqVO.java | 15 + .../web/model/GetDailyRecordsStatusResVO.java | 18 + .../domain/GetDailyRecordsStatus.java | 1 + .../application/domain/RecordStatusType.java | 1 - .../domain/GetHouseholdStatus.java | 2 +- .../GetHouseholdStatusUIController.java | 9 - .../household/GetDailyRecordStatusMapper.xml | 89 +++ .../household/GetDailyRecordsCountMapper.xml | 66 +- .../household/GetDailyRecordsStatusMapper.xml | 26 +- .../household/GetHouseholdsStatusMapper.xml | 5 +- .../templates/household/households.html | 423 +++++++---- .../templates/household/households/{seq}.html | 703 +++++++++++++++--- .../sql/schema/05_create-funtion.sql | 10 +- 28 files changed, 1369 insertions(+), 316 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/GetDailyRecordStatusController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusResVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortOut.java create 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/getDailyRecordStatus/ports/application/domain/GetDailyExpenseRecords.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyForestryRecords.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyIncomeRecords.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyPowerRecords.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatus.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatusCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java create 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 new file mode 100644 index 00000000..946e56bf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusDao.java @@ -0,0 +1,30 @@ +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 new file mode 100644 index 00000000..d8eb7cc2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/persistence/GetDailyRecordStatusMapper.java @@ -0,0 +1,17 @@ +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 new file mode 100644 index 00000000..7f7db381 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/GetDailyRecordStatusController.java @@ -0,0 +1,28 @@ +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/GetDailyRecordStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusReqVO.java new file mode 100644 index 00000000..f59469ae --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusReqVO.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getDailyRecordStatus.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyRecordStatusReqVO { + private Long householdSeq; + private Long recordSeq; + private String recordMonth; +} 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 new file mode 100644 index 00000000..8780f52b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/adapters/web/model/GetDailyRecordStatusResVO.java @@ -0,0 +1,18 @@ +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 new file mode 100644 index 00000000..4ec3a312 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortIn.java @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..9ce70fdd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/GetDailyRecordStatusPortOut.java @@ -0,0 +1,9 @@ +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 new file mode 100644 index 00000000..beb478cb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/GetDailyRecordStatusService.java @@ -0,0 +1,20 @@ +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/getDailyRecordStatus/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyExpenseRecords.java new file mode 100644 index 00000000..52177087 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyExpenseRecords.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.getDailyRecordStatus.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 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 price; + 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/getDailyRecordStatus/ports/application/domain/GetDailyForestryRecords.java new file mode 100644 index 00000000..86d70026 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyForestryRecords.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.getDailyRecordStatus.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 GetDailyForestryRecords { + private Long id; + private String productName; + private String usage; + private BigDecimal quantity; + 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/getDailyRecordStatus/ports/application/domain/GetDailyIncomeRecords.java new file mode 100644 index 00000000..5af60cc4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyIncomeRecords.java @@ -0,0 +1,29 @@ +package app.module.admin.usecase.household.getDailyRecordStatus.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 +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyIncomeRecords { + private Long id; + private String inputType; + private Boolean isCredit; + private String cropCode; + private String categoryCode; + private String categorySelf; + private String sourcePurpose; + private BigDecimal quantity; + private String unitCode; + private String price; + 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/GetDailyPowerRecords.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyPowerRecords.java new file mode 100644 index 00000000..8f358161 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyPowerRecords.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyPowerRecords { + private Long id; + private String equipmentName; + private BigDecimal ownedHours; + private BigDecimal leasedHours; + private String updatedBy; + private String updatedAt; +} 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/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatus.java new file mode 100644 index 00000000..89bb5ffa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatus.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.getDailyRecordStatus.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 GetDailyRecordStatus { + List incomes; // 수입 + List expenses; // 지출 + List powers; // 동력사용시간 + List forestries; // 자가임업 +} 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/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatusCmd.java new file mode 100644 index 00000000..b1e26179 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordStatus/ports/application/domain/GetDailyRecordStatusCmd.java @@ -0,0 +1,16 @@ +package app.module.admin.usecase.household.getDailyRecordStatus.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@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/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java new file mode 100644 index 00000000..7d4321f2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/GetDailyRecordsStatusController.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web; + +import app.module.admin.usecase.household.getDailyRecordsCount.ports.GetDailyRecordsCountPortIn; +import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCountCmd; +import app.module.admin.usecase.household.getDailyRecordsStatus.ports.GetDailyRecordsStatusPortIn; +import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; +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.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusReqVO; +import app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusResVO; + +@RestController +@RequiredArgsConstructor +class GetDailyRecordsStatusController { + private final GetDailyRecordsStatusPortIn getDailyRecordsStatusPortIn; + private final GetDailyRecordsCountPortIn getDailyRecordsCountPortIn; + + @GetMapping(path = "/api/household/dailyRecordsStatus") + ResponseEntity operate( + GetDailyRecordsStatusReqVO reqVO) { + + List dailyRecords = + getDailyRecordsStatusPortIn.operate( + new GetDailyRecordsStatusCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth())); + + GetDailyRecordsCount summary = + getDailyRecordsCountPortIn.operate( + new GetDailyRecordsCountCmd(reqVO.getHouseholdSeq(), reqVO.getRecordMonth())).orElse(null); + + return ResponseEntity.status(HttpStatus.OK) + .body(new GetDailyRecordsStatusResVO(summary, dailyRecords)); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java new file mode 100644 index 00000000..80d83feb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusReqVO.java @@ -0,0 +1,15 @@ +package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyRecordsStatusReqVO { + private Long householdSeq; + private String recordMonth; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java new file mode 100644 index 00000000..29f8c4fb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/adapters/web/model/GetDailyRecordsStatusResVO.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.getDailyRecordsStatus.adapters.web.model; + +import app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount; +import app.module.admin.usecase.household.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetDailyRecordsStatusResVO { + private GetDailyRecordsCount summary; // 등록 현황 요약 + private List dailyRecords; // 일계부 등록 현황 +} 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 9cca9bcb..75394398 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 @@ -10,6 +10,7 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class GetDailyRecordsStatus { + private Long id; private String dayGroup; private RecordStatusType allStatusType; private String incomeStatus; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java index ea0b8de5..ccfdb005 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getDailyRecordsStatus/ports/application/domain/RecordStatusType.java @@ -9,7 +9,6 @@ public enum RecordStatusType { WAITING("대기"), DONE("작성완료"), INCOMPLETE("미완료"), - NONE("등록없음"), EMPTY("미작성"); private final String desc; diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java index ba38d6c7..919de75a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java @@ -41,7 +41,7 @@ public class GetHouseholdStatus { // 유지여부 private Boolean isPanel; // 비고 - private Double memo; + private String memo; // 조사원 private String researcherName; // 조사원 연락처 diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java index c3ed2d46..7284114a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/GetHouseholdStatusUIController.java @@ -19,8 +19,6 @@ import app.module.admin.usecase.household.getHouseholdStatusUI.model.GetHousehol @RequiredArgsConstructor class GetHouseholdStatusUIController { private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; - private final GetDailyRecordsStatusPortIn getDailyRecordsStatusPortIn; - private final GetDailyRecordsCountPortIn getDailyRecordsCountPortIn; @GetMapping(path = "/household/households/{seq}") String operate( @@ -35,13 +33,6 @@ class GetHouseholdStatusUIController { // 임가 상세 정보 model.addAttribute("householdInfo", getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null)); - - // TODO : 비동기호출로 변경하기 -// model.addAttribute("dailyRecords", -// getDailyRecordsStatusPortIn.operate(new GetDailyRecordsStatusCmd(seq, "202506"))); -// model.addAttribute("dailyRecordsCount", -// getDailyRecordsCountPortIn.operate(new GetDailyRecordsCountCmd(seq, "202506")) -// .orElse(null)); return "household/households/{seq}"; } diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusMapper.xml new file mode 100644 index 00000000..a4b57238 --- /dev/null +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml index 271ee38b..fe4f81bb 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsCountMapper.xml @@ -6,53 +6,37 @@ \ 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 74e1d493..7aa9f925 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml @@ -12,7 +12,7 @@ COUNT(DISTINCT di.id) AS income_cnt, COUNT(DISTINCT dw.id) AS work_cnt, COUNT(DISTINCT de.id) AS expense_cnt, - COUNT(DISTINCT dr.id) AS power_cnt, + COUNT(DISTINCT dp.id) AS power_cnt, COUNT(DISTINCT dfs.id) AS forestry_cnt FROM daily_record dr LEFT JOIN daily_income di ON di.daily_record_seq = dr.id AND di.is_deleted = false @@ -25,23 +25,27 @@ AND dr.record_month = #{recordMonth} AND dr.is_deleted = false GROUP BY dr.id + ), + month_check AS ( + SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month ) SELECT + dr.id AS id, ddg.start_day || CASE WHEN ddg.start_day = ddg.end_day THEN '' ELSE '-' || ddg.end_day END AS day_group, CASE - WHEN ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */ - WHEN dr.all_status = 'DONE' THEN 'DONE' /* 작성완료 */ - WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */ - WHEN dr.all_status = 'TODAY_NONE' THEN 'NONE' /* 등록없음 */ - ELSE 'EMPTY' /* 미작성 */ + WHEN mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */ + WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' /* 작성완료 */ + WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */ + ELSE 'EMPTY' /* 미작성 */ END AS all_status, - get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status, - get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status, - get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status, - get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status, - get_status(ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status + fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status, + fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status, + fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status, + fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status, + fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status -- TODO : 농업 자가소비량 테이블 수정 후 추가 FROM daily_day_group ddg + CROSS JOIN month_check mc LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 382f0f39..e70023d9 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -81,14 +81,13 @@ - - /* 지역 검색 : 지방실사 또는 조사원 */ + /* 실사 검색 : 지방실사 또는 조사원 */ AND hvr.regionMainCode = #{cmd.userRegionMainCode} - /* 지역 검색 : 관리자 */ + /* 실사 검색 : 관리자 */ AND hvr.regionMainCode = #{cmd.regionMainCode} diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html index 952e1478..3bdbdbd5 100644 --- a/admin/src/main/resources/templates/household/households.html +++ b/admin/src/main/resources/templates/household/households.html @@ -12,148 +12,291 @@ -
- - +
+ +
+
+ +
+
+

+ 연/월 +

+
+
+ +
+
- - - + +
+
+

+ 경영주 +

+
+
+
+ +
+
+
+ +
+
+
+
- - +
+
+
+
+

+ 실사 +

+
+ +
+
+
+

+ 지역 +

+
+ +
+
+
+

+ 세부지역 +

+
+ +
+
+
- - +
+
+
+
+

+ 업종 대분류 +

+
+ +
+
+
+

+ 업종 중분류 +

+
+ +
+
+
- - +
+
+
+

+ 일계부 현황 +

+
+ +
+
- - +
+
+
+
+

+ 당일 1차 방문 +

+
+ +
+
+
+

+ 당월 2차 방문 +

+
+ +
+
+
+

+ 답례품 방문 +

+
+ +
+
+
- - +
+
+

+ 조사원 +

+
+
+
+ +
+
+
+ +
+
+
+
- - +
+
+

+ 패널 유지 여부 +

+
+
+ +
+
- - +
- - + +
+
+ + +
+
+
- - +
+

총 0건

+ + + + + + + + + + + + + + + + + + + + + + - - - - - + +
+
+ +
+
임가번호이름전화번호실사지역세부지역업종(대분류)업종(중분류)당월 일계부 현황당월 1차 일가방문당월 2차 일가방문답례품 전달조사원조사원 휴대전화
+
- - + +
-
- - +
+
+ + + +
- -

총 100건

- - - - - - - - - - - - - - - - - - - - - - - - -
임가번호경영주명휴대전화실사지역세부지역업종 대분류업종 중분류당월 일계부 현황1차 방문일2차 방문일답례품 전달조사원조사원 휴대전화
-
-
@@ -187,18 +330,24 @@ tbody.append( ` - - ${ct.householdNum} - ${ct.householdName} - ${ct.householdPhone} - ${ct.regionMainName} - ${ct.regionSubName} - ${ct.regionDetailName} - ${isEmpty(ct.industryLargeName)} - ${isEmpty(ct.industryMiddleName)} - ${ct.progressPercent}% - ${isEmpty(ct.firstVisitDate)} - ${isEmpty(ct.secondVisitDate)} + +
+ +
+ + ${ct.householdNum} + ${ct.householdName} + ${ct.householdPhone} + ${ct.regionMainName} + ${ct.regionSubName} + ${ct.regionDetailName} + ${isEmpty(ct.industryLargeName)} + ${isEmpty(ct.industryMiddleName)} + ${ct.progressPercent}% + ${isEmpty(ct.firstVisitDate)} + ${isEmpty(ct.secondVisitDate)} ${ct.isGiftSent ? "전달" : "미전달"} ${isEmpty(ct.researcherName)} ${isEmpty(ct.researcherPhone)} diff --git a/admin/src/main/resources/templates/household/households/{seq}.html b/admin/src/main/resources/templates/household/households/{seq}.html index 0e6ff324..1e321f3e 100644 --- a/admin/src/main/resources/templates/household/households/{seq}.html +++ b/admin/src/main/resources/templates/household/households/{seq}.html @@ -3,120 +3,609 @@ layout:decorate="~{layout/layout}">
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
임가번호16750경영주홍길동연령75
가구 연락처031-0000-0000휴대전화010-0000-0000실사서울
지역31. 경기도세부지역9. 경기주소경기 성남시 분당구 삼평대로...
업종 대분류40. 수실류재배업업종 중분류142. 대추재배업업종 중분류242. 대추재배업규모/세부품목52_1. 조경수
조사원김조사조사원 연락처010-1111-1111유지여부1. 유지
비고비고 텍스트
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
임가번호 + 16750 + 경영주 + 홍길동 + 연령 + 75 +
가구 연락처 + 031-0000-0000 + 휴대폰 번호 + 010-0000-0000 +
실사 + 서울 + 지역 + 31.경기도 + 세부 지역 + 9.경기 +
전체 주소 + 경기도 성남시 분당구 산성대로 OOOO +
업종 대분류 + 40. 수실류재배업 + 업종 중분류1 + 42. 대추재배업 + 업종 중분류2 + 52_1. 조경수 +
규모/세부품목 + 52_1_1. 조경수 +
담당 조사원 + 김조사 + 담당조사원 연락처 + 010-0000-0000 + 유지여부 + 1.유지 +
비고 + - +
+ +
+
+ + +
+
+
+ +
+
+
+ + + + + +
+ +
+
+ +
+
+ +
+
+ 작성완료: 0 + 미작성: 0 + 미완료: 0 + 대기: 0 + 현황: 0% +
+
+ + + + + + + + + + + + + + + + +
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량
+
+
+ + + +
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+ +
+
+ + +
+
+
+
- - -
- - -
- - -
- - - - - - -
- - -
- - 작성완료: 0 - 미작성: 0 - 미완료: 0 - 대기: 0 - 현황: 0% - - - - - - - - - - - - - - - - - - - - - - - - - - -
입력날짜완료상태수입노동투입지출동력사용시간입업자가소비량
1-2작성완료4건등록없음등록없음2건2건
-
- + + + + +
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 01749bac..3937b23c 100644 --- a/core/src/main/resources/sql/schema/05_create-funtion.sql +++ b/core/src/main/resources/sql/schema/05_create-funtion.sql @@ -1,8 +1,8 @@ -- drop function -DROP FUNCTION IF EXISTS get_status(boolean, varchar, bigint); +DROP FUNCTION IF EXISTS fn_get_status(boolean, varchar, bigint); -- ============================================ --- FUNCTION : get_status +-- FUNCTION : fn_get_status -- DESC : 일계부 항목별 상태값 리턴용 공통 함수 -- PARAMS : -- - is_future_day : 미래 날짜 여부 @@ -10,7 +10,7 @@ DROP FUNCTION IF EXISTS get_status(boolean, varchar, bigint); -- - cnt : 등록 건수 -- RETURN : 텍스트 ('3건', '등록없음', '미작성', '-') -- ============================================ -CREATE OR REPLACE FUNCTION get_status( +CREATE OR REPLACE FUNCTION fn_get_status( is_future_day boolean, status varchar, cnt bigint @@ -19,10 +19,8 @@ CREATE OR REPLACE FUNCTION get_status( BEGIN IF is_future_day THEN RETURN '-'; - ELSIF status = 'TARGET' AND cnt > 0 THEN + ELSIF status = 'TARGET' THEN RETURN cnt || '건'; - ELSIF status = 'TARGET' AND cnt = 0 THEN - RETURN '등록없음'; ELSIF status IN ('TODAY_NONE', 'NONE') THEN RETURN '등록없음'; ELSE