diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java index ee8ccb3a..e7e95edf 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNotice/ports/application/GetNoticeService.java @@ -5,6 +5,7 @@ import app.module.admin.usecase.communication.notice.getNotice.ports.GetNoticePo import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNotice; import app.module.admin.usecase.communication.notice.getNotice.ports.application.domain.GetNoticeCmd; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import java.util.Optional; @@ -13,10 +14,10 @@ import java.util.Optional; @RequiredArgsConstructor class GetNoticeService implements GetNoticePortIn { - private final GetNoticePortOut portOut; + private final GetNoticePortOut getNoticePortOut; @Override public Optional operate(GetNoticeCmd command) { - return portOut.operate(command); + return getNoticePortOut.operate(command); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java index ca91ed2b..1611d205 100644 --- a/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/updateNotice/ports/application/UpdateNoticeService.java @@ -10,10 +10,10 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor class UpdateNoticeService implements UpdateNoticePortIn { - private final UpdateNoticePortOut portOut; + private final UpdateNoticePortOut updateNoticePortOut; @Override public void operate(UpdateNoticeCmd command) { - portOut.operate(command); + updateNoticePortOut.operate(command); } } \ No newline at end of file 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 2a43dbe2..f2939121 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 @@ -4,8 +4,10 @@ import app.module.core.config.application.enums.DailyStatus; import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.DailyUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordAlertDto; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; +import app.module.core.usecase.daily.record.adapters.persistence.model.RecordAlertDto; import app.module.core.usecase.daily.record.ports.DailyRecordPortOut; import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; @@ -99,6 +101,14 @@ public class DailyRecordDao implements DailyRecordPortOut { } } + @Override + public RecordAlertDto selectNoRegister(String recordMonth, Long householdSeq) { + List dailyRecordAlertDtoList = dailyRecordMapper.selectDailyNoRegister(recordMonth,householdSeq); + List monthRecoredAlertDtoList = dailyRecordMapper.selectMonthNoRegister(recordMonth,householdSeq); + + return new RecordAlertDto(dailyRecordAlertDtoList,monthRecoredAlertDtoList); + } + /** * 일계부 전체 입력상태 변경 * diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordMapper.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordMapper.java index 4e072858..c51131c4 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordMapper.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordMapper.java @@ -1,11 +1,13 @@ package app.module.core.usecase.daily.record.adapters.persistence; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordAlertDto; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; import app.module.core.usecase.daily.record.ports.application.domain.UpdateDailyRecordStatusCmd; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -55,4 +57,10 @@ public interface DailyRecordMapper { * @param command 수정 데이터 */ void updateDailyRecordStatus(UpdateDailyRecordStatusCmd command); + + + List selectDailyNoRegister(@Param("searchMonth") String searchMonth, @Param("householdSeq")Long householdSeq); + List selectMonthNoRegister(@Param("searchMonth")String searchMonth, @Param("householdSeq")Long householdSeq); + + } diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordAlertDto.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordAlertDto.java new file mode 100644 index 00000000..59e65047 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/DailyRecordAlertDto.java @@ -0,0 +1,10 @@ +package app.module.core.usecase.daily.record.adapters.persistence.model; + +import lombok.Data; + +@Data +public class DailyRecordAlertDto { + private String recordMonth; + private Integer startDay; + private Integer endDay; +} diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/RecordAlertDto.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/RecordAlertDto.java new file mode 100644 index 00000000..8ef852d1 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/model/RecordAlertDto.java @@ -0,0 +1,13 @@ +package app.module.core.usecase.daily.record.adapters.persistence.model; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +@Data +@AllArgsConstructor +public class RecordAlertDto { + private List dailyRecordAlertDtoList; + private List monthRecordAlertDtoList; +} diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java index fa7010fa..bafc9aec 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java @@ -1,6 +1,7 @@ package app.module.core.usecase.daily.record.ports; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.adapters.persistence.model.RecordAlertDto; import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; @@ -32,4 +33,6 @@ public interface DailyRecordPortIn { void updateByStatus(String recordMonth, Integer dayGroupNo, Long householdSeq, String targetType, String targetStatus); void updateByAllStatus(String recordMonth, Integer dayGroupNo, Long householdSeq); + + RecordAlertDto selectNoRegister(String recordMonth, Long householdSeq); } diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortOut.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortOut.java index 72b9e5b6..2d13d49d 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortOut.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortOut.java @@ -2,6 +2,7 @@ package app.module.core.usecase.daily.record.ports; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.adapters.persistence.model.RecordAlertDto; import app.module.core.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; import app.module.core.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; @@ -22,4 +23,6 @@ public interface DailyRecordPortOut { void create(GetDailyRecordCmd findCmd, CreateDailyRecordCmd command); void updateByStatus(String recordMonth, Integer dayGroupNo, Long householdSeq, String targetType, String targetStatus); + + RecordAlertDto selectNoRegister(String recordMonth, Long householdSeq); } diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java index 6a4c6297..73683270 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java @@ -4,6 +4,7 @@ import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.adapters.persistence.model.RecordAlertDto; import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; @@ -130,4 +131,9 @@ public class DailyRecordService implements DailyRecordPortIn { public void updateByAllStatus(String recordMonth, Integer dayGroupNo, Long householdSeq) { portOut.updateByStatus(recordMonth, dayGroupNo, householdSeq, "ALL", null); } + + @Override + public RecordAlertDto selectNoRegister(String recordMonth, Long householdSeq) { + return portOut.selectNoRegister(recordMonth, householdSeq); + } } diff --git a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml index 680a276d..69de936e 100644 --- a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -122,6 +122,50 @@ and day_group_no = #{dayGroupNo} + + + + + inner join daily_record dr on dr.id = ds.daily_record_seq diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java index 13fa65da..4f6d9b8b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.record.adapters.web; +import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; @@ -81,4 +82,14 @@ public class DailyRecordController { return ResponseEntity.status(HttpStatus.OK).body(reqVO); } + + /** + * 일계부 해당 달 말일일경우 DONE이 아닌 일계부 Alert 창 처리 + * + * @param searchMonth 검색 월(yyyyMM) + */ + @GetMapping(path = "/alert/{searchMonth}") + ResponseEntity selectNoRegister(@PathVariable("searchMonth") String searchMonth) { + return ResponseEntity.status(HttpStatus.OK).body(dailyRecordPortIn.selectNoRegister(searchMonth, AuthUtil.getUserSeq())); + } } diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 4f2e78f9..cea8d4ed 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -769,6 +769,7 @@ root: '', list: '/record/calendar/{searchMonth}/{groupNo}', create: '/record/daily/{searchMonth}/{groupNo}', + alert: '/api/record/daily/alert/{searchMonth}', }, submitted: false, }; @@ -807,6 +808,61 @@ } $('#selectedDay').html(html); + + + // 오늘 날짜가 해당 달의 마지막 날인지 확인 + const today = new Date(); + const lastDayOfMonth = new Date(viewDate.getFullYear(), viewDate.getMonth() + 1, 0); // 해당 달의 마지막 날 + if (today.getFullYear() === lastDayOfMonth.getFullYear() && + today.getMonth() === lastDayOfMonth.getMonth() && + today.getDate() === lastDayOfMonth.getDate()) { + ajaxUtil._ajaxSyncMethod( + ENV.httpUrl.alert.replace('{searchMonth}', searchMonth.replace('-', '')), + {}, + function (response) { + let dailyNo = [] + let msgTxt = ''; + let month = viewDate.getMonth() + 1; + msgTxt += "등록하지 않은 일계부 항목이 있습니다.\n 정확한 조사를 위해 꾸준히 입력해 주세요.\n"; + if(response.dailyRecordAlertDtoList.length > 0){ + response.dailyRecordAlertDtoList.forEach((dto) =>{ + let dateTxt; + if(dto.startDay === dto.endDay){ + dateTxt = month+"월 "+dto.startDay+"일"; + }else{ + dateTxt = month+"월 "+dto.startDay+"~"+dto.endDay+"일"; + } + dailyNo.push(dateTxt); + }); + msgTxt += "1. 일계부 미등록 \n"+dailyNo.join(',')+"\n"; + } + + if(response.monthRecordAlertDtoList.length > 0) { + response.monthRecordAlertDtoList.forEach((dto,idx) => { + if(response.dailyRecordAlertDtoList.length > 0){ + idx ++; + } + msgTxt += idx+". "+dto+"\n"; + }); + } + + if(response.dailyRecordAlertDtoList.length > 0 || dto.monthRecordAlertDtoList.length > 0) { + etUI.dialog.alert({ + title: '', + message: msgTxt, + type:'alert', + callback: function () { + }, + }); + } + }, + function (rstData, status) { + + }, + 'get' + ,'json' + ); + } }, recordCreate(searchMonth, groupNo) { location.href = ENV.httpUrl.create.replace('{searchMonth}', searchMonth.replace('-', '')).replace('{groupNo}', groupNo);