refs 6500 rateView
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
9aad1dd6e8
commit
e83b0622cf
|
@ -2,8 +2,6 @@ DELIMITER $$
|
||||||
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`rateView`()
|
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`rateView`()
|
||||||
BEGIN
|
BEGIN
|
||||||
|
|
||||||
DECLARE v10Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 10 YEAR;
|
|
||||||
|
|
||||||
SELECT
|
SELECT
|
||||||
t.year,
|
t.year,
|
||||||
t.month,
|
t.month,
|
||||||
|
@ -15,8 +13,7 @@ BEGIN
|
||||||
JOIN time t ON t.dated = ii.issued
|
JOIN time t ON t.dated = ii.issued
|
||||||
JOIN invoiceInTax iit ON ii.id = iit.invoiceInFk
|
JOIN invoiceInTax iit ON ii.id = iit.invoiceInFk
|
||||||
JOIN
|
JOIN
|
||||||
(
|
( SELECT
|
||||||
SELECT
|
|
||||||
t.year,
|
t.year,
|
||||||
t.month,
|
t.month,
|
||||||
CAST(SUM(divisa) AS DECIMAL(10,2)) dollars,
|
CAST(SUM(divisa) AS DECIMAL(10,2)) dollars,
|
||||||
|
@ -27,16 +24,13 @@ BEGIN
|
||||||
JOIN referenceRate rr ON rr.dated = p.received
|
JOIN referenceRate rr ON rr.dated = p.received
|
||||||
JOIN currency c ON c.id = rr.currencyFk
|
JOIN currency c ON c.id = rr.currencyFk
|
||||||
WHERE divisa
|
WHERE divisa
|
||||||
AND p.received >= v10Years
|
|
||||||
AND c.code = 'USD'
|
AND c.code = 'USD'
|
||||||
GROUP BY t.year, t.month
|
GROUP BY t.year, t.month
|
||||||
) pagos ON t.year = pagos.year AND t.month = pagos.MONTH
|
) pagos ON t.year = pagos.year AND t.month = pagos.MONTH
|
||||||
JOIN currency c ON c.id = ii.currencyFk
|
JOIN currency c ON c.id = ii.currencyFk
|
||||||
WHERE c.code = 'USD'
|
WHERE c.code = 'USD'
|
||||||
AND ii.issued >= v10Years
|
|
||||||
AND iit.foreignValue
|
AND iit.foreignValue
|
||||||
AND iit.taxableBase
|
AND iit.taxableBase
|
||||||
GROUP BY t.year, t.month;
|
GROUP BY t.year, t.month;
|
||||||
|
|
||||||
END$$
|
END$$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
Loading…
Reference in New Issue