|
@@ -359,7 +359,7 @@
|
|
|
<if test="dateEnd != null and dateEnd !=''">
|
|
|
and date < #{dateEnd}
|
|
|
</if>
|
|
|
- group by user_id)aa on aa.user_id = c.user_id and aa.dateStr = c.date and c.go_status = 1 and c.in_type = 1
|
|
|
+ group by user_id, DATE_FORMAT(date,'%Y-%m-%d'))aa on aa.user_id = c.user_id and aa.dateStr = c.date and c.go_status = 1 and c.in_type = 1
|
|
|
INNER JOIN sys_user_role t ON c.user_id = t.user_id
|
|
|
AND role_id = 1
|
|
|
INNER JOIN sys_uptown_home g ON g.house_id = t.property_id
|
|
@@ -405,7 +405,7 @@
|
|
|
<if test="dateEnd != null and dateEnd !=''">
|
|
|
and date < #{dateEnd}
|
|
|
</if>
|
|
|
- group by user_id)aa on aa.user_id = c.user_id and aa.dateStr = c.date and c.go_status = 1 and c.in_type = 1
|
|
|
+ group by user_id, DATE_FORMAT(date,'%Y-%m-%d'))aa on aa.user_id = c.user_id and aa.dateStr = c.date and c.go_status = 1 and c.in_type = 1
|
|
|
INNER JOIN sys_user_role t ON c.user_id = t.user_id
|
|
|
AND role_id = 1
|
|
|
INNER JOIN sys_uptown_home g ON g.house_id = t.property_id
|