|
@@ -441,7 +441,7 @@
|
|
IFNULL(ROUND( (h.charge / h.event_pay ), 2 ),0) AS tData,
|
|
IFNULL(ROUND( (h.charge / h.event_pay ), 2 ),0) AS tData,
|
|
</if>
|
|
</if>
|
|
<if test='type == "eventPayRate"'>
|
|
<if test='type == "eventPayRate"'>
|
|
- IF(( h.event_pay / h.activation + h.form_count ) > 0.0001,ROUND( ( h.event_pay / h.activation + h.form_count ) * 100, 2 ),0) AS tData,
|
|
|
|
|
|
+ IF(( h.event_pay / (h.activation + h.form_count) ) > 0.0001,ROUND( ( h.event_pay / (h.activation + h.form_count) ) * 100, 2 ),0) AS tData,
|
|
</if>
|
|
</if>
|
|
<if test='type == "eventNewUserPay"'>
|
|
<if test='type == "eventNewUserPay"'>
|
|
IFNULL( h.event_new_user_pay ,0) AS tData,
|
|
IFNULL( h.event_new_user_pay ,0) AS tData,
|
|
@@ -528,7 +528,7 @@
|
|
IFNULL(ROUND( (h.charge / h.event_pay ), 2 ),0) AS yData,
|
|
IFNULL(ROUND( (h.charge / h.event_pay ), 2 ),0) AS yData,
|
|
</if>
|
|
</if>
|
|
<if test='type == "eventPayRate"'>
|
|
<if test='type == "eventPayRate"'>
|
|
- IF(( h.event_pay / h.activation + h.form_count ) > 0.0001,ROUND( ( h.event_pay / h.activation + h.form_count ) * 100, 2 ),0) AS yData,
|
|
|
|
|
|
+ IF(( h.event_pay / (h.activation + h.form_count) ) > 0.0001,ROUND( ( h.event_pay / (h.activation + h.form_count) ) * 100, 2 ),0) AS yData,
|
|
</if>
|
|
</if>
|
|
<if test='type == "eventNewUserPay"'>
|
|
<if test='type == "eventNewUserPay"'>
|
|
IFNULL( h.event_new_user_pay ,0) AS yData,
|
|
IFNULL( h.event_new_user_pay ,0) AS yData,
|