Merge branch 'dev' into susu
This commit is contained in:
@@ -69,7 +69,7 @@
|
|||||||
and h.usage_type = #{usageType}
|
and h.usage_type = #{usageType}
|
||||||
</if>
|
</if>
|
||||||
LEFT JOIN household_visit hv
|
LEFT JOIN household_visit hv
|
||||||
ON hv.household_seq = h.seq AND hv.is_deleted = false
|
ON hv.household_seq = h.seq AND hv.is_deleted = false AND to_char(hv.visit_date,'YYYYMM') = #{recordMonth}
|
||||||
LEFT JOIN v_monthly_completion_rate v
|
LEFT JOIN v_monthly_completion_rate v
|
||||||
ON v.household_seq = h.seq AND v.record_month = #{recordMonth}
|
ON v.household_seq = h.seq AND v.record_month = #{recordMonth}
|
||||||
WHERE u.parent_id = 'code.region.main' and u.in_use = true
|
WHERE u.parent_id = 'code.region.main' and u.in_use = true
|
||||||
|
|||||||
@@ -303,7 +303,7 @@
|
|||||||
updated_at,
|
updated_at,
|
||||||
updated_by
|
updated_by
|
||||||
)values(
|
)values(
|
||||||
nextval('household_has_role_seq'),
|
nextval('researcher_has_household_seq'),
|
||||||
#{researcherSeq},
|
#{researcherSeq},
|
||||||
#{householdSeq},
|
#{householdSeq},
|
||||||
NOW(),
|
NOW(),
|
||||||
|
|||||||
Reference in New Issue
Block a user