diff --git a/core/src/main/java/app/module/core/config/application/enums/MonthStatus.java b/core/src/main/java/app/module/core/config/application/enums/MonthStatus.java
index f17da9fb..3842f0fe 100644
--- a/core/src/main/java/app/module/core/config/application/enums/MonthStatus.java
+++ b/core/src/main/java/app/module/core/config/application/enums/MonthStatus.java
@@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum MonthStatus {
NONE("미등록"), // 미등록
- NOTHING("데이터없음으로 등록"), // 등록할것이 없음
- REGISTERED("데이터등록"); // 등록됨
+ NOTHING("등록없음"), // 등록할것이 없음
+ REGISTERED("등록완료"); // 등록됨
private final String desc;
}
diff --git a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java
index f2ec35bb..b48d5dae 100644
--- a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java
+++ b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatuss.java
@@ -25,4 +25,13 @@ public class GetMonthlyInputStatuss {
private String createdBy;
private LocalDateTime updatedAt;
private String updatedBy;
+
+ public String getKoreanMonth() {
+ if (month != null && month.contains("-")) {
+ String[] parts = month.split("-");
+ return parts[0] + "년 " + Integer.parseInt(parts[1]) + "월";
+ }
+ return "";
+ }
+
}
diff --git a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatussCmd.java b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatussCmd.java
index 205f8844..89979564 100644
--- a/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatussCmd.java
+++ b/core/src/main/java/app/module/core/usecase/monthly/getMonthlyInputStatuss/ports/application/domain/GetMonthlyInputStatussCmd.java
@@ -13,4 +13,5 @@ public class GetMonthlyInputStatussCmd {
private String searchField;
private String searchValue;
+ private Long householdSeq;
}
diff --git a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml
index c104e6a9..5c3439c6 100644
--- a/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml
+++ b/core/src/main/resources/mappers/monthly/GetMonthlyInputStatussMapper.xml
@@ -22,6 +22,11 @@
FROM monthly_input_status a
WHERE a.is_deleted = false
+
+ AND a.household_seq = ${cmd.householdSeq}
+
+
+
diff --git a/front/src/main/java/app/module/front/usecase/info/monthly/getMonthlysUI/adapters/web/GetMontylysUIController.java b/front/src/main/java/app/module/front/usecase/info/monthly/getMonthlysUI/adapters/web/GetMontylysUIController.java
index d40c7b7c..32aac1ac 100644
--- a/front/src/main/java/app/module/front/usecase/info/monthly/getMonthlysUI/adapters/web/GetMontylysUIController.java
+++ b/front/src/main/java/app/module/front/usecase/info/monthly/getMonthlysUI/adapters/web/GetMontylysUIController.java
@@ -1,5 +1,6 @@
package app.module.front.usecase.info.monthly.getMonthlysUI.adapters.web;
+import app.module.core.config.application.enums.MonthStatus;
import app.module.core.config.application.util.CommonUtil;
import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn;
import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd;
@@ -9,6 +10,7 @@ import app.module.core.usecase.monthly.getMonthlyInputStatuss.ports.application.
import app.module.core.usecase.monthly.getMonthlyInputStatuss.ports.application.domain.GetMonthlyInputStatussCmd;
import app.module.core.usecase.notice.getNotices.ports.application.domain.GetNotices;
import app.module.core.usecase.notice.getNotices.ports.application.domain.GetNoticesCmd;
+import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.info.monthly.getMonthlysUI.adapters.web.model.GetMontylyssReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
@@ -32,14 +34,18 @@ class GetMontylysUIController {
@PageableDefault(sort = "month", direction = Sort.Direction.DESC, page = 0, size = 13) Pageable pageable,
GetMontylyssReqVO reqVO) {
- Page notices =
+ Page list =
portIn.operate(
pageable,
new GetMonthlyInputStatussCmd(
- reqVO.getSearchField(), reqVO.getSearchValue()));
+ reqVO.getSearchField(), reqVO.getSearchValue(), AuthUtil.getUserSeq()));
model.addAttribute("reqVO", reqVO);
- model.addAttribute("list", notices);
+ model.addAttribute("list", list);
+
+ // TODO 페키지명이 넘무 길어서 그냥
+ model.addAttribute("MonthStatus", MonthStatus.class);
+
return "info/monthly/monthlys";
}
}
\ No newline at end of file
diff --git a/front/src/main/resources/templates/info/monthly/monthlys.html b/front/src/main/resources/templates/info/monthly/monthlys.html
index 5d89cbb8..17d3d3a9 100644
--- a/front/src/main/resources/templates/info/monthly/monthlys.html
+++ b/front/src/main/resources/templates/info/monthly/monthlys.html
@@ -11,22 +11,11 @@