From eb2922e2b32869c4e81a63e05ab224f3f7e6538c Mon Sep 17 00:00:00 2001 From: wilian Date: Fri, 12 May 2017 17:30:16 +0000 Subject: [PATCH] fixes bug #9030 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68794 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioVendasPacotesDetalhado.java | 18 +++-- ...RelatorioVendasPacotesDetalhadoItem.jasper | Bin 40718 -> 40823 bytes .../RelatorioVendasPacotesDetalhadoItem.jrxml | 4 +- .../RelatorioVendasPacotesDetalhadoBean.java | 64 +++++++++++++++++- 4 files changed, 78 insertions(+), 8 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java index 35dd7db25..ebebe1c1d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -136,13 +136,17 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { relatorioVendasPacotesDetalhadoItemBean.setNombusuario(rset.getString("nombusuario")); relatorioVendasPacotesDetalhadoItemBean.setNumoperacion(rset.getString("numoperacion")); relatorioVendasPacotesDetalhadoItemBean.setQtdeTarifas(rset.getLong("qtdetarifas")); - relatorioVendasPacotesDetalhadoItemBean.setRazaoSocialCliente(rset.getString("razao_social")); + relatorioVendasPacotesDetalhadoItemBean.setRazaoSocialCliente(rset.getString("nombcliente")); relatorioVendasPacotesDetalhadoItemBean.setSubTotal(rset.getBigDecimal("subtotal")); relatorioVendasPacotesDetalhadoItemBean.setTotal(rset.getBigDecimal("total")); relatorioVendasPacotesDetalhadoItemBean.setVendapacoteId(rset.getLong("vendapacote_id")); relatorioVendasPacotesDetalhadoItemBean.setNumoperacionNotaCreditoPagamento(rset.getString("NUMOPERACION_PAG_NC")); relatorioVendasPacotesDetalhadoItemBean.setVoucherNotaCredito(rset.getLong("VOUCHER_NOTACREDITO")); relatorioVendasPacotesDetalhadoItemBean.setSituacaoVendaPacote(SituacaoVendaPacote.getSituacaoVendaPacote(rset.getInt("situacao"))); + relatorioVendasPacotesDetalhadoItemBean.setEndereco(rset.getString("endereco")); + relatorioVendasPacotesDetalhadoItemBean.setNumero(rset.getString("numero")); + relatorioVendasPacotesDetalhadoItemBean.setCidade(rset.getString("cidade")); + relatorioVendasPacotesDetalhadoItemBean.setBairro(rset.getString("bairro")); if(relatorioVendasPacotesBean.getRelatorioVendasPacotesDetalhadoItemBeans() == null) { relatorioVendasPacotesBean.setRelatorioVendasPacotesDetalhadoItemBeans(new ArrayList()); @@ -176,18 +180,21 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { protected String getSqlPacotes() { StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, CP.RAZAO_SOCIAL, ") - .append("NC.NOTACREDITOVENDAPACOTE_ID AS VOUCHER_NOTACREDITO, VPNC.NUMOPERACION AS NUMOPERACION_PAG_NC,U.NOMBUSUARIO, VP.SUBTOTAL,0, NVL(VP.DESCONTO,0) AS DESCONTO, VP.TOTAL, VP.SITUACAO, COUNT(NVL(TVP.TARIFAVENDAPACOTE_ID,0)) AS QTDETARIFAS ") + sQuery.append("SELECT P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, C.NOMBCLIENTE, ") + .append("NC.NOTACREDITOVENDAPACOTE_ID AS VOUCHER_NOTACREDITO, VPNC.NUMOPERACION AS NUMOPERACION_PAG_NC, ") + .append("EA.ENDERECO, EA.CIDADE, EA.NUMERO, EA.BAIRRO, ") + .append("U.NOMBUSUARIO, VP.SUBTOTAL,0, NVL(VP.DESCONTO,0) AS DESCONTO, VP.TOTAL, VP.SITUACAO, COUNT(NVL(TVP.TARIFAVENDAPACOTE_ID,0)) AS QTDETARIFAS ") .append("FROM VENDA_PACOTE VP ") .append("LEFT JOIN PACOTE P ON P.PACOTE_ID = VP.PACOTE_ID ") .append("LEFT JOIN TARIFA_VENDA_PACOTE TVP ON TVP.VENDAPACOTE_ID = VP.VENDAPACOTE_ID ") .append("LEFT JOIN ENDERECO_APANHE EA ON EA.VENDAPACOTE_ID = VP.VENDAPACOTE_ID AND EA.ACTIVO = 1 ") - .append("LEFT JOIN CLIENTE_PACOTE CP ON CP.CLIENTEPACOTE_ID = VP.CLIENTEPACOTE_ID ") + .append("LEFT JOIN CLIENTE C ON C.CLIENTE_ID = VP.CLIENTE_ID ") .append("LEFT JOIN USUARIO U ON U.USUARIO_ID = VP.USUARIO_ID ") .append("LEFT JOIN PACOTE_TARIFA PT ON PT.PACOTETARIFA_ID = TVP.PACOTETARIFA_ID ") .append("LEFT JOIN TIPO_TARIFA_PACOTE TTP ON TTP.TIPOTARIFAPACOTE_ID = PT.TIPOTARIFAPACOTE_ID ") .append("LEFT JOIN NOTA_CREDITO_VENDA_PACOTE NC ON NC.VENDAPACOTECANCELAMENTO_ID = VP.VENDAPACOTE_ID ") .append("LEFT JOIN VENDA_PACOTE VPNC ON NC.VENDAPACOTEPAGAMENTO_ID = VPNC.VENDAPACOTE_ID ") + .append("LEFT JOIN VENDA_PACOTE VPNC ON NC.VENDAPACOTEPAGAMENTO_ID = VPNC.VENDAPACOTE_ID ") .append("WHERE P.ACTIVO = 1 "); if(empresaId != null && empresaId > 0) { @@ -231,7 +238,8 @@ public class RelatorioVendasPacotesDetalhado extends Relatorio { } sQuery.append("GROUP BY P.PACOTE_ID, VP.VENDAPACOTE_ID, P.NOMPACOTE, VP.NUMOPERACION, VP.DATAVENDA, VP.DATAPACOTE, EA.DESCHOTEL, EA.LOCAL, ") - .append("CP.RAZAO_SOCIAL, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO, NC.NOTACREDITOVENDAPACOTE_ID, VPNC.NUMOPERACION ") + .append("C.NOMBCLIENTE, U.NOMBUSUARIO, VP.SUBTOTAL, VP.DESCONTO, VP.TOTAL, VP.SITUACAO, NC.NOTACREDITOVENDAPACOTE_ID, VPNC.NUMOPERACION, ") + .append("EA.ENDERECO, EA.CIDADE, EA.NUMERO, EA.BAIRRO ") .append("ORDER BY P.NOMPACOTE, VP.DATAPACOTE, VP.DATAVENDA "); return sQuery.toString(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesDetalhadoItem.jasper index 95dad0b34a6497e38b38e79a1bd2785dc97bf236..7d937a1ed84475e43a34c93d28c7a580fb389960 100644 GIT binary patch delta 3251 zcmZ{mdrVVj6u|Fou|6&!SW#PxyrGiWQC0^in_ycM?2B@N@~jmq6#9Z*9+AYjEL#lf zbbeWu=t8zEGc$1p!?q}Yuw=`!=oaH1iGM8F;`WCznPz`%nSac=^PTT2qOJUKa$ev0 zopWyQcX?|`_0N)OzM+v^bnYq>m&SynOf1F|pbPDS@O4uh{+0tvWb8$)h9wen&9eHv zby;mNZy|p*eoXf4t|W_ljp7Zm=hb4e%DRt1exS8b+)M*uQG{@nLbysHTm^`DlZdu+ zh`DAnioY!UW?LtUcS)dLPgXbiO7Bw;ihF55EQ%nmQV>@Gq+==_9#_$uT*Ezbr|Bfe z9N#CG{!1|^9;U&tC}OxuFrlw*Z!fb$5@$_dWQb935WwrEh)axy>q^Bqpn-In9G$CHx7@%ek z97;YXhb(QUC=_LgVs;u73m}TC6vfk1P*4m|+0G%3I^&e3T8ctpK@_vopjZG=T%{@+AAKonOgil?WbpctU?Jp+Jx%`-0fC(Nt5uD2VBy0e^Y?#SUD zZ-h|OVKa*j1``9ZsKUF3LNvA!W2=;uLm4zc=HJw< z7z147i~f=o9+=xbOy^!09X>14`5%XNiZx{CNRdG;V6$1+?1T~uo16jm9ah(n@sVN; zOCW!0w~?ID%*uonx(iM#IF7nT6zQm0Esbp+yVvivd)!``g#_|o#L~|ba#_T0b-P@4 ztK95%@g#(65uO+eo1l0!IG}`L(WmO?@Z-)#ACzc!EhCPN=EEFwquc0EOQV(o&PyI> zvwE97vctZ7AUC`l4miU)dSEzg0OO5tF*PoROToAqHc;b_@HQ}{ND(zmkzHVfA_df# zjTC`#DN;_2pCT`SAw~<=@HOrr=G6w`iD<}yXfA~MqF8PwTG-4xliFZI{-$QT!`8NP z2kh5^55N&hJiT5`Q?o<1dy{*894aQ7m=?mc<^r9mkD=g%#m5OudLRg*Kr_$d|EB6W(y4fgKT?DY zPvbs24LqBClseCm>xx~RBkLzz`U~l@sP77yns^10KAUjpFF!wN>m*I;nsk=}R%3NL z+MTY{Y(e1Q?ZgtutSEnks zup<&Xg6E!}Up8Hp&+>Cve(UlD!4Hj3M@7rRo#}_7K`lCj4fJkF1Qly65)XxgHn31zPb z(*Sc2g7@ zC!*Lo42mTXrMLveIy?FJ-EAiEG`=6+Z_{%8_iah{zmGDcb95RsXK)&}4l@l) z;53R`p*3)MkaQ7luqx%pT6G2|`ej!zVxB_Yfj*Z-yhyGz6TWuEC_(xz)9yBjGyGi^ z^^l0&G^B=)eQ-C9tvW#ys`ny4%5f@=*Z;FbgAEuS7I^42*$m8#D zb5&}mE}kY<(?rnS9*{kEGYr-zcX%8GwbwnsQ(9L*{lVL()BnuJ!lq!9Z)`h601_U7r3bQd-pS>F8FvPG0Vs z5a|YA52VAhJzCKOM|#p|V7e!XEWYYVr;C4j3eruY7$mLMlw0cT)>>Ds)m~lez?)Is zCI>DHCRpe&KuWI^iBYu)p6fNx>bHASNUP6!^(9;x+v6T`=Xl-z&YUv8?CJFM^9qKD zW4&F)7Kg=ES6yFQWL?flhMiswY1-`7NAaec2tFB(c-QKcNqHMvb&T69+bPiIgW0hrzPO`D0}SlrA4p_AXSqLANUeU z`xzfz$Sq%56mPGCv-@@IV91H=@MjZMr$1F0ej}J8_3*BLZOZa-td(|~#bK@ECjbln zR2|nyb>s$IC1qAy@ltwSKo`%`5hZ0dhqYEIq&Msh&>J2PB(p1jlq|jsq|(Ko0X_Yb z5ImsUFAHKWc`DSSvYkHY|pAm%NML`e+Dm{q*Q>qWalx$Cb zNfuVvEu~hPSS}u;!RH}o&?+7Rd9X_NayS)@y#e12K1M{kA)D^#gGJ**R5U$Qok6e> zMb)(?@@U)aT%-VM8?EnSeVx566Z#-d|G8AIt}r z7)CZEGK$0~h - - + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java index e3474b7c8..39fa1545a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioVendasPacotesDetalhadoBean.java @@ -81,6 +81,10 @@ public class RelatorioVendasPacotesDetalhadoBean { private SituacaoVendaPacote situacaoVendaPacote; private String numoperacionNotaCreditoPagamento; private Long voucherNotaCredito; + private String endereco; + private String cidade; + private String numero; + private String bairro; public Long getVendapacoteId() { return vendapacoteId; @@ -179,7 +183,7 @@ public class RelatorioVendasPacotesDetalhadoBean { } public String getDescLocalEnderecoApanhe() { - return StringUtils.isNotBlank(deschotel) ? deschotel : localEnderecoApanhe != null ? localEnderecoApanhe.toString() : ""; + return LocalEnderecoApanhe.NENHUM.equals(localEnderecoApanhe) ? localEnderecoApanhe.toString() : StringUtils.isNotBlank(deschotel) ? deschotel : getEnderecoCompleto(); } public String getDescSituacaoVendaPacote() { @@ -237,6 +241,64 @@ public class RelatorioVendasPacotesDetalhadoBean { } } + public String getEndereco() { + return endereco; + } + + public void setEndereco(String endereco) { + this.endereco = endereco; + } + + public String getCidade() { + return cidade; + } + + public void setCidade(String cidade) { + this.cidade = cidade; + } + + public String getNumero() { + return numero; + } + + public void setNumero(String numero) { + this.numero = numero; + } + + public String getEnderecoCompleto() { + StringBuilder sb = new StringBuilder(); + if(StringUtils.isNotBlank(getEndereco())) { + sb.append(getEndereco()); + } + if(StringUtils.isNotBlank(getNumero())) { + if(sb.length() > 0) { + sb.append(", "); + } + sb.append(getNumero()); + } + if(StringUtils.isNotBlank(getBairro())) { + if(sb.length() > 0) { + sb.append(" "); + } + sb.append(getBairro()); + } + if(StringUtils.isNotBlank(getCidade())) { + if(sb.length() > 0) { + sb.append(", "); + } + sb.append(getCidade()); + } + return sb.toString(); + } + + public String getBairro() { + return bairro; + } + + public void setBairro(String bairro) { + this.bairro = bairro; + } + } }