Merge branch 'dev' into 'deploy-dev-front'

Dev

See merge request korea-research/korea-research!101
This commit is contained in:
김현주 개발
2025-07-14 03:04:19 +00:00
95 changed files with 984 additions and 1896 deletions

View File

@@ -13,7 +13,7 @@
where only_day.day <= DATE_PART('day', (date_trunc('MONTH', TO_DATE(#{recordMonth}, 'YYYYMM')) + INTERVAL '1 MONTH - 1 day'))
)
select count(dg.day) as day_count
, (count(dg.day) filter (where dr.all_status = 'DONE')) as done_count
, (count(dg.day) filter (where dr.all_status = 'DONE' or dr.all_status = 'TODAY_NONE')) as done_count
from day_gorup dg
left join
daily_record dr on dr.day_group_no = dg.group_no and dr.record_month = to_char(TO_DATE(#{recordMonth}, 'YYYYMM'), 'YYYYMM') and dr.household_seq = #{householdSeq}

View File

@@ -21,7 +21,8 @@
COUNT(*) OVER () AS total
FROM notice a
WHERE a.is_deleted = false
AND now() between a.start_date and a.end_date
<if test="cmd.searchField != null and cmd.searchField != ''">
<choose>
<when test="cmd.searchField eq 'titleContent'">

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>

View File

@@ -7,7 +7,7 @@
<hgroup class="tit-group">
<h3>
[[${#temporals.format(#temporals.createDate(searchMonth+'01', 'yyyyMMdd'), 'yyyy년 M월')}]]의 [[${step.desc2}]] 내역이 <br>
<strong>[[${#lists.size(list)}]]건 등록</strong> 되었습니다.
<strong>[[${childrenCount}]]건 등록</strong> 되었습니다.
</h3>
</hgroup>