From 9bbd0462531382a13d35c118b19f2205bdbc7cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 14:25:30 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20CUD=20?= =?UTF-8?q?=EB=90=A0=EB=95=8C=20=EC=A0=84=EC=B2=B4=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=8F=84=20=EB=B3=80=EA=B2=BD=ED=95=98?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/DailyExpenseService.java | 6 + .../application/DailyFarmingService.java | 6 + .../application/DailyForestryService.java | 6 + .../ports/application/DailyIncomeService.java | 6 + .../ports/application/DailyPowerService.java | 6 + .../adapters/persistence/DailyRecordDao.java | 123 ++++++++++++++++-- .../daily/record/ports/DailyRecordPortIn.java | 2 + .../ports/application/DailyRecordService.java | 6 + .../adapters/persistence/DailyWorkDao.java | 2 + .../ports/application/DailyWorkService.java | 6 + .../mappers/daily/DailyRecordMapper.xml | 37 +++--- 11 files changed, 179 insertions(+), 27 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java index dd95c14d..5aa8d7c6 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java @@ -13,6 +13,7 @@ import app.module.front.usecase.daily.expense.ports.DailyExpensePortOut; import app.module.front.usecase.daily.expense.ports.application.domain.CreateDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.GetDailyExpenseCmd; import app.module.front.usecase.daily.expense.ports.application.domain.RemoveDailyExpenseCmd; +import app.module.front.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,7 @@ import java.util.List; public class DailyExpenseService implements DailyExpensePortIn { private final DailyExpensePortOut portOut; private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordService dailyRecordService; @Override public List list(DailyExpenseUIReqVO reqVO) { @@ -107,6 +109,8 @@ public class DailyExpenseService implements DailyExpensePortIn { formVO.getEstimatedValue())); portOut.create(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } @Override @@ -127,5 +131,7 @@ public class DailyExpenseService implements DailyExpensePortIn { formVO.getDailyRecordSeq())); portOut.remove(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java index a2e69d81..7b860106 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java @@ -13,6 +13,7 @@ import app.module.front.usecase.daily.farming.ports.DailyFarmingPortOut; import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; +import app.module.front.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -25,6 +26,7 @@ import java.util.List; public class DailyFarmingService implements DailyFarmingPortIn { private final DailyFarmingPortOut portOut; private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordService dailyRecordService; @Override public List list(DailyFarmingUIReqVO reqVO) { @@ -132,6 +134,8 @@ public class DailyFarmingService implements DailyFarmingPortIn { formVO.getEstimatedValue())); portOut.create(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } @Override @@ -152,5 +156,7 @@ public class DailyFarmingService implements DailyFarmingPortIn { formVO.getDailyRecordSeq())); portOut.remove(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java index 435d69fb..710c0c94 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java @@ -13,6 +13,7 @@ import app.module.front.usecase.daily.forestry.ports.DailyForestryPortOut; import app.module.front.usecase.daily.forestry.ports.application.domain.CreateDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.GetDailyForestryCmd; import app.module.front.usecase.daily.forestry.ports.application.domain.RemoveDailyForestryCmd; +import app.module.front.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -25,6 +26,7 @@ import java.util.List; public class DailyForestryService implements DailyForestryPortIn { private final DailyForestryPortOut portOut; private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordService dailyRecordService; @Override public List list(DailyForestryUIReqVO reqVO) { @@ -105,6 +107,8 @@ public class DailyForestryService implements DailyForestryPortIn { formVO.getEstimatedValue())); portOut.create(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } @Override @@ -125,5 +129,7 @@ public class DailyForestryService implements DailyForestryPortIn { formVO.getDailyRecordSeq())); portOut.remove(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } } 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 10675bf7..21e551ac 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 @@ -13,6 +13,7 @@ import app.module.front.usecase.daily.income.ports.DailyIncomePortOut; 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; +import app.module.front.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -23,6 +24,7 @@ import java.util.List; public class DailyIncomeService implements DailyIncomePortIn { private final DailyIncomePortOut portOut; private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordService dailyRecordService; @Override public List list(DailyIncomeUIReqVO reqVO) { @@ -111,6 +113,8 @@ public class DailyIncomeService implements DailyIncomePortIn { formVO.getEstimatedValue())); portOut.create(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } @Override @@ -131,5 +135,7 @@ public class DailyIncomeService implements DailyIncomePortIn { formVO.getDailyRecordSeq())); portOut.remove(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java index 2a07b42d..7566553e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java @@ -16,6 +16,7 @@ import app.module.front.usecase.daily.power.ports.DailyPowerPortOut; import app.module.front.usecase.daily.power.ports.application.domain.CreateDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.GetDailyPowerCmd; import app.module.front.usecase.daily.power.ports.application.domain.RemoveDailyPowerCmd; +import app.module.front.usecase.daily.record.ports.application.DailyRecordService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -25,6 +26,7 @@ import java.util.List; @RequiredArgsConstructor public class DailyPowerService implements DailyPowerPortIn { private final DailyPowerPortOut portOut; + private final DailyRecordService dailyRecordService; @Override public List list(DailyPowerUIReqVO reqVO) { @@ -71,6 +73,8 @@ public class DailyPowerService implements DailyPowerPortIn { formVO.getLeasedHours())); portOut.create(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } @Override @@ -91,5 +95,7 @@ public class DailyPowerService implements DailyPowerPortIn { formVO.getDailyRecordSeq())); portOut.remove(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java index 8d4f0d18..83d24131 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -3,7 +3,7 @@ package app.module.front.usecase.daily.record.adapters.persistence; import app.module.front.config.application.util.AuditUtil; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; -import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; +import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; import app.module.front.usecase.daily.record.ports.DailyRecordPortOut; import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; @@ -15,7 +15,6 @@ import org.springframework.stereotype.Repository; import java.text.SimpleDateFormat; import java.time.LocalDate; -import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; @@ -64,7 +63,7 @@ public class DailyRecordDao implements DailyRecordPortOut { log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, findCmd.getSearchMonth(), findCmd.getGroupNo()); } - this.updateByAllStatus(findCmd); + this.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); } @Override @@ -79,24 +78,128 @@ public class DailyRecordDao implements DailyRecordPortOut { ) ); - dailyRecordMapper.updateDailyRecordStatus(command); + if ("ALL".equals(targetType)) { + String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, command.getHouseholdSeq()); + if (allStatus != null) { + command.setAllStatus(allStatus); - this.updateByAllStatus(new GetDailyRecordCmd(recordMonth, dayGroupNo, command.getHouseholdSeq())); + dailyRecordMapper.updateDailyRecordStatus(command); + + } else { + log.debug("[updateByAllStatus] do nothing. findCmd: {}", command); + } + + } else { + dailyRecordMapper.updateDailyRecordStatus(command); + } } /** - * TODO : target 업데이트 후 데이터 등록이 완료된 건은 allStatus 값 변경해주기 - * @param findCmd + * 일계부 전체 입력상태 변경 + * + * @param searchMonth + * @param dayGroupNo + * @param householdSeq */ - private void updateByAllStatus(GetDailyRecordCmd findCmd) { + private void updateByAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) { + String allStatus = this.getUpdateAllStatus(searchMonth, dayGroupNo, householdSeq); + if (allStatus != null) { + UpdateDailyRecordStatusCmd command = AuditUtil.update( + new UpdateDailyRecordStatusCmd( + searchMonth, + dayGroupNo, + allStatus, + null, + null + ) + ); + + dailyRecordMapper.updateDailyRecordStatus(command); + + } else { + log.debug("[updateByAllStatus] do nothing. findCmd: {}"); + } + } + + /** + * TODO 변경할 전체 입력상태 조회 + * + * @param searchMonth + * @param dayGroupNo + * @param householdSeq + * @return 변경할 전체 입력상태 + */ + private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) { + GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq); + + DailyRecordStatusDto statusDetail = null; List statusList = dailyRecordMapper.getDailyRecordStatus(findCmd); if (statusList != null && !statusList.isEmpty()) { - DailyRecordStatusDto statusDetail = statusList.get(0); + statusDetail = statusList.get(0); + } - if (DailyTargetStatus.TARGET.equals(statusDetail.getIncomeStatus()) && statusDetail.getIncomeCount() != 0) { + String allStatus = null; + if (statusDetail != null) { + if (DailyStatus.TODAY_NONE.equals(statusDetail.getAllStatus())) { + // 전체상태=금일없음, 항목=입력대상이 있는지 여부 + if (this.checkTarget(statusDetail.getIncomeStatus()) || this.checkTarget(statusDetail.getExpenseStatus()) + || this.checkTarget(statusDetail.getWorkStatus()) || this.checkTarget(statusDetail.getPowerStatus()) + || this.checkTarget(statusDetail.getForestryStatus()) || this.checkTarget(statusDetail.getFarmingStatus())) { + allStatus = DailyStatus.WAITING.name(); + } + } else if (DailyStatus.WAITING.equals(statusDetail.getAllStatus())) { + // 전체상태=입력중, 항목 COUNT!=0 이 있는지 여부 + + int noneCheck = 0; + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0); + + if (noneCheck == 0) { + allStatus = DailyStatus.DONE.name(); + } + } else if (DailyStatus.DONE.equals(statusDetail.getAllStatus())) { + // 전체상태=완료, 항목 COUNT=0 체크 + int noneCheck = 0; + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getIncomeStatus(), statusDetail.getIncomeCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getExpenseStatus(), statusDetail.getExpenseCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getWorkStatus(), statusDetail.getWorkCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getPowerStatus(), statusDetail.getPowerCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getForestryStatus(), statusDetail.getForestryCount()) ? 1 : 0); + noneCheck = noneCheck + (this.checkTargetDataNone(statusDetail.getFarmingStatus(), statusDetail.getFarmingCount()) ? 1 : 0); + + if (noneCheck != 0) { + allStatus = DailyStatus.WAITING.name(); + } } } + return allStatus; + } + + /** + * 입력 대상 상태 조회 + * + * @param status 조회 상태 + * @return true=입력 대상, false=금일 데이터 없음 또는 대상 아님 + */ + private boolean checkTarget(DailyTargetStatus status) { + // NONE 은 대상이 아니기 때문에 체크에서 제외 + return DailyTargetStatus.TARGET.equals(status); + } + + /** + * 등록 대상인데 데이터가 없는 경우 조회 + * + * @param status 조회 상태 + * @param count 조회 건수 + * @return true=입력대상인데 데이터가 없는 경우, false=입력대상 아니거나, 데이터가 있는 경우 + */ + private boolean checkTargetDataNone(DailyTargetStatus status, Integer count) { + return DailyTargetStatus.TARGET.equals(status) && count == 0; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/DailyRecordPortIn.java b/front/src/main/java/app/module/front/usecase/daily/record/ports/DailyRecordPortIn.java index 54ba3624..0f589f8e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/DailyRecordPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/ports/DailyRecordPortIn.java @@ -21,4 +21,6 @@ public interface DailyRecordPortIn { void create(CreateDailyRecordReqVO formVO); void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus); + + void updateByAllStatus(String recordMonth, Integer dayGroupNo); } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java index 655d9216..966b49f9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java @@ -95,5 +95,11 @@ public class DailyRecordService implements DailyRecordPortIn { @Override public void updateByStatus(String recordMonth, Integer dayGroupNo, String targetType, String targetStatus) { portOut.updateByStatus(recordMonth, dayGroupNo, targetType, targetStatus); + portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null); + } + + @Override + public void updateByAllStatus(String recordMonth, Integer dayGroupNo) { + portOut.updateByStatus(recordMonth, dayGroupNo, "ALL", null); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java index 22f74dd1..a9584587 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/DailyWorkDao.java @@ -1,5 +1,7 @@ package app.module.front.usecase.daily.work.adapters.persistence; +import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordDao; +import app.module.front.usecase.daily.record.ports.application.DailyRecordService; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.ports.DailyWorkPortOut; import app.module.front.usecase.daily.work.ports.application.domain.CreateDailyWorkCmd; diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java index c5eecd42..22589f7f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java @@ -4,6 +4,7 @@ import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import app.module.front.config.application.util.AuditUtil; import app.module.front.config.constants.CommonConstants; +import app.module.front.usecase.daily.record.ports.application.DailyRecordService; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; @@ -23,6 +24,7 @@ import java.util.List; public class DailyWorkService implements DailyWorkPortIn { private final DailyWorkPortOut portOut; private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordService dailyRecordService; @Override public List list(DailyWorkUIReqVO reqVO) { @@ -120,6 +122,8 @@ public class DailyWorkService implements DailyWorkPortIn { formVO.getVolunteerFHours())); portOut.create(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } @Override @@ -140,5 +144,7 @@ public class DailyWorkService implements DailyWorkPortIn { formVO.getDailyRecordSeq())); portOut.remove(findCmd, command); + + dailyRecordService.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo()); } } diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml index 6b15c57e..8334d421 100644 --- a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -19,24 +19,27 @@