|
|
@@ -204,7 +204,7 @@ class Nbsch extends Command
|
|
|
ROUND(a.sptgl * 100, 2) AS sptgl_val
|
|
|
FROM (
|
|
|
SELECT
|
|
|
- a.INCOME_DEPT_ID,
|
|
|
+ a.PAY_DEPT_ID,
|
|
|
DATE_FORMAT(a.DOCUMENT_DATE, '%Y-%m') AS DOCUMENT_DATE,
|
|
|
SUM(a.SETTLEMENT_SUM_AMOUNT) AS dyjsje,
|
|
|
(SUM(a.SETTLEMENT_SUM_AMOUNT) - SUM(CASE WHEN a.isNull = '1' THEN a.SETTLEMENT_SUM_AMOUNT ELSE 0 END)) AS zcspje,
|
|
|
@@ -244,9 +244,9 @@ class Nbsch extends Command
|
|
|
WHERE fwjs.APPROVE_NODE_NAME = '已完成'
|
|
|
AND DATE_FORMAT(fwjs.DOCUMENT_DATE, '%Y-%m') = '".$riqi."'
|
|
|
) a
|
|
|
- GROUP BY a.INCOME_DEPT_ID, DATE_FORMAT(a.DOCUMENT_DATE, '%Y-%m')
|
|
|
+ GROUP BY a.PAY_DEPT_ID, DATE_FORMAT(a.DOCUMENT_DATE, '%Y-%m')
|
|
|
) a
|
|
|
- LEFT JOIN SYS_DEPT ou ON ou.id = a.INCOME_DEPT_ID
|
|
|
+ LEFT JOIN SYS_DEPT ou ON ou.id = a.PAY_DEPT_ID
|
|
|
ORDER BY a.DOCUMENT_DATE DESC
|
|
|
");
|
|
|
|