diff --git a/src/repositories/queries.py b/src/repositories/queries.py index e2a7480..eaada6a 100644 --- a/src/repositories/queries.py +++ b/src/repositories/queries.py @@ -14,10 +14,10 @@ busca_propostas = r""" ELSE '6a6c9c39dbf5173588753b46' -- Sim END USADO_NA_TROCA, CASE - WHEN MAX(CASE WHEN vpg.DES_PAGAMENTO LIKE '%FINANCIAMENTO%' THEN 1 ELSE 0 END) = 1 - THEN '6a6cbc7023ac8f4423ac37a8' - ELSE '6a6cbc79609495f4cc5deb92' - END FORMA_PAGAMENTO, + WHEN MAX(CASE WHEN fcp.FINANCIAMENTO_VEICULO = 'S' THEN 1 ELSE 0 END) = 1 + THEN '6a6cbc7023ac8f4423ac37a8' + ELSE '6a6cbc79609495f4cc5deb92' + END FORMA_PAGAMENTO, vp.OBSERVACAO, CASE WHEN vp.TIPO_VENDA = 'D' THEN MAX(c.chassi_obs) END AS CHASSI_OBS, VP.PROPOSTA, @@ -111,6 +111,7 @@ busca_propostas = r""" v.VEICULO DESC ) vv LEFT JOIN [apollo-podium-db].[dbo].VEI_PAGAMENTO vpg ON vpg.EMPRESA = vp.EMPRESA AND vpg.REVENDA = vp.REVENDA AND vpg.PROPOSTA = vp.PROPOSTA + left join [apollo-podium-db].[dbo].FAT_CONDICAO_PAGAMENTO fcp on fcp.empresa = vpg.empresa and fcp.condicao = vpg.condicao left join [apollo-podium-db].[dbo].VEI_MODELO vm on vm.EMPRESA = vv.EMPRESA and vm.MODELO = vv.MODELO left join [apollo-podium-db].[dbo].VEI_NEGOCIACAO vneg on vneg.empresa = vp.empresa and vneg.revenda = vp.revenda and vneg.proposta = vp.proposta OUTER APPLY ( @@ -130,12 +131,12 @@ busca_propostas = r""" AND VAP.PROPOSTA = vp.PROPOSTA WHERE vp.situacao IN ('2','5','7') AND - vp.dta_emissao >= GETDATE() - 1 and + vp.dta_emissao >= GETDATE() - 7 and ((vv.situacao in ('TM','TF','ES','IM') and vp.tipo_venda = 'N') or ((vv.situacao in ('TD','VD') or vv.situacao is null) and vp.tipo_venda = 'D')) and hee.dta_insercao is null and (hfe.dta_insercao is null or vneg.DTA_APR_GERENCIAL > hfe.DTA_ALTERACAO_STATUS) GROUP BY - vp.situacao , + vp.situacao, vp.dta_emissao, VP.EMPRESA, VP.REVENDA, @@ -143,6 +144,7 @@ busca_propostas = r""" FC.FISJUR, vp.OBSERVACAO, VAP.PROPOSTA, + vpg.DES_PAGAMENTO, VP.PROPOSTA, vv.VEICULO, vv.CHASSI,