From 2f127fa61e9d3a898d13b7524ecb0327dab1c0c3 Mon Sep 17 00:00:00 2001 From: "alexandre.lima" Date: Fri, 2 Mar 2018 14:19:47 +0000 Subject: [PATCH] bug#10344 dev:Daniel qua:Wallysson git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79331 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../RelatorioMovimentoPorOrgaoConcedente.java | 9 ++++--- ...vimentoPorOrgaoConcedente_pt_BR.properties | 2 +- ...elatorioMovimentoPorOrgaoConcedente.jasper | Bin 34917 -> 36172 bytes ...RelatorioMovimentoPorOrgaoConcedente.jrxml | 23 ++++++++++++------ ...MovimentoPorOrgaoConcedenteController.java | 11 +++++++-- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentoPorOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentoPorOrgaoConcedente.java index 22c083295..6b42965ab 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentoPorOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentoPorOrgaoConcedente.java @@ -36,11 +36,11 @@ public class RelatorioMovimentoPorOrgaoConcedente extends Relatorio { Integer empresaId = (Integer) parametros.get("EMPRESA_ID"); stmt.setInt("empresa_id", empresaId); - if(!parametros.get("ORGAOCONCEDENTE_ID").equals("")){ + if(parametros.get("ORGAOCONCEDENTE_ID") != null && !"".equals(parametros.get("ORGAOCONCEDENTE_ID"))){ stmt.setInt("orgaoconcedenteId",(Integer)parametros.get("ORGAOCONCEDENTE_ID")); } - if(!parametros.get("TIPOSERVICIO_ID").equals("-1")){ + if(parametros.get("TIPOSERVICIO_ID") != null && !"-1".equals(parametros.get("TIPOSERVICIO_ID"))){ stmt.setInt("tiposervicio_id", Integer.parseInt((String)parametros.get("TIPOSERVICIO_ID"))); } @@ -104,10 +104,10 @@ public class RelatorioMovimentoPorOrgaoConcedente extends Relatorio { if(parametros.get("SERVICO_ID") != null ){ sql.append(" AND b.corrida_id IN(" +parametros.get("SERVICO_ID")+ ") "); } - if(!parametros.get("ORGAOCONCEDENTE_ID").equals("")){ + if(parametros.get("ORGAOCONCEDENTE_ID") != null && !"".equals(parametros.get("ORGAOCONCEDENTE_ID"))){ sql.append(" and r.ORGAOCONCEDENTE_ID = :orgaoconcedenteId "); } - if(!parametros.get("TIPOSERVICIO_ID").equals("-1")){ + if(parametros.get("TIPOSERVICIO_ID") != null && !"-1".equals(parametros.get("TIPOSERVICIO_ID"))){ sql.append(" AND c.tiposervicio_id = :tiposervicio_id"); } @@ -179,6 +179,7 @@ public class RelatorioMovimentoPorOrgaoConcedente extends Relatorio { sql.append(" BEMPRESACORRIDA_ID, "); sql.append(" RINDSENTIDOIDA , "); sql.append(" rusentido "); + sql.append(" order by PORIGDESCPARADA, PDESTDESCPARADA, rusentido"); return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentoPorOrgaoConcedente_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentoPorOrgaoConcedente_pt_BR.properties index d4d074666..936bda4a0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentoPorOrgaoConcedente_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioMovimentoPorOrgaoConcedente_pt_BR.properties @@ -18,7 +18,7 @@ header.inscricao=Inscri #Labels column header -column.header.seccoes=Secções +column.header.seccoes=Seções column.header.km=KM column.header.seq=SEQ column.header.sentido=Sentido diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentoPorOrgaoConcedente.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentoPorOrgaoConcedente.jasper index 7aa2e2764f48f4af4c5b0c5500fdcc5cc284c2a2..48dc8a49bff8e35bb5ddab9e96f83cb55d855af9 100644 GIT binary patch literal 36172 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%0A%BZ%haz(i)^w8Am0TN(q%&R2EaY zoXQ$18>nodvXu&T#l2JxQ#nE9ER`Q=c*@?a3zc{(NmMeZWKx+xg?@WxGpVekvX;u- zR34_X9U#E=5IFP#T$mQJ6MpqQ!eWDPcpJux0^4L8{5FXHJcvIY#J?59?@5iixC5E* z5q$Oq44JkQI}m&#bvxt*c3{U>uoG1`r$%FhYIFy|E(+d6FjB$Q)V@YG525DuRP(jg z=2Ek0)ocnm9Ic~zsaD!r%cN%ARI?0nEZBhot=^wJ-Ib?1dCFV6bRiKm3hp47sNmKB;UtB(5FDuBodgFdxRzj=f&m(P z=?)xB>lKaZJMfZ?&@mcEJOZK7ILh}3eNMN-3gxF-G1VGdYi_Dt*;*S(wPmsvprwa_ zRIO`u#!+omYpoOMj~4oax6!7RuPe@_qz15&w*0-Y3pUeM-U6?~gYXVK1V`XeI028r zDf--=hNs{hG}DW*9e##q>5TXsod{pV2zUv*!XAu+R|D7!_G2Qvj>&M4UWC8lFgjY5^&c%!2bF76k^n#qlmGCvaB|I>SKA^cFj`?r%3SW9-;vXsHkCgIXrj&92M@kX?wv?i4I;H5EPAOCiPAS@{Q;M$r z$CQHC(06PN?7|yiAKpYcVIAdyTj2=3*C&wE`+pbRdGCgE_$PYL|4et&`{>?zKfT)z z(>whL-4?fE96nAd1-D@$K8?xv45s4_x+y)6(zeuizv~1SPl+%kcot!Z&aZ zzJ-hNZLGz2@p3$ZEAbev!N21Tlpr?XM|dZGf?Mz(_yB%E5?@kEIY%kwpOjL*p^?6& zl=35`l%FW2{7a;iU-1;(rp{6l`HFSGA6Y0~VBri|Clid8^VfNIxAzBu$knoV3)F$Y%~k7acnJfuyxGE?q=iJ zz0~?)mdhSxd6ZIEKHJHP*dFS-kCn4SY%+V7O=lmlxs*~If25Q@PAUI?PAP0LFjfP* z*izWX8sK%d9Nu9o;0U`CPSAPy6uSye)4ly1yAFO}*Tc{BrABr$hOpZ(g007{><)}$ zcT!4W8!?gHLq~#5n9erSG2j6l#~!3l|6h>aJNn!|fhFuoEN6eE&wDe@p|AR4_AJ)2 zU3fWr5m&O^xQ4#+H?Y@m1KW>xvNv%HJBSa^7k?{z2cKj|@j3P$?qbJrFMa*@vy*t3 zox-E+Q#`=}pHWIVO)2FJrIfEIrF=~(i)F>O?ySt#lg+gCVimT&Y^ALq3)qs_T3a$(XG>*w z+tS#*wxR4{TLyd7HiB(;*haFQwlQpvZ7kbo%VLLYPWG@~ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentoPorOrgaoConcedente.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentoPorOrgaoConcedente.jrxml index 0d71506ec..3de5282c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentoPorOrgaoConcedente.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentoPorOrgaoConcedente.jrxml @@ -2,7 +2,7 @@ - + @@ -20,6 +20,20 @@ + + + + + + + + + + + + + + @@ -199,13 +213,6 @@ - - - - - - - diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentoPorOrgaoConcedenteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentoPorOrgaoConcedenteController.java index 51d64b809..25706192d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentoPorOrgaoConcedenteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentoPorOrgaoConcedenteController.java @@ -21,9 +21,9 @@ import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; +import com.rjconsultores.ventaboletos.entidad.InscricaoEstadual; import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDemandasDetalhadoNovoLayout; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioMovimentoPorOrgaoConcedente; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -310,7 +310,14 @@ public class RelatorioMovimentoPorOrgaoConcedenteController extends MyGenericFo parametros.put("EMPRESA_ID", this.empresa.getEmpresaId()); parametros.put("ENDERECO", this.empresa.getLogradouro() +this.empresa.getNumero());// +this.empresa.getComplemento()); parametros.put("CNPJ", this.empresa.getCnpj()); - parametros.put("INSCRICAO", "descrição inscrição estadual"); + String inscricaoEstadual = ""; + for (InscricaoEstadual a : this.empresa.getInscricoesEstaduais()) { + if (inscricaoEstadual.length() != 0 && a.getActivo()) { + inscricaoEstadual += ","; + } + inscricaoEstadual += a.getNumInscricaoEstadual(); + } + parametros.put("INSCRICAO", inscricaoEstadual); }else{ parametros.put("EMPRESA", "TODAS"); parametros.put("MUNICIPIO", "");