Merge branch 'dev' into deploy-dev-front

This commit is contained in:
주수현
2025-07-15 08:38:01 +09:00
31 changed files with 244 additions and 215 deletions

View File

@@ -35,10 +35,15 @@ public class DailyRecordDao implements DailyRecordPortOut {
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
// 종료일의 달이 변경되면 시작일=종료일 처리
detail.setEndDate(detail.getStartDate());
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
}
}
detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate()));
if (detail.isLastDay()) {
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
}
detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate()));
detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate()));
detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate()));

View File

@@ -91,6 +91,8 @@ DELETE FROM uri WHERE id = 'uri.admin.communication.sms';
-- 문자발송 메뉴 숨기기
-- update uri set show_on_navi = false, updated_at = now(), updated_by = 'INIT_DATA' where id ='uri.admin.communication.sms' ;
-- 은행자동이체 내역 칼럼 타입 크기 변경
ALTER TABLE public.bank_auto_transfer ALTER COLUMN source_purpose TYPE varchar(100) USING source_purpose::varchar(100);
-- ====================================================================================================================
-- 문자 발송