|
|
|
@ -859,7 +859,7 @@ SELECT
|
|
|
|
|
FROM
|
|
|
|
|
jg_purchaseorder a
|
|
|
|
|
LEFT JOIN jg_purchaseorder_item0 b ON a.id = b.purchaseorder_id
|
|
|
|
|
AND b.delete_mark = '0'
|
|
|
|
|
|
|
|
|
|
LEFT JOIN (
|
|
|
|
|
SELECT
|
|
|
|
|
SUM( amount ) - SUM( pay_price ) AS notPaypalAmounts,
|
|
|
|
@ -878,7 +878,7 @@ FROM
|
|
|
|
|
WHERE
|
|
|
|
|
to_days( a.creator_time ) = to_days(
|
|
|
|
|
now())
|
|
|
|
|
AND a.delete_mark = '0'
|
|
|
|
|
AND a.delete_mark = '0' AND b.delete_mark = '0'
|
|
|
|
|
GROUP BY
|
|
|
|
|
a.department_id
|
|
|
|
|
</select>
|
|
|
|
@ -901,8 +901,8 @@ GROUP BY
|
|
|
|
|
</resultMap>
|
|
|
|
|
<select id="getSalesorderData" resultMap="getSalesorderDataMap">
|
|
|
|
|
|
|
|
|
|
SET @i = 0;
|
|
|
|
|
SELECT
|
|
|
|
|
SET @i = 0;
|
|
|
|
|
SELECT
|
|
|
|
|
( @i := @i + 1 ) AS 'Number',
|
|
|
|
|
F_FullName AS FFullName,
|
|
|
|
|
SUM( a.price ) AS amout,
|
|
|
|
@ -910,7 +910,7 @@ SELECT
|
|
|
|
|
settlement,
|
|
|
|
|
SUM( a.price )- SUM( amount_collected ) AS notCollectionAmounts,
|
|
|
|
|
SUM( amount_collected ) AS collectionamounts
|
|
|
|
|
FROM
|
|
|
|
|
FROM
|
|
|
|
|
jg_salesorder a
|
|
|
|
|
LEFT JOIN base_organize z ON a.department_id = z.F_Id
|
|
|
|
|
LEFT JOIN (
|
|
|
|
@ -921,19 +921,19 @@ FROM
|
|
|
|
|
FROM
|
|
|
|
|
jg_salesorder a
|
|
|
|
|
LEFT JOIN jg_salesorder_item0 b ON a.id = b.sales_order_id
|
|
|
|
|
AND b.delete_mark = '0'
|
|
|
|
|
|
|
|
|
|
WHERE
|
|
|
|
|
to_days( a.creator_time ) = to_days(
|
|
|
|
|
now())
|
|
|
|
|
AND a.delete_mark = '0'
|
|
|
|
|
AND a.delete_mark = '0' AND b.delete_mark = '0'
|
|
|
|
|
GROUP BY
|
|
|
|
|
a.department_id
|
|
|
|
|
) c ON a.department_id = c.department_id
|
|
|
|
|
WHERE
|
|
|
|
|
WHERE
|
|
|
|
|
to_days( a.creator_time ) = to_days(
|
|
|
|
|
now())
|
|
|
|
|
AND a.delete_mark = '0'
|
|
|
|
|
GROUP BY
|
|
|
|
|
GROUP BY
|
|
|
|
|
a.department_id
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|