일계부 말일 alert 창
This commit is contained in:
@@ -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<GetNotice> operate(GetNoticeCmd command) {
|
||||
return portOut.operate(command);
|
||||
return getNoticePortOut.operate(command);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
@@ -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<DailyRecordAlertDto> dailyRecordAlertDtoList = dailyRecordMapper.selectDailyNoRegister(recordMonth,householdSeq);
|
||||
List<String> monthRecoredAlertDtoList = dailyRecordMapper.selectMonthNoRegister(recordMonth,householdSeq);
|
||||
|
||||
return new RecordAlertDto(dailyRecordAlertDtoList,monthRecoredAlertDtoList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 일계부 전체 입력상태 변경
|
||||
*
|
||||
|
||||
@@ -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<DailyRecordAlertDto> selectDailyNoRegister(@Param("searchMonth") String searchMonth, @Param("householdSeq")Long householdSeq);
|
||||
List<String> selectMonthNoRegister(@Param("searchMonth")String searchMonth, @Param("householdSeq")Long householdSeq);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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<DailyRecordAlertDto> dailyRecordAlertDtoList;
|
||||
private List<String> monthRecordAlertDtoList;
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -122,6 +122,50 @@
|
||||
and day_group_no = #{dayGroupNo}
|
||||
</update>
|
||||
|
||||
<select id="selectDailyNoRegister">
|
||||
WITH target AS (
|
||||
SELECT total_day_groups,record_month
|
||||
FROM v_household_monthly_target_days
|
||||
WHERE household_seq = 1 AND record_month = #{searchMonth}
|
||||
)
|
||||
SELECT
|
||||
g.day_group_no,
|
||||
ddg.start_day,
|
||||
CASE
|
||||
WHEN g.day_group_no = t.total_day_groups
|
||||
THEN EXTRACT(day FROM date_trunc('month'::text, to_date(t.record_month::text, 'YYYYMM'::text)::timestamp with time zone) + '1 mon -1 days'::interval)::integer
|
||||
ELSE ddg.end_day
|
||||
END AS end_day,
|
||||
dr.all_status
|
||||
FROM target t
|
||||
CROSS JOIN generate_series(1, t.total_day_groups) AS g(day_group_no)
|
||||
LEFT JOIN daily_record dr
|
||||
ON dr.household_seq = #{householdSeq}
|
||||
AND dr.record_month = #{searchMonth}
|
||||
AND dr.day_group_no = g.day_group_no
|
||||
LEFT JOIN daily_day_group ddg
|
||||
ON ddg.group_no = g.day_group_no
|
||||
WHERE dr.all_status != 'DONE' OR dr.id is null
|
||||
ORDER BY g.day_group_no
|
||||
</select>
|
||||
|
||||
<select id="selectMonthNoRegister">
|
||||
SELECT
|
||||
v.category
|
||||
FROM monthly_input_status mis
|
||||
CROSS JOIN LATERAL (
|
||||
VALUES
|
||||
('임산물 현황 미등록', mis.forest_product_status,1),
|
||||
('은행 자동이체 내역(수입) 미등록', mis.bank_auto_transfer_input_status,2),
|
||||
('은행 자동이체 내역(지출) 미등록', mis.bank_auto_transfer_output_status,3)
|
||||
) AS v(category, status, order_by)
|
||||
WHERE mis.household_seq = #{householdSeq}
|
||||
AND mis.month = #{searchMonth}
|
||||
AND (v.status != 'REGISTERED' )
|
||||
ORDER BY v.order_by
|
||||
</select>
|
||||
|
||||
|
||||
<sql id="InnerJoinByDailyRecord">
|
||||
inner join daily_record dr
|
||||
on dr.id = ds.daily_record_seq
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user