From 6bae1b0be18647056eca09e4aeb0d98045303cd1 Mon Sep 17 00:00:00 2001 From: thiago Date: Wed, 24 Feb 2016 13:13:03 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7107=20-Altera=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20relat=C3=B3rio=20para=20levar=20em=20considera=C3=A7=C3=A3o?= =?UTF-8?q?=20o=20campo=20de=20conta=20banc=C3=A1ria=20e=20a=20data=20de?= =?UTF-8?q?=20lan=C3=A7amento(=20feccreacion).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53219 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioDepositosDetalhado.java | 131 +++++++++--------- .../RelatorioDepositosDetalhado.jasper | Bin 34172 -> 34196 bytes .../RelatorioDepositosDetalhado.jrxml | 30 ++-- 3 files changed, 77 insertions(+), 84 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java index 4015adc24..97489f219 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java @@ -124,78 +124,71 @@ public class RelatorioDepositosDetalhado extends Relatorio { protected String getSqlPacotes() { StringBuilder sQuery = new StringBuilder(); - sQuery.append(" SELECT "); - sQuery.append(" E.NOMBEMPRESA Empresa, "); - sQuery.append(" PV.NOMBPUNTOVENTA Ponto_de_venda, "); - sQuery.append(" TO_CHAR(FD.FECHA_DEPOSITO,'dd/MM/yyyy') data_deposito, "); - sQuery.append(" FD.NUMDEPOSITO Numero_deposito, "); - sQuery.append(" TO_CHAR(FD.FECMODIF,'dd/MM/yyyy') DATA_LANCAMENTO_DEPOSITO, "); - sQuery.append(" if.NOME Banco, "); - sQuery.append(" EC.NUMCONTA Conta, "); - sQuery.append(" EC.NUMAGENCIA Agencia, "); - sQuery.append(" FD.VALOR valor_deposito "); - sQuery.append(" FROM "); - sQuery.append(" FECHAMENTO_DEPOSITO fd "); - sQuery.append(" JOIN FECHAMENTO_CCT_DEPOSITO fcd "); - sQuery.append(" ON "); - sQuery.append(" FCD.FECHAMENTODEPOSITO_ID = FD.FECHAMENTODEPOSITO_ID "); - sQuery.append(" JOIN FECHAMENTO_CNTCORRENTE fc "); - sQuery.append(" ON "); - sQuery.append(" FCD.FECHAMENTOCNTCORRENTE_ID = FC.FECHAMENTOCNTCORRENTE_ID "); - sQuery.append(" JOIN EMPRESA e "); - sQuery.append(" ON "); - sQuery.append(" E.EMPRESA_ID = FC.EMPRESA_ID "); - sQuery.append(" JOIN PUNTO_VENTA pv "); - sQuery.append(" ON "); - sQuery.append(" PV.PUNTOVENTA_ID = FC.PUNTOVENTA_ID "); - sQuery.append(" JOIN INSTI_FINANCEIRA IF "); - sQuery.append(" ON "); - sQuery.append(" if.INSTIFINANCEIRA_ID = FD.INSTIFINANCEIRA_ID "); - sQuery.append(" LEFT JOIN EMPRESA_CONTABANCARIA ec "); - sQuery.append(" ON "); - sQuery.append(" EC.EMPRESA_ID = FC.EMPRESA_ID "); - sQuery.append(" AND EC.INSTIFINANCEIRA_ID = if.INSTIFINANCEIRA_ID "); - sQuery.append(" AND EC.ACTIVO = 1 "); - sQuery.append(" LEFT JOIN PTOVTA_EMPRESA pve "); - sQuery.append(" ON "); - sQuery.append(" PVE.EMPRESA_ID = e.empresa_id "); - sQuery.append(" AND PVE.PUNTOVENTA_ID = PV.PUNTOVENTA_ID "); - sQuery.append(" and EC.EMPRESACONTABANCARIA_ID = PVE.EMPRESACONTABANCARIA_ID "); - sQuery.append(" AND PVE.activo = 1 "); - sQuery.append(" WHERE "); - sQuery.append(" FD.ACTIVO = 1 "); - sQuery.append(" AND FCD.ACTIVO = 1 "); - sQuery.append(" AND FC.ACTIVO = 1 "); - sQuery.append(" AND E.ACTIVO = 1 "); - sQuery.append(" AND PV.ACTIVO = 1 "); + sQuery.append(" SELECT "); + sQuery.append(" E.NOMBEMPRESA Empresa, "); + sQuery.append(" PV.NOMBPUNTOVENTA Ponto_de_venda, "); + sQuery.append(" TO_CHAR(FD.FECHA_DEPOSITO,'dd/MM/yyyy') data_deposito, "); + sQuery.append(" FD.NUMDEPOSITO Numero_deposito, "); + sQuery.append(" TO_CHAR(FD.FECCREACION,'dd/MM/yyyy') DATA_LANCAMENTO_DEPOSITO, "); + sQuery.append(" if.NOME Banco, "); + sQuery.append(" EC.NUMCONTA Conta, "); + sQuery.append(" EC.NUMAGENCIA Agencia, "); + sQuery.append(" FD.VALOR valor_deposito "); + sQuery.append(" FROM "); + sQuery.append(" FECHAMENTO_DEPOSITO fd "); + sQuery.append(" JOIN FECHAMENTO_CCT_DEPOSITO fcd "); + sQuery.append(" ON "); + sQuery.append(" FCD.FECHAMENTODEPOSITO_ID = FD.FECHAMENTODEPOSITO_ID "); + sQuery.append(" JOIN FECHAMENTO_CNTCORRENTE fc "); + sQuery.append(" ON "); + sQuery.append(" FCD.FECHAMENTOCNTCORRENTE_ID = FC.FECHAMENTOCNTCORRENTE_ID "); + sQuery.append(" JOIN EMPRESA e "); + sQuery.append(" ON "); + sQuery.append(" E.EMPRESA_ID = FC.EMPRESA_ID "); + sQuery.append(" JOIN PUNTO_VENTA pv "); + sQuery.append(" ON "); + sQuery.append(" PV.PUNTOVENTA_ID = FC.PUNTOVENTA_ID "); + sQuery.append(" JOIN EMPRESA_CONTABANCARIA ec "); + sQuery.append(" ON "); + sQuery.append(" fd.EMPRESACONTABANCARIA_ID = EC.EMPRESACONTABANCARIA_ID "); + sQuery.append(" JOIN INSTI_FINANCEIRA IF "); + sQuery.append(" ON "); + sQuery.append(" EC.INSTIFINANCEIRA_ID = if.INSTIFINANCEIRA_ID "); + sQuery.append(" "); + sQuery.append(" WHERE "); + sQuery.append(" FD.ACTIVO = 1 "); + sQuery.append(" AND FCD.ACTIVO = 1 "); + sQuery.append(" AND FC.ACTIVO = 1 "); + sQuery.append(" AND E.ACTIVO = 1 "); + sQuery.append(" AND PV.ACTIVO = 1 "); if(parametros.get("MARCA_ID")!= null){ - sQuery.append(" and e.empresa_id =:MARCA_ID "); + sQuery.append(" and e.empresa_id =:MARCA_ID "); } if(parametros.get("INST_FINANCEIRA")!= null){ - sQuery.append(" and if.INSTIFINANCEIRA_ID =:INST_FINANCEIRA "); - } - sQuery.append(" and FD.FECMODIF between :fecInicio and :fecFinal"); - sQuery.append(" GROUP BY "); - sQuery.append(" E.NOMBEMPRESA, "); - sQuery.append(" PV.NOMBPUNTOVENTA, "); - sQuery.append(" FD.FECHA_DEPOSITO, "); - sQuery.append(" FD.NUMDEPOSITO, "); - sQuery.append(" FD.FECMODIF, "); - sQuery.append(" if.NOME, "); - sQuery.append(" EC.NUMCONTA, "); - sQuery.append(" EC.NUMAGENCIA, "); - sQuery.append(" FD.VALOR "); - sQuery.append(" ORDER BY "); - sQuery.append(" FD.FECHA_DEPOSITO, "); - sQuery.append(" FD.FECMODIF, "); - sQuery.append(" E.NOMBEMPRESA, "); - sQuery.append(" PV.NOMBPUNTOVENTA, "); - sQuery.append(" FD.NUMDEPOSITO, "); - sQuery.append(" if.NOME, "); - sQuery.append(" EC.NUMCONTA, "); - sQuery.append(" EC.NUMAGENCIA, "); - sQuery.append(" FD.VALOR "); - return sQuery.toString(); + sQuery.append(" and if.INSTIFINANCEIRA_ID =:INST_FINANCEIRA "); + } + sQuery.append(" and FD.FECCREACION between :fecInicio and :fecFinal"); + sQuery.append(" GROUP BY "); + sQuery.append(" E.NOMBEMPRESA, "); + sQuery.append(" PV.NOMBPUNTOVENTA, "); + sQuery.append(" FD.FECHA_DEPOSITO, "); + sQuery.append(" FD.NUMDEPOSITO, "); + sQuery.append(" FD.FECCREACION, "); + sQuery.append(" if.NOME, "); + sQuery.append(" EC.NUMCONTA, "); + sQuery.append(" EC.NUMAGENCIA, "); + sQuery.append(" FD.VALOR "); + sQuery.append(" ORDER BY "); + sQuery.append(" E.NOMBEMPRESA, "); + sQuery.append(" PV.NOMBPUNTOVENTA, "); + sQuery.append(" FD.FECCREACION, "); + sQuery.append(" FD.FECHA_DEPOSITO, "); + sQuery.append(" FD.NUMDEPOSITO, "); + sQuery.append(" if.NOME, "); + sQuery.append(" EC.NUMCONTA, "); + sQuery.append(" EC.NUMAGENCIA, "); + sQuery.append(" FD.VALOR "); + return sQuery.toString(); } private void fecharConexaoBanco(NamedParameterStatement stmt, ResultSet rset) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper index d6ca013f69330befd0193cb05748bc8ba6d82cce..b2a3e74a9448d0ed84800ad1eb1c91a389b19ccd 100644 GIT binary patch delta 5277 zcmZ{neQcY>9mnr^;y5l&X%Z*IF-~K!efPhkU?^9KcDSIgsnmSErQ#XX5f-&AEA%+0KrfM02ZeqLp-964- zpIiR;=^lT6ci+!*&*LYL|MN}#(QoO`ep0{9mN14=OXgn@*E(9xTz0PSY zJt%bwJw_FJ41k{4Bk6Hq(W@hRcf)?&hPQUQ%6rz^Y3^BoN z&A@R);m{E(17%7f!>B@r0gw@U zBpD7YGE+nb{?7?mBQnBhE9i0RC~V^Sxs9aleT^(GLbaK zr^k)t*mw%|R9hvRQ$oA&`CFUu-ho;&Ek3ZFOuJ{Gg^V8_Xf{|!?Y-I6Y;Yl)KNgJV zOSxmY6Kp!PNX>E>pB|{yT#{vi!4yeg|LPgPU`nDt;39`d}Mr+8OopsqHZJc(k$QMjK-! znTVu}33KN8sL#WDoD*c*r-$N3B38z4Mm-H2+lS%_^44rlq!+R+Mla+*tcAGE#Cpm2 zv6!EXFU6YOXEj7G-4=4=#`E)Y^96GvxoaCabPzZ+pU*A`j4To|ykrr2ck@2;b`sj^ zIbyf70LaY07>{^$y@cTDtD_RC=nT?FrmoRpcjx-ohL&yKpTQ)38$xS;M@U1op#k2l zbvNEJoD8&-kS!TGXwWa)jm`9_rPt#Jh7HY)e>*(t@u|9K)9rY7B1D>wB@&)p|G()) zXmXB>wUStSbSyDBGHUHchzFk>>92FctyEbml*k6sC?EdANJ)DVheijg4--iK$j9jW z_>s}k^ikRYB?Bjp#5W2Cjxr#=QAj}iA;bahoNzUAxp`U7m3Q&_>tQV#Tz# zlD5LH(L?%AsT-7w3O7a-ZX%G}7yvikV{yBPdk!sXzk+Rgo{To|nY2Is8!7_jIfV$L z3K0=VA`DQG7T!aibhfd|x0TUdU?`)Es)fF>c49Qa z_xKh?Jw!z`K@(pHF@Y>9F)@B15@W=;i2B73f{7*?G!Wtk1@%17bK2d@J?_JkXZQa< z=l?tBo;Eu>^sILE8STWyn)33|@cIoimuk-1S*mrpzGt6uK*4fvE)V@?ML8YI@t=~g zhlHX36LhPEo_C?Rl>hBcWwHUat zG)lNgMJ{S3Tt>mfB?JpsV~K0csy5r@T&|!f%;BwN53icrv-ehoJYHbK(k5Xe71^kj zuo(ptn-DB)Z6&tXyV}b*TMo&7>6#UC@?Ve+MxVxGEp|Gq)4FemN^%6Exk&Rjjn^7>a3Bkg)Uaw?{%ZboyT6e;9`HBu{xyFC?@#f1n0@DOGP!F5;BE~xh^Os1 z$KF7l`>?9Qr1M8Z(UH;EL}Vlwh=lOP@X3w_+ulw?7}jxHBYSFHEl+uK-QpFrzy&x% zDxSH=8%)LX`A9atJ27RN zxY5BaUMJezr8a9^4GeH@}yD$4%f z6-8CJQ*+`?M5|#98>7vO3QActus#G+TyH)AZU;NKF{IY8Z#NFtyJapgEoXg^K5lw2 z5~=t6zv(=hnubO^Jk}N*iHr>mTiuExf?pb1TU~?iyS$Js@a=;rH~V3zpuWsD4g0I` zRz>%!x7ZuQ!+l%9fknrKo9Zs-UG@^J9(sY&{d6$2G zE{L90_wqlu>e;nu6U(+P?bou9k0mY1CsmS90_KYr@`c@!pN6kY_Q$4oMEZ$QUmskV zG%S+a7zvL{f@v5Aixz^ZwJx0Bzcyc1UuU~xo~oBYE^hsySWnffbSdH-%DZf~VIliH z=Hjmjw#Pjtw&x9?#BxNkJ)}w~NkB@`0;RBX2>41@O0VY#J3n@}`Ze32dqn<|x|@AD zy0j1OQ5qJ>6^(@Bl6V@1@uG!zYGDt|@yFm&z$Uhgt24Oxb6e8Lv6KM>b$0lmw+omj2{8pY@_6K+>YPS`0pWD`CR|a8cFuh;<9MZ9z zk))FkHIxLKHPj>+?^{A(@wlswrsf1RzWBkL zSB6`#b7vcFL0wfJ{=>@wtEZ2`mpgsB3%Ia2C0wLRxQv2{iv;8n9t)QfKaoe{-z>^U zl - + @@ -89,27 +89,27 @@ - + - + - + - + - + @@ -122,12 +122,12 @@ - + - + @@ -141,27 +141,27 @@ - + - + - + - + - + @@ -171,7 +171,7 @@ - + @@ -204,7 +204,7 @@ - +