Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
김현주
2025-07-11 11:54:15 +09:00
16 changed files with 275 additions and 16 deletions

View File

@@ -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);
}
/**
* 일계부 전체 입력상태 변경
*

View File

@@ -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);
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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);
}
}

View File

@@ -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