7299_testToMaster #2411

Merged
alexm merged 342 commits from 7299_testToMaster into master 2024-05-07 05:30:42 +00:00
4 changed files with 34 additions and 31 deletions
Showing only changes of commit 194947dc9a - Show all commits

View File

@ -17,15 +17,15 @@ BEGIN
SET vEnded = util.dayEnd(IFNULL(vDate, util.VN_CURDATE())); SET vEnded = util.dayEnd(IFNULL(vDate, util.VN_CURDATE()));
CREATE OR REPLACE TEMPORARY TABLE tClientRisk CREATE OR REPLACE TEMPORARY TABLE tClientRisk
ENGINE = MEMORY ENGINE = MEMORY
SELECT cr.clientFk, SUM(cr.amount) amount SELECT cr.clientFk, SUM(cr.amount) amount
FROM clientRisk cr FROM clientRisk cr
JOIN tmp.clientGetDebt c ON c.clientFk = cr.clientFk JOIN tmp.clientGetDebt c ON c.clientFk = cr.clientFk
GROUP BY cr.clientFk; GROUP BY cr.clientFk;
INSERT INTO tClientRisk INSERT INTO tClientRisk
SELECT c.clientFk, SUM(r.amountPaid) SELECT c.clientFk, SUM(r.amountPaid)
FROM receipt r FROM receipt r
JOIN tmp.clientGetDebt c ON c.clientFk = r.clientFk JOIN tmp.clientGetDebt c ON c.clientFk = r.clientFk
WHERE r.payed > vEnded WHERE r.payed > vEnded

View File

@ -40,7 +40,7 @@ BEGIN
UPDATE client c UPDATE client c
JOIN tCreditClients cc ON cc.clientFk = c.clientFk JOIN tCreditClients cc ON cc.clientFk = c.clientFk
SET Clientes.Credito = newCredit; SET c.credit = newCredit;
DROP TEMPORARY TABLE tCreditClients; DROP TEMPORARY TABLE tCreditClients;
COMMIT; COMMIT;

View File

@ -2,28 +2,28 @@ DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`riskAllClients`(maxRiskDate DATE) CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`riskAllClients`(maxRiskDate DATE)
BEGIN BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.client_list; DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
CREATE TEMPORARY TABLE tmp.client_list CREATE TEMPORARY TABLE tmp.clientGetDebt
(PRIMARY KEY (Id_Cliente)) (PRIMARY KEY (clientFk))
ENGINE = MEMORY ENGINE = MEMORY
SELECT id Id_Cliente, null grade FROM vn.client; SELECT id clientFk, null grade FROM client;
CALL client_getDebt (maxRiskDate); CALL client_getDebt (maxRiskDate);
SELECT SELECT
c.RazonSocial, c.RazonSocial,
c.Id_Cliente, c.Id_Cliente,
c.Credito, c.Credito,
CAST(r.risk as DECIMAL (10,2)) risk, CAST(r.risk as DECIMAL (10,2)) risk,
CAST(c.Credito - r.risk as DECIMAL (10,2)) Diferencia, CAST(c.Credito - r.risk as DECIMAL (10,2)) Diferencia,
c.Id_Pais c.Id_Pais
FROM FROM
vn2008.Clientes c vn2008.Clientes c
JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente JOIN tmp.risk r ON r.clientFk = c.Id_Cliente
JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente JOIN tmp.clientGetDebt ci ON c.Id_Cliente = ci.clientFk
GROUP BY c.Id_cliente; GROUP BY c.Id_cliente;
DROP TEMPORARY TABLE IF EXISTS tmp.risk; DROP TEMPORARY TABLE IF EXISTS tmp.risk;
DROP TEMPORARY TABLE IF EXISTS tmp.client_list; DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
END$$ END$$
DELIMITER ; DELIMITER ;

View File

@ -2,15 +2,18 @@ DELIMITER $$
CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`solunionRiskRequest`() CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`solunionRiskRequest`()
BEGIN BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp.client_list; DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
CREATE TEMPORARY TABLE tmp.client_list CREATE TEMPORARY TABLE tmp.clientGetDebt
(PRIMARY KEY (Id_Cliente)) (PRIMARY KEY (clientFk))
ENGINE = MEMORY ENGINE = MEMORY
SELECT * FROM (SELECT cc.client Id_Cliente, ci.grade FROM vn.creditClassification cc SELECT *
JOIN vn.creditInsurance ci ON cc.id = ci.creditClassification FROM (SELECT cc.client clientFk, ci.grade
WHERE dateEnd IS NULL FROM vn.creditClassification cc
ORDER BY ci.creationDate DESC JOIN vn.creditInsurance ci ON cc.id = ci.creditClassification
LIMIT 10000000000000000000) t1 GROUP BY Id_Cliente; WHERE dateEnd IS NULL
ORDER BY ci.creationDate DESC
LIMIT 10000000000000000000) t1
GROUP BY clientFk;
CALL client_getDebt (util.VN_CURDATE()); CALL client_getDebt (util.VN_CURDATE());
@ -20,12 +23,12 @@ BEGIN
f.Consumo consumo_anual, c.Vencimiento, ci.grade f.Consumo consumo_anual, c.Vencimiento, ci.grade
FROM FROM
vn2008.Clientes c vn2008.Clientes c
JOIN tmp.risk r ON r.Id_Cliente = c.Id_Cliente JOIN tmp.risk r ON r.clientFk = c.Id_Cliente
JOIN tmp.client_list ci ON c.Id_Cliente = ci.Id_Cliente JOIN tmp.clientGetDebt ci ON c.Id_Cliente = ci.clientFk
JOIN bi.facturacion_media_anual f ON c.Id_Cliente = f.Id_Cliente JOIN bi.facturacion_media_anual f ON c.Id_Cliente = f.Id_Cliente
GROUP BY Id_cliente; GROUP BY Id_cliente;
DROP TEMPORARY TABLE IF EXISTS tmp.risk; DROP TEMPORARY TABLE IF EXISTS tmp.risk;
DROP TEMPORARY TABLE IF EXISTS tmp.client_list; DROP TEMPORARY TABLE IF EXISTS tmp.clientGetDebt;
END$$ END$$
DELIMITER ; DELIMITER ;