|
@@ -3169,7 +3169,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
GROUP BY DATE_FORMAT(a.signdate, '%Y-%m')) a
|
|
GROUP BY DATE_FORMAT(a.signdate, '%Y-%m')) a
|
|
|
- left join (SELECT sum(a.commission_feevalue) + sum(a.other_feevalue) AS "notInvoicAmount",
|
|
|
|
|
|
|
+ left join (SELECT ifnull(sum(a.commission_feevalue),0) + ifnull(sum(a.other_feevalue),0) AS "notInvoicAmount",
|
|
|
DATE_FORMAT(a.signdate, '%Y-%m') as "signingTime"
|
|
DATE_FORMAT(a.signdate, '%Y-%m') as "signingTime"
|
|
|
FROM ins_ply_income a
|
|
FROM ins_ply_income a
|
|
|
LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
|
|
LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
|
|
@@ -3181,7 +3181,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
GROUP BY DATE_FORMAT(a.signdate, '%Y-%m')) b on a.signingTime = b.signingTime
|
|
GROUP BY DATE_FORMAT(a.signdate, '%Y-%m')) b on a.signingTime = b.signingTime
|
|
|
- left join (SELECT sum(a.commission_feevalue) + sum(a.other_feevalue) AS "settAmount",
|
|
|
|
|
|
|
+ left join (SELECT ifnull(sum(a.commission_feevalue),0) + ifnull(sum(a.other_feevalue),0) AS "settAmount",
|
|
|
DATE_FORMAT(a.signdate, '%Y-%m') as "signingTime"
|
|
DATE_FORMAT(a.signdate, '%Y-%m') as "signingTime"
|
|
|
FROM ins_ply_income a
|
|
FROM ins_ply_income a
|
|
|
LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
|
|
LEFT JOIN ptl_agreement pa ON pa.id = a.agreement_id
|