|
@@ -587,7 +587,10 @@
|
|
AND stat_hour <= #{hours}
|
|
AND stat_hour <= #{hours}
|
|
GROUP BY i1.account_id
|
|
GROUP BY i1.account_id
|
|
) t6 ON t2.account_id = t6.account_id
|
|
) t6 ON t2.account_id = t6.account_id
|
|
- where stat_date = #{startTime}
|
|
|
|
|
|
+ where
|
|
|
|
+ stat_date = #{startTime}
|
|
|
|
+ and
|
|
|
|
+ t3.user_id=#{userId}
|
|
GROUP BY t3.id
|
|
GROUP BY t3.id
|
|
HAVING SUM(charge)>0
|
|
HAVING SUM(charge)>0
|
|
<if test="sortCode != '' and sortCode != null ">
|
|
<if test="sortCode != '' and sortCode != null ">
|
|
@@ -606,6 +609,8 @@
|
|
LEFT JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
|
|
LEFT JOIN ctop_user_allocation t2 ON t1.account_id = t2.account_id
|
|
INNER JOIN ctop_project t3 ON t2.project_id = t3.id
|
|
INNER JOIN ctop_project t3 ON t2.project_id = t3.id
|
|
where stat_date = #{startTime}
|
|
where stat_date = #{startTime}
|
|
|
|
+ and
|
|
|
|
+ t3.user_id=#{userId}
|
|
GROUP BY t3.id
|
|
GROUP BY t3.id
|
|
HAVING SUM(charge)>0
|
|
HAVING SUM(charge)>0
|
|
)t
|
|
)t
|