diff --git a/core/src/main/java/app/module/core/config/application/enums/DailySort.java b/core/src/main/java/app/module/core/config/application/enums/DailySort.java
index b881d33a..2fc66bb4 100644
--- a/core/src/main/java/app/module/core/config/application/enums/DailySort.java
+++ b/core/src/main/java/app/module/core/config/application/enums/DailySort.java
@@ -6,13 +6,14 @@ import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public enum DailySort {
- INCOME("수입"),
- WORK("임업노동 투입"),
- EXPENSE("지출"),
- POWER("동력 사용시간"),
- FORESTRY("임업생산물 중 자가소비량"),
- FARMING("농업생산물 중 자가소비량"),
+ INCOME("수입", "수입"),
+ WORK("임업노동 투입", "임업노동 투입"),
+ EXPENSE("지출", "지출"),
+ POWER("동력 사용시간", "동력사용시간"),
+ FORESTRY("임업생산물 중 자가소비량", "자가임업 생산물 중 자가소비량"),
+ FARMING("농업생산물 중 자가소비량", "자가농업 생산물 중 자가소비량"),
;
private final String desc;
+ private final String desc2;
}
diff --git a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml
index 87d5abd2..c0798366 100644
--- a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml
+++ b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml
@@ -130,4 +130,12 @@
and dr.household_seq = #{householdSeq}
+
+ inner join daily_record dr on
+ dr.id = ds.daily_record_seq
+ and dr.is_deleted = false
+ and dr.record_month = #{searchMonth}
+ and dr.household_seq = #{householdSeq}
+
+
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java
index 49cb3a92..76177627 100644
--- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java
+++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeDao.java
@@ -22,6 +22,11 @@ public class DailyIncomeDao implements DailyIncomePortOut {
return dailyIncomeMapper.getDailyIncomeList(command);
}
+ @Override
+ public List monthList(GetDailyIncomeCmd command) {
+ return dailyIncomeMapper.getDailyIncomeListByMonth(command);
+ }
+
@Override
public void create(GetDailyIncomeCmd findCmd, CreateDailyIncomeCmd command) {
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java
index 8200f0da..9e54d559 100644
--- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java
+++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/DailyIncomeMapper.java
@@ -11,13 +11,21 @@ import java.util.List;
@Mapper
public interface DailyIncomeMapper {
/**
- * 일계부 수입 목록 조회
+ * 특정 그룹일의 일계부 수입 목록 조회
*
* @param command 검색 조건
* @return 수입 목록
*/
List getDailyIncomeList(GetDailyIncomeCmd command);
+ /**
+ * 특정월의 일계부 수입 목록 조회
+ *
+ * @param command 검색 조건
+ * @return 수입 목록
+ */
+ List getDailyIncomeListByMonth(GetDailyIncomeCmd command);
+
/**
* 일계부 수입 데이터 존재 여부
*
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java
index 34de8e81..09735915 100644
--- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java
+++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java
@@ -3,9 +3,13 @@ package app.module.front.usecase.daily.income.adapters.persistence.model;
import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType;
import lombok.Getter;
import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDate;
@Getter
@Setter
+@ToString
public class DailyIncomeDto {
private Long id;
private Long dailyRecordSeq;
@@ -21,6 +25,8 @@ public class DailyIncomeDto {
private String unitSelf;
private Long price;
private Long estimatedValue;
+ private LocalDate startDate;
+ private LocalDate endDate;
/**
* 수정 가능 여부
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyMonthIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyMonthIncomeDto.java
new file mode 100644
index 00000000..6d2becf2
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyMonthIncomeDto.java
@@ -0,0 +1,19 @@
+package app.module.front.usecase.daily.income.adapters.persistence.model;
+
+import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString
+public class DailyMonthIncomeDto {
+ private Long dailyRecordSeq;
+ private LocalDate startDate;
+ private LocalDate endDate;
+ private List children;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java
index 1058ff7f..bb27e5af 100644
--- a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java
+++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortIn.java
@@ -1,6 +1,7 @@
package app.module.front.usecase.daily.income.ports;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
+import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
@@ -9,13 +10,21 @@ import java.util.List;
public interface DailyIncomePortIn {
/**
- * 일계부 수입 조회
+ * 특정 그룹일의 일계부 수입 조회
*
* @param reqVO 검색 조건
* @return 수입 목록
*/
List list(DailyIncomeUIReqVO reqVO);
+ /**
+ * 특정월의 일계부 수입 조회
+ *
+ * @param reqVO 검색 조건
+ * @return 수입 목록
+ */
+ List monthList(DailyIncomeUIReqVO reqVO);
+
/**
* 일계부 수입 조회
*
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java
index efb685be..066a1076 100644
--- a/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java
+++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/DailyIncomePortOut.java
@@ -1,6 +1,8 @@
package app.module.front.usecase.daily.income.ports;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
+import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
+import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.ports.application.domain.CreateDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.GetDailyIncomeCmd;
import app.module.front.usecase.daily.income.ports.application.domain.RemoveDailyIncomeCmd;
@@ -16,6 +18,14 @@ public interface DailyIncomePortOut {
*/
List list(GetDailyIncomeCmd command);
+ /**
+ * 일계부 수입 조회
+ *
+ * @param command 검색 조건
+ * @return 수입 목록
+ */
+ List monthList(GetDailyIncomeCmd command);;
+
/**
* 일계부 수입 등록
*
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java
index e937075d..5f4d558e 100644
--- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java
+++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java
@@ -7,6 +7,7 @@ import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElemen
import app.module.front.config.application.util.AuditUtil;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
+import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.income.adapters.web.model.RemoveDailyIncomeReqVO;
@@ -19,7 +20,9 @@ import app.module.core.usecase.daily.record.ports.application.DailyRecordService
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@@ -30,12 +33,36 @@ public class DailyIncomeService implements DailyIncomePortIn {
@Override
public List list(DailyIncomeUIReqVO reqVO) {
- return this.getRefineList(reqVO);
+ return this.getRefineList(reqVO, true);
+ }
+
+ @Override
+ public List monthList(DailyIncomeUIReqVO reqVO) {
+
+ List monthList = new ArrayList<>();
+
+ List list = this.getRefineList(reqVO, false);
+// DailyIncomeDto> children;
+
+ List seqList = list.stream().map(m -> m.getDailyRecordSeq()).distinct().collect(Collectors.toList());
+
+ for (Long seq : seqList) {
+ DailyMonthIncomeDto month = new DailyMonthIncomeDto();
+ month.setDailyRecordSeq(seq);
+
+ month.setStartDate(list.stream().filter(f -> f.getDailyRecordSeq() == seq).map(m -> m.getStartDate()).findFirst().get());
+ month.setEndDate(list.stream().filter(f -> f.getDailyRecordSeq() == seq).map(m -> m.getEndDate()).findFirst().get());
+
+ month.setChildren(list.stream().filter(f -> f.getDailyRecordSeq() == seq).collect(Collectors.toList()));
+ monthList.add(month);
+ }
+
+ return monthList;
}
@Override
public DailyIncomeDto detail(DailyIncomeUIReqVO reqVO) {
- List list = this.getRefineList(reqVO);
+ List list = this.getRefineList(reqVO, true);
if (list.isEmpty()) {
return null;
}
@@ -46,14 +73,17 @@ public class DailyIncomeService implements DailyIncomePortIn {
/**
* 목록 데이터 조회
*
- * @param reqVO 검색 조건
+ * @param reqVO 검색 조건
+ * @param dayGroup 일 그룹 조건
* @return 공통 처리된 목록
*/
- private List getRefineList(DailyIncomeUIReqVO reqVO) {
- List list = portOut.list(new GetDailyIncomeCmd(reqVO.getSearchMonth(),
+ private List getRefineList(DailyIncomeUIReqVO reqVO, boolean dayGroup) {
+ GetDailyIncomeCmd command = new GetDailyIncomeCmd(reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
- reqVO.getId()));
+ reqVO.getId());
+
+ List list = dayGroup ? portOut.list(command) : portOut.monthList(command);
List recordCrop = uiCodeListPortIn.connect("code.record.crop");
List recordUnit = uiCodeListPortIn.connect("code.record.unit");
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusDao.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusDao.java
new file mode 100644
index 00000000..0f1c4565
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusDao.java
@@ -0,0 +1,42 @@
+package app.module.front.usecase.daily.status.adapters.persistence;
+
+import app.module.front.usecase.daily.status.adapters.persistence.model.DailyItemStatusDto;
+import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
+import app.module.front.usecase.daily.status.ports.DailyStatusPortOut;
+import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+public class DailyStatusDao implements DailyStatusPortOut {
+ private final DailyStatusMapper dailyStatusMapper;
+
+ @Override
+ public DailyMonthStatusDto operate(DailyStatusCmd command) {
+ DailyMonthStatusDto detail = dailyStatusMapper.getDailyStatusByMonth(command);
+ List countList = dailyStatusMapper.getDailyStatusByItemCount(command);
+ List valueList = dailyStatusMapper.getDailyStatusByItemValue(command);
+
+ int totalInput = 0;
+ if (detail != null) {
+ for (DailyItemStatusDto item : countList) {
+ totalInput = totalInput + item.getInputCount();
+
+ for (DailyItemStatusDto value : valueList) {
+ if (item.getStep().equals(value.getStep())) {
+ item.setTotalValue(value.getTotalValue());
+ break;
+ }
+ }
+ }
+
+ detail.setTotalInput(totalInput);
+ detail.setItemList(countList);
+ }
+
+ return detail;
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusMapper.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusMapper.java
new file mode 100644
index 00000000..65f12364
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/DailyStatusMapper.java
@@ -0,0 +1,34 @@
+package app.module.front.usecase.daily.status.adapters.persistence;
+
+import app.module.front.usecase.daily.status.adapters.persistence.model.DailyItemStatusDto;
+import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
+import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface DailyStatusMapper {
+ /**
+ * 월별 입력 현황 조회
+ * @param command 검색 조건
+ * @return 월별 입력 현황
+ */
+ DailyMonthStatusDto getDailyStatusByMonth(DailyStatusCmd command);
+
+ /**
+ * 항목별 월별 입력 현황 건 수 조회
+ *
+ * @param command 검색 조건
+ * @return 항목별 월별 현황 건 수
+ */
+ List getDailyStatusByItemCount(DailyStatusCmd command);
+
+ /**
+ * 항목별 월별 입력 현황 값(금액/시간) 조회
+ *
+ * @param command 검색 조건
+ * @return 항목별 월별 현황 값(금액/시간)
+ */
+ List getDailyStatusByItemValue(DailyStatusCmd command);
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/model/DailyItemStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/model/DailyItemStatusDto.java
new file mode 100644
index 00000000..dc0c7333
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/model/DailyItemStatusDto.java
@@ -0,0 +1,30 @@
+package app.module.front.usecase.daily.status.adapters.persistence.model;
+
+import app.module.core.config.application.enums.DailySort;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DailyItemStatusDto {
+ /**
+ * 항목
+ */
+ private DailySort step;
+ /**
+ * 대상일
+ */
+ private Integer dayCount;
+ /**
+ * 완료일(작성일)
+ */
+ private Integer doneCount;
+ /**
+ * 작성중일(등록 건수)
+ */
+ private Integer inputCount;
+ /**
+ * 집계 수
+ */
+ private String totalValue;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/model/DailyMonthStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/model/DailyMonthStatusDto.java
new file mode 100644
index 00000000..459f560b
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/persistence/model/DailyMonthStatusDto.java
@@ -0,0 +1,28 @@
+package app.module.front.usecase.daily.status.adapters.persistence.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+public class DailyMonthStatusDto {
+ /**
+ * 대상일
+ */
+ private Integer dayCount;
+ /**
+ * 완료일(작성일)
+ */
+ private Integer doneCount;
+ /**
+ * 총 등록 수
+ */
+ private Integer totalInput;
+
+ /**
+ * 항목별 월별 현황
+ */
+ List itemList;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java
new file mode 100644
index 00000000..3eac1adb
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/DailyStatusUIController.java
@@ -0,0 +1,91 @@
+package app.module.front.usecase.daily.status.adapters.web;
+
+import app.module.core.config.application.enums.DailySort;
+import app.module.core.config.application.exception.NoMatchingURIException;
+import app.module.front.usecase.daily.income.adapters.persistence.model.DailyMonthIncomeDto;
+import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
+import app.module.front.usecase.daily.income.ports.DailyIncomePortIn;
+import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO;
+import app.module.front.usecase.daily.status.ports.DailyStatusPortIn;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Slf4j
+@Controller
+@RequiredArgsConstructor
+@RequestMapping(path = "/status/daily")
+public class DailyStatusUIController {
+ private final DailyStatusPortIn dailyStatusPortIn;
+ private final DailyIncomePortIn dailyIncomePortIn;
+
+ /**
+ * 일계부 입력 현황 화면
+ *
+ * @param model Model
+ */
+ @GetMapping(path = "")
+ public String index(Model model, @ModelAttribute DailyStatusUIReqVO reqVO) {
+ log.debug("reqVO: {}", reqVO);
+
+ model.addAttribute("reqVO", reqVO);
+
+ model.addAttribute("detail", dailyStatusPortIn.operate(reqVO));
+
+ return "status/daily";
+ }
+
+ /**
+ * 일계부 입력 현황 상세 화면
+ *
+ * @param model Model
+ * @param step 조회 항목
+ * @param searchMonth 검색 월
+ */
+ @GetMapping(path = "/{step}/{searchMonth}")
+ public String detail(Model model, @PathVariable("step") String step, @PathVariable("searchMonth") String searchMonth) {
+ if (DailySort.INCOME.name().equalsIgnoreCase(step)) {
+ List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
+
+ model.addAttribute("step", DailySort.INCOME);
+ model.addAttribute("list", list);
+// } else if (DailySort.WORK.name().equalsIgnoreCase(step)) {
+// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
+//
+// model.addAttribute("step", DailySort.WORK);
+// model.addAttribute("list", list);
+// } else if (DailySort.EXPENSE.name().equalsIgnoreCase(step)) {
+// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
+//
+// model.addAttribute("step", DailySort.EXPENSE);
+// model.addAttribute("list", list);
+// } else if (DailySort.POWER.name().equalsIgnoreCase(step)) {
+// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
+//
+// model.addAttribute("step", DailySort.POWER);
+// model.addAttribute("list", list);
+// } else if (DailySort.FORESTRY.name().equalsIgnoreCase(step)) {
+// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
+//
+// model.addAttribute("step", DailySort.FORESTRY);
+// model.addAttribute("list", list);
+// } else if (DailySort.FARMING.name().equalsIgnoreCase(step)) {
+// List list = dailyIncomePortIn.monthList(new DailyIncomeUIReqVO(searchMonth, ""));
+//
+// model.addAttribute("step", DailySort.FARMING);
+// model.addAttribute("list", list);
+ } else {
+ throw new NoMatchingURIException("잘못된 접근");
+ }
+
+ model.addAttribute("searchMonth", searchMonth);
+ return String.format("status/daily/detail-%s", step);
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/model/DailyStatusUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/model/DailyStatusUIReqVO.java
new file mode 100644
index 00000000..5804730d
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/adapters/web/model/DailyStatusUIReqVO.java
@@ -0,0 +1,44 @@
+package app.module.front.usecase.daily.status.adapters.web.model;
+
+import app.module.core.config.application.util.DailyUtil;
+import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
+import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.apache.tika.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+@ToString(callSuper = true)
+public class DailyStatusUIReqVO extends DailyUIReqVO {
+ private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class);
+ private static DailyUtil dailyUtil;
+
+ public DailyStatusUIReqVO() {
+ setSearchMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")));
+ }
+
+ /**
+ * 검색 월 목록
+ *
+ * @return 현재 날짜 기준 최대 13개월전까지의 검색 월
+ */
+ public List getMonthList() {
+ LocalDate currentMonth = LocalDate.now();
+ List monthList = new ArrayList<>();
+ monthList.add(currentMonth);
+ for (int i = 1 ; i <= 13; i++) {
+ monthList.add(currentMonth.minusMonths(i));
+ }
+
+ return monthList;
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortIn.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortIn.java
new file mode 100644
index 00000000..fc9d5489
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortIn.java
@@ -0,0 +1,15 @@
+package app.module.front.usecase.daily.status.ports;
+
+
+import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
+import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO;
+
+public interface DailyStatusPortIn {
+ /**
+ * 특정월의 일계부 입력 현황
+ *
+ * @param reqVO 검색 조건
+ * @return 특정월의 일계부 입력 현황
+ */
+ DailyMonthStatusDto operate(DailyStatusUIReqVO reqVO);
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortOut.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortOut.java
new file mode 100644
index 00000000..e65bc9a6
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/DailyStatusPortOut.java
@@ -0,0 +1,14 @@
+package app.module.front.usecase.daily.status.ports;
+
+import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
+import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
+
+public interface DailyStatusPortOut {
+ /**
+ * 특정월의 일계부 입력 현황
+ *
+ * @param command 검색 조건
+ * @return 특정월의 일계부 입력 현황
+ */
+ DailyMonthStatusDto operate(DailyStatusCmd command);
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/application/DailyStatusService.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/DailyStatusService.java
new file mode 100644
index 00000000..9ce63e11
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/DailyStatusService.java
@@ -0,0 +1,20 @@
+package app.module.front.usecase.daily.status.ports.application;
+
+import app.module.front.usecase.daily.status.adapters.persistence.model.DailyMonthStatusDto;
+import app.module.front.usecase.daily.status.adapters.web.model.DailyStatusUIReqVO;
+import app.module.front.usecase.daily.status.ports.DailyStatusPortIn;
+import app.module.front.usecase.daily.status.ports.DailyStatusPortOut;
+import app.module.front.usecase.daily.status.ports.application.domain.DailyStatusCmd;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class DailyStatusService implements DailyStatusPortIn {
+ private final DailyStatusPortOut portOut;
+
+ @Override
+ public DailyMonthStatusDto operate(DailyStatusUIReqVO reqVO) {
+ return portOut.operate(new DailyStatusCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq()));
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/DailyStatusCmd.java b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/DailyStatusCmd.java
new file mode 100644
index 00000000..ed7301bf
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/status/ports/application/domain/DailyStatusCmd.java
@@ -0,0 +1,19 @@
+package app.module.front.usecase.daily.status.ports.application.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class DailyStatusCmd {
+ /**
+ * 검색 월(yyyyMM)
+ */
+ private String recordMonth;
+ /**
+ * 임가 일련번호
+ */
+ private Long householdSeq;
+}
diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml
index a1383321..a8bf612a 100644
--- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml
+++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml
@@ -17,6 +17,19 @@
ds.id desc
+
+