diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java index 4c5dc7a9..7962904d 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -95,9 +95,9 @@ public class DailyRecordDao implements DailyRecordPortOut { /** * 일계부 전체 입력상태 변경 * - * @param searchMonth - * @param dayGroupNo - * @param householdSeq + * @param searchMonth 검색 월(yyyyMM) + * @param dayGroupNo 검색 그룸번호 + * @param householdSeq 임가 일련번호 */ private void updateByAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) { String allStatus = this.getUpdateAllStatus(searchMonth, dayGroupNo, householdSeq); @@ -121,11 +121,11 @@ public class DailyRecordDao implements DailyRecordPortOut { } /** - * TODO 변경할 전체 입력상태 조회 + * 변경할 전체 입력상태 조회 * - * @param searchMonth - * @param dayGroupNo - * @param householdSeq + * @param searchMonth 검색 월(yyyyMM) + * @param dayGroupNo 검색 그룸번호 + * @param householdSeq 임가 일련번호 * @return 변경할 전체 입력상태 */ private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) { @@ -199,6 +199,6 @@ public class DailyRecordDao implements DailyRecordPortOut { * @return true=입력대상인데 데이터가 없는 경우, false=입력대상 아니거나, 데이터가 있는 경우 */ private boolean checkTargetDataNone(DailyTargetStatus status, Integer count) { - return DailyTargetStatus.TARGET.equals(status) && count == 0; + return this.checkTarget(status) && count == 0; } } diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java index d255be8e..b62842f1 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java @@ -59,7 +59,6 @@ public class DailyRecordDto { private List stepList; /** * 다음 단계로 이동될 단계 조회 - * * @return 다음 단계명 */ public String getNextStep() { diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java deleted file mode 100644 index 4e7758e4..00000000 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/UpdateDailyRecordDto.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.core.usecase.daily.record.adapters.persistence.model; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class UpdateDailyRecordDto { - private String monthly; - private String updatedBy; - private String statusType; - private String statusCode; - -} diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java index acf5a621..1470359d 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java @@ -11,17 +11,17 @@ public class DailyUIReqVO { } public DailyUIReqVO(String searchMonth, Integer groupNo, Long householdSeq) { - this.householdSeq = householdSeq; this.searchMonth = searchMonth; this.groupNo = groupNo; + this.householdSeq = householdSeq; } public DailyUIReqVO(String searchMonth, String groupNo, Long householdSeq) { - this.householdSeq = householdSeq; this.searchMonth = searchMonth; if (!StringUtils.isBlank(groupNo)) { this.groupNo = Integer.parseInt(groupNo); } + this.householdSeq = householdSeq; } /** diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java index f6f30ea2..212e3882 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java @@ -19,6 +19,7 @@ public class CreateDailyRecordCmd extends AuditCommand { private String recordMonth; private int dayGroupNo; private Long householdSeq; + private LocalDate startDate; private LocalDate endDate; private DailyStatus allStatus; diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java index e06cd76f..25b52534 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/UpdateDailyRecordStatusCmd.java @@ -14,6 +14,7 @@ public class UpdateDailyRecordStatusCmd extends AuditCommand { private String recordMonth; private Integer dayGroupNo; private Long householdSeq; + private String allStatus; private String targetType; private String targetStatus;