|
|
@ -852,8 +852,7 @@ SELECT
|
|
|
|
( @i := @i + 1 ) AS Number,
|
|
|
|
( @i := @i + 1 ) AS Number,
|
|
|
|
F_FullName AS FFullName,
|
|
|
|
F_FullName AS FFullName,
|
|
|
|
COUNT( b.id ) AS bangdan,
|
|
|
|
COUNT( b.id ) AS bangdan,
|
|
|
|
SUM(
|
|
|
|
Round( SUM(IF ( b.unit = '1', b.settlement / 1000, b.settlement )), 3 ) AS settlement,
|
|
|
|
Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 3 )) AS settlement,
|
|
|
|
|
|
|
|
SUM( b.amount ) AS amout,
|
|
|
|
SUM( b.amount ) AS amout,
|
|
|
|
SUM( b.amount ) - c.pay_price AS notPaypalAmounts,
|
|
|
|
SUM( b.amount ) - c.pay_price AS notPaypalAmounts,
|
|
|
|
c.pay_price AS paypalamounts
|
|
|
|
c.pay_price AS paypalamounts
|
|
|
@ -917,8 +916,7 @@ FROM
|
|
|
|
LEFT JOIN (
|
|
|
|
LEFT JOIN (
|
|
|
|
SELECT
|
|
|
|
SELECT
|
|
|
|
COUNT( b.id ) AS bangdan,
|
|
|
|
COUNT( b.id ) AS bangdan,
|
|
|
|
SUM(
|
|
|
|
Round( SUM(IF ( b.unit = '1', b.settlement / 1000, b.settlement )), 3 ) AS settlement,
|
|
|
|
Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 3 )) AS settlement,
|
|
|
|
|
|
|
|
a.department_id
|
|
|
|
a.department_id
|
|
|
|
FROM
|
|
|
|
FROM
|
|
|
|
jg_salesorder a
|
|
|
|
jg_salesorder a
|
|
|
|