|
|
@@ -187,8 +187,8 @@
|
|
|
<select id="getYearAndQuarterAmount" resultMap="yearAmountResultMap">
|
|
|
SELECT
|
|
|
ia.account_id,
|
|
|
- SUM(CASE WHEN YEAR(invoice_time) = YEAR(CURDATE()) AND QUARTER(invoice_time) = QUARTER(CURDATE()) THEN no_has_tax ELSE 0 END) AS yearAmount,
|
|
|
- SUM(CASE WHEN YEAR(invoice_time) = YEAR(CURDATE()) THEN no_has_tax ELSE 0 END) AS quarterAmount
|
|
|
+ SUM(CASE WHEN YEAR(invoice_time) = YEAR(CURDATE()) AND QUARTER(invoice_time) = QUARTER(CURDATE()) THEN no_has_tax ELSE 0 END) AS quarterAmount,
|
|
|
+ SUM(CASE WHEN YEAR(invoice_time) = YEAR(CURDATE()) THEN no_has_tax ELSE 0 END) AS yearAmount
|
|
|
FROM
|
|
|
inv_account ia
|
|
|
LEFT JOIN inv_account_incoice iai ON iai.account_id = ia.account_id
|