diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java index 4ca9f925..1b6f419a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordsStatus/ports/application/domain/GetDailyRecordsStatus.java @@ -11,6 +11,7 @@ import lombok.Setter; @EqualsAndHashCode public class GetDailyRecordsStatus { private Long id; + private Integer dayGroupNo; private String dayGroup; private RecordStatusType allStatusType; private String incomeStatus; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java new file mode 100644 index 00000000..3a3fc5c5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java @@ -0,0 +1,47 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd; +import app.module.core.config.application.enums.DailySort; +import app.module.core.config.application.enums.DailyTargetStatus; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +@Slf4j +@Repository +@RequiredArgsConstructor +class UpdateDailyNoneDao implements UpdateDailyNonePortOut { + private final UpdateDailyNoneMapper mapper; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public void create(UpdateDailyNoneCmd command) { + command.setDailyRecordSeq(mapper.getDailyRecordSeq(command)); + + if (command.getCurrentStep() != null) { + if (DailyTargetStatus.TODAY_NONE.equals(command.getCurrentStatus())) { + // 등록된 데이터 일괄 삭제 + if (DailySort.INCOME.equals(command.getCurrentStep())) { + mapper.removeDailyIncome(command); + } else if (DailySort.WORK.equals(command.getCurrentStep())) { + mapper.removeDailyWork(command); + } else if (DailySort.EXPENSE.equals(command.getCurrentStep())) { + mapper.removeDailyExpense(command); + } else if (DailySort.POWER.equals(command.getCurrentStep())) { + mapper.removeDailyPower(command); + } else if (DailySort.FORESTRY.equals(command.getCurrentStep())) { + mapper.removeDailyForestry(command); + } else if (DailySort.FARMING.equals(command.getCurrentStep())) { + mapper.removeDailyFarming(command); + } + } + + dailyRecordPortIn.updateByStatus(command.getSearchMonth(), command.getGroupNo(), command.getHouseholdSeq(), command.getCurrentStep().name(), command.getCurrentStatus().name()); + + } else { + log.error("[CreateDailyNone] Current step is null. cmd:{}", command); + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneMapper.java new file mode 100644 index 00000000..54d4bd4e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneMapper.java @@ -0,0 +1,51 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UpdateDailyNoneMapper { + /** + * 일계부 항목 일련번호 조회 + * + * @param command 검색 조건 + * @return 일계부 항목 일련번호 + */ + Long getDailyRecordSeq(UpdateDailyNoneCmd command); + + /** + * 특정일의 수입 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyIncome(UpdateDailyNoneCmd command); + + /** + * 특정일의 임업노동 투입 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyWork(UpdateDailyNoneCmd command); + + /** + * 특정일의 지출 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyExpense(UpdateDailyNoneCmd command); + + /** + * 동력 사용시간 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyPower(UpdateDailyNoneCmd command); + + /** + * 자가임업 생산물 중 자가소비량 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyForestry(UpdateDailyNoneCmd command); + + /** + * 자가농업 생산물 중 자가소비량 전체 삭제 + * @param command 검색 조건 + */ + void removeDailyFarming(UpdateDailyNoneCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java new file mode 100644 index 00000000..1ca788d5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/UpdateDailyNoneController.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.web.modal.UpdateDailyNoneReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequiredArgsConstructor +class UpdateDailyNoneController { + private final UpdateDailyNonePortIn updateDailyNonePortIn; + + @PostMapping(path = "/api/household/daily/today-none") + ResponseEntity create(@RequestBody UpdateDailyNoneReqVO formVO) { + log.debug("formVO: {}", formVO); + + updateDailyNonePortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/modal/UpdateDailyNoneReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/modal/UpdateDailyNoneReqVO.java new file mode 100644 index 00000000..2d66431c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/web/modal/UpdateDailyNoneReqVO.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.web.modal; + +import app.module.core.config.application.enums.DailySort; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +public class UpdateDailyNoneReqVO { + private String recordMonth; + private Integer groupNo; + private Long householdSeq; + + /** + * 현재 단계 + */ + private DailySort currentStep; + /** + * 금일 데이터 없음 여부 (Y/N) + */ + private String todayNone; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/UpdateDailyNonePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/UpdateDailyNonePortIn.java new file mode 100644 index 00000000..9576ded4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/UpdateDailyNonePortIn.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.web.modal.UpdateDailyNoneReqVO; + +public interface UpdateDailyNonePortIn { + /** + * 일계부 금일 데이터 없음 등록 + * + * @param formVO 입력 데이터 + */ + void create(UpdateDailyNoneReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/UpdateDailyNonePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/UpdateDailyNonePortOut.java new file mode 100644 index 00000000..79a21f7b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/UpdateDailyNonePortOut.java @@ -0,0 +1,12 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd; + +public interface UpdateDailyNonePortOut { + /** + * 일계부 금일 데이터 없음 등록 + * + * @param command 입력 데이터 + */ + void create(UpdateDailyNoneCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java new file mode 100644 index 00000000..f8a953fa --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java @@ -0,0 +1,33 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapters.web.modal.UpdateDailyNoneReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortIn; +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd; +import app.module.core.config.application.enums.DailyTargetStatus; +import app.module.core.config.application.util.AuditUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UpdateDailyNoneService implements UpdateDailyNonePortIn { + private final UpdateDailyNonePortOut portOut; + + @Override + public void create(UpdateDailyNoneReqVO formVO) { + DailyTargetStatus currentStatus = "Y".equals(formVO.getTodayNone()) ? DailyTargetStatus.TODAY_NONE : DailyTargetStatus.TARGET; + + UpdateDailyNoneCmd command = AuditUtil.update( + new UpdateDailyNoneCmd( + formVO.getRecordMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getCurrentStep(), + currentStatus, + null) + ); + + portOut.create(command); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/domain/UpdateDailyNoneCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/domain/UpdateDailyNoneCmd.java new file mode 100644 index 00000000..2f509722 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/domain/UpdateDailyNoneCmd.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import app.module.core.config.application.enums.DailySort; +import app.module.core.config.application.enums.DailyTargetStatus; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class UpdateDailyNoneCmd extends AuditCommand { + private String searchMonth; + private Integer groupNo; + private Long householdSeq; + + /** + * 현재 단계 + */ + private DailySort currentStep; + /** + * 현재 입력상태 + */ + private DailyTargetStatus currentStatus; + /** + * 일계부 항목 일련번호 + */ + private Long dailyRecordSeq; +} diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml index 67e8b6a4..d5aa2325 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordsStatusMapper.xml @@ -34,6 +34,7 @@ ) SELECT dr.id AS id, + ddg.group_no AS day_group_no, /* 해당 월의 말일을 기준으로 종료일을 제한하여 일자 그룹 표시 */ ddg.start_day || CASE diff --git a/admin/src/main/resources/mappers/household/UpdateDailyNoneMapper.xml b/admin/src/main/resources/mappers/household/UpdateDailyNoneMapper.xml new file mode 100644 index 00000000..c6257320 --- /dev/null +++ b/admin/src/main/resources/mappers/household/UpdateDailyNoneMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html index ef1dfb18..faf8afe0 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -4,6 +4,10 @@
+ + + +
@@ -11,23 +15,23 @@
  • 작성완료

    - 6건 + 0건
  • 미작성

    - 6건 + 0건
  • 미완료

    - 6건 + 0건
  • 대기

    - 6건 + 0건
  • 완료율

    - 56.12% + 0%
@@ -53,8 +57,21 @@