From 8078d38a1f9c3b2b4a5184a266f0a6614c489b79 Mon Sep 17 00:00:00 2001 From: wilian Date: Thu, 11 Feb 2021 20:28:10 +0000 Subject: [PATCH] fixes bug#21484 fixes bug#21221 dev:valdir qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@105360 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioAcompanhamentoEquivalentes.java | 3 +- .../impl/RelatorioKmProgramada.java | 73 +---- .../impl/RelatorioOrigemDestino.java | 20 +- ...RelatorioAcompanhamentoEquivalentes.jasper | Bin 124914 -> 127263 bytes .../RelatorioAcompanhamentoEquivalentes.jrxml | 298 +++++++++--------- .../templates/RelatorioOrigemDestino.jasper | Bin 77197 -> 77229 bytes .../templates/RelatorioOrigemDestino.jrxml | 22 +- .../filtroRelatorioKmProgramada.zul | 4 +- .../filtroRelatorioOrigemDestino.zul | 2 +- 9 files changed, 197 insertions(+), 225 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java index 23dbc274c..21058755c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAcompanhamentoEquivalentes.java @@ -445,6 +445,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" inner join ROL_OPERATIVO ro on ro.ROLOPERATIVO_ID = C.ROLOPERATIVO_ID "); sql.append(" LEFT JOIN BOLETO BO ON ((BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0 ) "); sql.append(" AND C.CORRIDA_ID = BO.CORRIDA_ID AND C.FECCORRIDA = BO.FECCORRIDA "); + sql.append(" AND BO.INDSTATUSOPERACION = 'F' AND BO.ACTIVO = 1 "); sql.append(" AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA).append(" ), ") ; sql.append(" (SELECT SUM(TR1.CANTKMREAL) EL, "); sql.append(" CR.CORRIDA_ID, "); @@ -491,7 +492,7 @@ public class RelatorioAcompanhamentoEquivalentes extends Relatorio { sql.append(" CR.FECCORRIDA "); sql.append(" FROM CORRIDA CR "); sql.append(" LEFT JOIN BOLETO BO ON (CR.CORRIDA_ID = BO.CORRIDA_ID AND CR.FECCORRIDA = BO.FECCORRIDA "); - sql.append(" AND BO.INDSTATUSOPERACION = 'F' "); + sql.append(" AND BO.INDSTATUSOPERACION = 'F' AND BO.ACTIVO = 1 "); sql.append(" AND BO.MOTIVOCANCELACION_ID IS NULL OR BO.MOTIVOCANCELACION_ID = 0 "); sql.append(" AND BO.CATEGORIA_ID <> ").append(CONSTANTE_GRATUIDADE_CRIANCA).append(") "); sql.append(" INNER JOIN (SELECT SUM(TR1.CANTKMREAL) KM, CR.CORRIDA_ID, CR.FECCORRIDA "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioKmProgramada.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioKmProgramada.java index 32ecabb3e..73a9496f2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioKmProgramada.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioKmProgramada.java @@ -7,11 +7,9 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.Timestamp; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.HashMap; import java.util.Map; -import com.rjconsultores.ventaboletos.entidad.Constante; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.ConstanteService; @@ -42,33 +40,27 @@ public class RelatorioKmProgramada extends Relatorio { public void processaParametros() throws Exception { } - - - private ConstanteService constanteService; - public RelatorioKmProgramada(Map parametros, Connection conexao, ConstanteService constanteService) throws Exception { super(parametros, conexao); - this.constanteService = constanteService; this.setCustomDataSource(new ArrayDataSource(this) { public void initDados() throws Exception { Connection conexao = this.relatorio.getConexao(); Map parametros = this.relatorio.getParametros(); - final Integer CARTAO_CREDITO = 2; - String sql = getSql(parametros.get("EMPRESA_ID")+""); + String sql = getSql(parametros); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); stmt.setTimestamp("fecInicio", new Timestamp(DateUtil.inicioFecha(sdf.parse(parametros.get("DATA_INICIAL").toString())).getTime())); stmt.setTimestamp("fecFinal", new Timestamp(DateUtil.inicioFecha(sdf.parse( parametros.get("DATA_FINAL").toString())).getTime())); - // stmt.setTimestamp("data_final", new Timestamp(DateUtil.fimFecha((Date) parametros.get("DATA_FINAL")).getTime())); - // stmt.setInt("formaPago1", CARTAO_CREDITO); - if(parametros.get("EMPRESA_ID" )!= null){ - stmt.setInt("empresaId", Integer.valueOf(parametros.get("EMPRESA_ID" )== null ?"0":parametros.get("EMPRESA_ID") + "")); + if(parametros.get("EMPRESA_ID" ) != null){ + stmt.setInt("empresaId", Integer.valueOf(parametros.get("EMPRESA_ID" ).toString())); + } + if(parametros.get("RUTA_ID" ) != null){ + stmt.setInt("rutaId", Integer.valueOf(parametros.get("RUTA_ID" ).toString())); } - ResultSet rset = stmt.executeQuery(); while (rset.next()) { @@ -91,13 +83,8 @@ public class RelatorioKmProgramada extends Relatorio { }); } - private String getSql(String empresaId) { + private String getSql(Map parametros) { StringBuilder sql = new StringBuilder(); - - /* Boletos apenas com venda e cancelamento direto com corrida */ - - - sql.append(" select"); sql.append(" geral.Linhas,"); sql.append(" geral.Empresa,"); @@ -127,7 +114,6 @@ public class RelatorioKmProgramada extends Relatorio { sql.append(" ELSE null"); sql.append(" END), 0 )) as KMTotal,"); - sql.append("(NVL( COUNT("); sql.append(" CASE"); sql.append(" WHEN geral.TIPOSERVICIO_ID = 1"); @@ -152,49 +138,16 @@ public class RelatorioKmProgramada extends Relatorio { sql.append(" WHERE "); sql.append(" c.ACTIVO=1"); sql.append(" and c.FECCORRIDA BETWEEN :fecInicio and :fecFinal"); - if (!empresaId.equals("null")) { + + if(parametros.get("EMPRESA_ID" ) != null){ sql.append(" and c.EMPRESACORRIDA_ID = :empresaId "); } + if(parametros.get("RUTA_ID" ) != null){ + sql.append(" and r.RUTA_ID = :rutaId "); + } + sql.append(") geral group by geral.Linhas, geral.Empresa, geral.DescLinha, geral.KMPadrao"); - - - - -// sql.append("SELECT DISTINCT c.RUTA_ID AS Linhas,"); -// sql.append(" c.EMPRESACORRIDA_ID AS Empresa,"); -// sql.append(" r.DESCRUTA AS DescLinha,"); -// sql.append(" SUM(t.CANTKMREAL) AS KMPadrao,"); -// sql.append(" COUNT("); -// sql.append(" CASE"); -// sql.append(" WHEN c.TIPOSERVICIO_ID = 1"); -// sql.append(" THEN 1"); -// sql.append(" ELSE NULL"); -// sql.append(" END ) AS SRVNormal,"); -// sql.append(" COUNT("); -// sql.append(" CASE"); -// sql.append(" WHEN c.TIPOSERVICIO_ID = 2"); -// sql.append(" THEN 1"); -// sql.append(" ELSE NULL"); -// sql.append(" END ) AS SRVExtra,"); -// sql.append(" COUNT (c.CORRIDA_ID) AS SRVTotal"); -// sql.append(" FROM CORRIDA c"); -// sql.append(" JOIN CORRIDA_TRAMO ct"); -// sql.append(" ON ct.CORRIDA_ID = c.CORRIDA_ID"); -// sql.append(" AND ct.FECCORRIDA = c.FECCORRIDA"); -// sql.append(" JOIN TRAMO t"); -// sql.append(" ON ct.TRAMO_ID = t.TRAMO_ID"); -// sql.append(" JOIN RUTA r "); -// sql.append(" on c.RUTA_ID = r.RUTA_ID"); -// sql.append(" WHERE "); -// sql.append(" c.FECCORRIDA BETWEEN :fecInicio and :fecFinal"); -// if (empresaId != null) { -// sql.append(" and c.EMPRESACORRIDA_ID = :empresaId "); -// } -// sql.append(" GROUP BY c.RUTA_ID,"); -// sql.append(" c.EMPRESACORRIDA_ID,"); -// sql.append(" r.DESCRUTA "); - return sql.toString(); } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java index d4659f8f7..4cbfff9cc 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java @@ -153,6 +153,7 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" INNER JOIN PARADA O ON O.PARADA_ID = CA.ORIGEN_ID "); sql.append(" INNER JOIN PARADA D ON D.PARADA_ID = CA.DESTINO_ID "); sql.append(" WHERE CA.ACTIVO = 1 "); + sql.append(" AND CA.INDSTATUSOPERACION = 'F' "); sql.append(" AND CA.MOTIVOCANCELACION_ID IS NULL "); if(StringUtils.isNotBlank(CONSTANTE_GRATUIDADE_CRIANCA)) { @@ -396,7 +397,24 @@ public class RelatorioOrigemDestino extends Relatorio { sql.append(" AND CO.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); sql.append(" AND CO.ACTIVO = 1 "); sql.append(" ) VIAGENS, "); - sql.append(" TR.cantkmreal KM_CORRIDA, "); + + /* Carrega KM Corrida */ + sql.append(" ( "); + sql.append(" SELECT sum(tr1.cantkmreal) / count(cr.corrida_id) "); + sql.append(" FROM CORRIDA CR "); + sql.append(" INNER JOIN RUTA_COMBINACION RS ON RS.RUTA_ID = CR.RUTA_ID "); + sql.append(" INNER JOIN TRAMO TR1 ON TR1.TRAMO_ID = RS.TRAMO_ID "); + sql.append(" AND(TR1.ORIGEN_ID = CR.ORIGEN_ID "); + sql.append(" AND TR1.DESTINO_ID = CR.DESTINO_ID) "); + sql.append(" WHERE CR.ACTIVO = 1 "); + sql.append(" AND RS.ACTIVO = 1 "); + sql.append(" AND TR1.ACTIVO = 1 "); + sql.append(" AND CR.CORRIDA_ID = RESULTADO.corrida_id "); + sql.append((" AND CR.EMPRESACORRIDA_ID IN (") + empresaIds + ") "); + sql.append(" AND CR.FECCORRIDA BETWEEN to_date('" + dataDe + "','dd/mm/yyyy HH24:mi:ss') AND to_date('" + dataAte + "','dd/mm/yyyy HH24:mi:ss') "); + sql.append(" GROUP BY CR.CORRIDA_ID, CR.ROLOPERATIVO_ID "); + sql.append(" ) KM_CORRIDA, "); + sql.append(" (SELECT AVG(DA.cantasientos) "); sql.append(" FROM corrida CO "); sql.append(" INNER JOIN rol_operativo ROL ON ROL.roloperativo_id = CO.roloperativo_id "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper index 73dce00a45d0b638f6129eec2b815b397033e9bb..200f06706629827f0cde8444e7802e578b320ce1 100644 GIT binary patch delta 8911 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 aE(~lanFx>SX5Vc~)lvfb>Svpv=YIj_fUgk% delta 9559 zcma)>3vg8B7034kHk&{e2pb_J!4R?`B#=xtkPt}}k_AGLMjm;9iV!4FHOdAyKKh`B zsz@EHa+MFU1))-@v|47TrM{-9bg){h%+z)m#Ru3@6(a$%_=5C2?p=2Ge%nbhbH4vQ z|MPwKx95KM?q;*|xa-W@uHV1l^i(>)!9PPVCM|Y22F(k-<$N;3c=)ctq0X#QfVD<# zb5ZE8*~TFFWoTLM=Si@`Xe%iWtsh?n5Hi|wi$d?_Ujgts%c=sD$5=iw0p%H%7Yk9k zShf|R%wc(`7^ROFn>ZO4n-gj)xe?$xHhW5^0|ZzuDnofM%Rl;1ZV&aAW8HI{*)SC| zhgcr3KzWqqoM|X~LfutZH;6OCreh|P<+^H=B`p70gR(A^eihcWa%RU2%yh6!szuq& za&;Zbt)X3htlP(#(%G0f$a2dZl<%Uzr^{d0!M9QsM6UH8r+VuS}wvg1*H-)iv zqz>O4#?FyCc}p0!vU1%Th74APw|#@ntZmK;)vT?hMxx}t?&_SzjkJz0tglLf0-m${ z_OEd^Zbf6`9p^AdoASv!_oZT=;gO^BY(pk%bD|Ao}yh#YyRa?lmV8;R+RU$Y};@$9A_^)f!RYW-~1)YqbwiaiL!^~nq4Rdv8?zN%1oAn_Mj|bdF0n9>sapGi?WsF zt-pGCQq<-eXoxsT%CvP{d^vQxb}mMHG>Clue9s z?lTLe^m84`!Y{_+V}yej8a{EE&y>VxWsy&$o$r0-3!j}}K2Uw<5^c5s zx9acb>Izc6Bo+=|XjsH07AH$1y&j+QRu)-A+F8C}mP36OOMhP?mV24y7h%8GfhegI zQZCw2*hqC4N51mpN}<#&ih3`K)O_O^W7Z&9?7PlIqwRdF*`T-1CxXJyW?yx9>Fp?$ z!*C6dxC|sx17y`8kXaKClscR{wc=~5Q%`)I2&}gD=IbvAq-@zm)I3i@!kv1H3_wGVVVv_`S0TmqVQf zS6s#wsll~s5ZA1+;np$k8yDko*9{Q2hjDlJ`@PMC%VDtwS6srqT%-n<4da#jJz26& zGtx?#^?50EG2uS84dQWwU3m8Y{~<-SrNCJH6pPOv6#(#iR}(OYRT^M%8CawSm<=O6 z3xUlV8}KRuR;!c1+^A|-5@>d+z-2PrRf7=j4ua#*rGXQdFTO|(oK=Gt->k90burx3 z!4bH%gA>D*FkG4w;qE6m4)`YjRQsA%E%*!5%MuY=J1{dSzJaIsX?}C5ZSD;A-~7SDZ_2Z_Y4$yA0vM>oRE76 znZqd!vbc;aQiE*OAhKCwLq5gG{~Qt7r|Id5_vt~Vdp4cu`iYLi1r43JOea!9XVoB` zS!1KSz;sWIjL>~JGBMq|O!p%X-bEu2ZU~2Ab~rIcsQs6LCs!)%bdjRb;2C2U#p4Yb zrfM@HkHz0*Bu4v;zRl?H<`EW$Tn(1Ef+bpmWfc*YS!Bb?<*v;f73ta!MnU3E*XE5P^GLg_vgdA!$ zgyIUJXbquNM1*FMjj)yp-yZ`-^uav&pz-mfOhzeSloeTsvVc%HG-^=96%^4L6sw3( z%pw~~Bcrrr3yN!`dNdmvGb-uJGW>x6QaDBs$}*!nD@%>Yff?R5I_9ukgC?$^iPoT5 zMTBM++0d4&BRS9+VR6K>1n_Tk=s2)@EF1+0svqS-4Gz!e!ZkRgj)SXkm^%(8C}8a#rk}hf=5s1<2NHg)te8^IMjP#1`eCNP=>>wyhs{UpLwAQhx`Jl zz+q_tA8jdssd#i)hVNwXP2l8e8J>{g9T}X3>`j+pZ6PnVM~3%gNT0~bdKrE!Lr8{C zWyme!l4cnmkl_^>&dX3z%q2I<@VE?b%ix^EUbPIJGCa-0fn$^4Rans+bPNf!t!baz z-nOcJ9qyQ+i-L~y^3rMLF~4NA1RZHNuI=c$^|njJi-Qg*BXdd6F*vxctDSUH&@sqY zQ9-ix!08fbNK&1Z;8F9-;0)ZM^2%Vear%Rys?7)8@RP{#0cSbjKTCG2nNwg1-El*I zr(VH%LwB#o0|$NaIl{=>lA%7H0@L;WNcLAvjq!2CzfO%=5i|2E;xli@W}?oT#j6G? zV^)pwbI{LJ=PRKyiVDxMWExx>n>iMniCSa4>aBvyRCg6r$4)s}6~9Qw74ezg*i6*2 z#j@;U)8m)@c6$6GcUQ+`q82HWMZ7ifi~Ou6W(vOK;aA3Fq86!CwYB&HLs!NxGUlq7 zDY(dv*i6(SHL^(EjQBzGR9qqQ8BLF`6_p@DV!rwzapJ{}>oz{q2%=)<|!he4u+aYyz(vncN)G z>`Y>~)#Q5k!646_0aZ2+GStiU;7XQxYT-Qal#7<>(H!P|`+oFS;-WPYgR= zwkmCacF4Yj2kGk14Ny~2LZ{#`Nkb%V0wOV)s5-hZhDZ!M(Ik9xrng^rq1rhQvS89B zG_!O4{n4G9PPH7WG@Rll;1rWNTcQhNIK{AYRz*02j+9{A%8vHsO|#@g*6wpx5qq}k znFGlR=0i2i=3At7KFsybBW@1$8g6k_?=0{no0|8ZXqga$X&UjLY~1xK?|X2!dE%G8 z2bU)`1dQ&Y@dfTy0^rcB0T5RJOw9nIH2|hz187#=jj-`b+4Okn7 z_BLI@+D%v-p44E8D_EvxEYTV))39MZsXCkCzR2GK=Xo12c_p_?81;$6f^P{Ws zew(d!w&1tIWTwDP+HG%s?Yrsvz25#)?Dn0OMEB=WAOVyDjkST*lU04EF zk1ngI^!cVttEennennMfW%*Q>1Hdua=yc|&nYV!Jz{aJ}sxoY4K}R{g-K*4I81+9Y CWzjnT diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml index a76f40fc1..38893c019 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml @@ -1,8 +1,8 @@ - - - - + + + + @@ -245,13 +245,13 @@ - + - + @@ -263,12 +263,12 @@ - + - + @@ -278,204 +278,204 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -518,24 +518,24 @@ - + - + - + - + @@ -564,354 +564,354 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 28]]> - + 29]]> - + 30]]> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 28]]> - + 29]]> - + 30]]> - + - + - + @@ -925,175 +925,175 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 28]]> @@ -1101,7 +1101,7 @@ - + 29]]> @@ -1109,7 +1109,7 @@ - + 30]]> @@ -1117,7 +1117,7 @@ - + @@ -1137,17 +1137,17 @@ - + - + - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper index 95de32ed853a6f1eec911e7b7f4bbedfdb05cc29..413c05002aa36111e91ad08dfae188d3274f12b2 100644 GIT binary patch delta 254 zcmeCZ&9e43%ZBjO$rsKkZZ1i^#|UQRr>}-E%riqEj1^f*l3=Ol%{~y3fYw?ju*j=+ zKZr5cc1_lN_hL4O4)|0 zG&V3dHZU|XFtLm`F|#l-n0)Y^`R4Siijo%FV9FV9GcsrerRF4-+IV+1qG(^o?n&Y2+)#*Qo{NwC!KW*>-1Mr$n-ScI*^ z45wAW;WED+_J@)h1t-=a`VY84hnqJPyO4qkAZ - + - + @@ -398,24 +398,24 @@ - + - + - + - + @@ -515,12 +515,12 @@ - + - + @@ -532,17 +532,17 @@ - + - + - + diff --git a/web/gui/relatorios/filtroRelatorioKmProgramada.zul b/web/gui/relatorios/filtroRelatorioKmProgramada.zul index 2a2c3a5e2..e94f6ece2 100644 --- a/web/gui/relatorios/filtroRelatorioKmProgramada.zul +++ b/web/gui/relatorios/filtroRelatorioKmProgramada.zul @@ -33,7 +33,7 @@ maxlength="10" /> - + - +