Merge branch 'susu' into dev
This commit is contained in:
@@ -13,8 +13,8 @@ public class ResearchersHouseholdVisitDto {
|
|||||||
private String householdNum;
|
private String householdNum;
|
||||||
private String ownerName;
|
private String ownerName;
|
||||||
private String visitDate;
|
private String visitDate;
|
||||||
|
private String managementType;
|
||||||
|
private String content;
|
||||||
private String isGiftSentFlag;
|
private String isGiftSentFlag;
|
||||||
private String memo;
|
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,20 +111,22 @@
|
|||||||
<select id="visitHouseholdList">
|
<select id="visitHouseholdList">
|
||||||
select
|
select
|
||||||
rhv.id,
|
rhv.id,
|
||||||
rhv.admin_seq,
|
rhh.admin_seq,
|
||||||
rhv.household_seq,
|
rhv.household_seq,
|
||||||
h.household_num,
|
h.household_num,
|
||||||
h.owner_name,
|
h.owner_name,
|
||||||
rhv.visit_date,
|
rhv.visit_date,
|
||||||
rhv.memo,
|
rhv.content,
|
||||||
|
rhv.management_type,
|
||||||
case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag,
|
case rhv.is_gift_sent when false then '전달완료' when true then '-' end is_gift_sent_flag,
|
||||||
rhv.created_at
|
rhv.created_at
|
||||||
from researcher_household_visit rhv
|
from household_visit rhv
|
||||||
join household h on rhv.household_seq = h.seq
|
join researcher_has_household rhh on rhh.household_seq = rhv.household_seq
|
||||||
join admin a on a.seq = rhv.admin_seq
|
join household h on rhh.household_seq = h.seq
|
||||||
|
join admin a on a.seq = rhh.admin_seq
|
||||||
where rhv.is_deleted = false
|
where rhv.is_deleted = false
|
||||||
<if test="seq > 0">
|
<if test="seq > 0">
|
||||||
and rhv.admin_seq = #{seq}
|
and rhh.admin_seq = #{seq}
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth != null and searchMonth != ''">
|
<if test="searchMonth != null and searchMonth != ''">
|
||||||
and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth}
|
and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth}
|
||||||
@@ -134,10 +136,12 @@
|
|||||||
|
|
||||||
<select id="visitHouseholdListCountAll">
|
<select id="visitHouseholdListCountAll">
|
||||||
select count(*)
|
select count(*)
|
||||||
from researcher_household_visit rhv
|
from household_visit rhv
|
||||||
|
join researcher_has_household rhh on rhh.household_seq = rhv.household_seq
|
||||||
|
join admin a on a.seq = rhh.admin_seq
|
||||||
where rhv.is_deleted = false
|
where rhv.is_deleted = false
|
||||||
<if test="seq > 0">
|
<if test="seq > 0">
|
||||||
and rhv.admin_seq = #{seq}
|
and rhh.admin_seq = #{seq}
|
||||||
</if>
|
</if>
|
||||||
<if test="searchMonth != null and searchMonth != ''">
|
<if test="searchMonth != null and searchMonth != ''">
|
||||||
and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth}
|
and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth}
|
||||||
|
|||||||
@@ -269,8 +269,8 @@
|
|||||||
<td class="underline"><a href="">${ct.householdNum}</a></td>
|
<td class="underline"><a href="">${ct.householdNum}</a></td>
|
||||||
<td>${ct.ownerName}</td>
|
<td>${ct.ownerName}</td>
|
||||||
<td>${ct.visitDate}</td>
|
<td>${ct.visitDate}</td>
|
||||||
<td>${ct.memo}</td>
|
<td>${ct.managementType}</td>
|
||||||
<td>${ct.memo}</td>
|
<td>${ct.content}</td>
|
||||||
<td>${ct.createdAt}</td>
|
<td>${ct.createdAt}</td>
|
||||||
<td>${ct.isGiftSentFlag}</td>
|
<td>${ct.isGiftSentFlag}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user