|
@@ -343,7 +343,6 @@
|
|
LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
|
|
LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
WHERE d.cost > 0
|
|
WHERE d.cost > 0
|
|
- AND u.account_status = 0
|
|
|
|
AND hour <= #{hour}
|
|
AND hour <= #{hour}
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
@@ -357,7 +356,6 @@
|
|
GROUP BY d.user_id
|
|
GROUP BY d.user_id
|
|
) t3 ON t.user_id = t3.user_id
|
|
) t3 ON t.user_id = t3.user_id
|
|
WHERE t.cost > 0
|
|
WHERE t.cost > 0
|
|
- AND t1.account_status = 0
|
|
|
|
AND hour <= #{hour}
|
|
AND hour <= #{hour}
|
|
AND t.stat_datetime >= #{startDate}
|
|
AND t.stat_datetime >= #{startDate}
|
|
AND t.stat_datetime <= #{endDate}
|
|
AND t.stat_datetime <= #{endDate}
|
|
@@ -390,7 +388,6 @@
|
|
LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
|
|
LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
WHERE d.cost > 0
|
|
WHERE d.cost > 0
|
|
- AND u.account_status = 0
|
|
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
<if test='list!=null'>
|
|
<if test='list!=null'>
|
|
@@ -419,7 +416,6 @@
|
|
GROUP BY user_id
|
|
GROUP BY user_id
|
|
) t4 ON t.user_id = t4.user_id
|
|
) t4 ON t.user_id = t4.user_id
|
|
WHERE t.cost > 0
|
|
WHERE t.cost > 0
|
|
- AND t1.account_status = 0
|
|
|
|
AND t.stat_datetime >= #{startDate}
|
|
AND t.stat_datetime >= #{startDate}
|
|
AND t.stat_datetime <= #{endDate}
|
|
AND t.stat_datetime <= #{endDate}
|
|
<if test='list!=null'>
|
|
<if test='list!=null'>
|
|
@@ -457,7 +453,6 @@
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
WHERE
|
|
WHERE
|
|
d.cost > 0
|
|
d.cost > 0
|
|
- AND u.account_status = 0
|
|
|
|
AND d.hour <= #{hour}
|
|
AND d.hour <= #{hour}
|
|
AND d.stat_datetime >= #{startDate}
|
|
AND d.stat_datetime >= #{startDate}
|
|
AND d.stat_datetime <=#{endDate}
|
|
AND d.stat_datetime <=#{endDate}
|
|
@@ -480,7 +475,6 @@
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
WHERE
|
|
WHERE
|
|
d.cost > 0
|
|
d.cost > 0
|
|
- AND u.account_status = 0
|
|
|
|
AND d.hour <= #{hour}
|
|
AND d.hour <= #{hour}
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
@@ -518,7 +512,6 @@
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
WHERE
|
|
WHERE
|
|
d.cost > 0
|
|
d.cost > 0
|
|
- AND u.account_status = 0
|
|
|
|
AND d.stat_datetime >= #{startDate}
|
|
AND d.stat_datetime >= #{startDate}
|
|
AND d.stat_datetime <=#{endDate}
|
|
AND d.stat_datetime <=#{endDate}
|
|
<if test='list!=null'>
|
|
<if test='list!=null'>
|
|
@@ -540,7 +533,6 @@
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
|
|
WHERE
|
|
WHERE
|
|
d.cost > 0
|
|
d.cost > 0
|
|
- AND u.account_status = 0
|
|
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime >= #{lastTimeStart}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
AND d.stat_datetime <= #{lastTimeEnd}
|
|
<if test='list!=null'>
|
|
<if test='list!=null'>
|