fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#21902 

qua: Debora
dev: William

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@106438 d1611594-4594-4d17-8e1d-87c2c4800839
master
celio 2021-04-29 15:03:09 +00:00
parent cc36a13740
commit e088d39fc9
1 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasParcelamento.java
View File

@ -74,6 +74,7 @@ public class RelatorioVendasParcelamento extends Relatorio {
vendasParcelamento.setEmpresa(rset1.getString("empresa")); vendasParcelamento.setEmpresa(rset1.getString("empresa"));
vendasParcelamento.setAgencia(rset1.getString("agencia")); vendasParcelamento.setAgencia(rset1.getString("agencia"));
vendasParcelamento.setBilheteiro(rset1.getString("bilheteiro")); vendasParcelamento.setBilheteiro(rset1.getString("bilheteiro"));
vendasParcelamento.setNumOperacion(rset1.getBigDecimal("NUMOPERACION"));
vendasParcelamento.setDataVenda((Date) rset1.getObject("dataVenda")); vendasParcelamento.setDataVenda((Date) rset1.getObject("dataVenda"));
vendasParcelamento.setDataServico((Date) rset1.getObject("dataServico")); vendasParcelamento.setDataServico((Date) rset1.getObject("dataServico"));
vendasParcelamento.setLinha(rset1.getString("linha")); vendasParcelamento.setLinha(rset1.getString("linha"));
@ -109,6 +110,7 @@ public class RelatorioVendasParcelamento extends Relatorio {
rset1.close(); rset1.close();
if (lsDadosRelatorio.size() > 0) { if (lsDadosRelatorio.size() > 0) {
setLsDadosRelatorio(lsDadosRelatorio); setLsDadosRelatorio(lsDadosRelatorio);
} }
@ -130,6 +132,7 @@ public class RelatorioVendasParcelamento extends Relatorio {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(" SELECT m.DESCMARCA AS empresa, "); sql.append(" SELECT m.DESCMARCA AS empresa, ");
sql.append(" pv.PUNTOVENTA_ID AS agencia, "); sql.append(" pv.PUNTOVENTA_ID AS agencia, ");
sql.append(" c.NUMOPERACION, ");
sql.append(" u.CVEUSUARIO AS bilheteiro, "); sql.append(" u.CVEUSUARIO AS bilheteiro, ");
sql.append(" c.FECHORVENTA AS dataVenda, "); sql.append(" c.FECHORVENTA AS dataVenda, ");
sql.append(" co.FECCORRIDA AS dataServico, "); sql.append(" co.FECCORRIDA AS dataServico, ");
@ -173,9 +176,12 @@ public class RelatorioVendasParcelamento extends Relatorio {
sql.append(" AND m.empresa_id = :empresaId "); sql.append(" AND m.empresa_id = :empresaId ");
} }
sql.append(" AND c.motivocancelacion_id IS NULL "); sql.append(" AND c.motivocancelacion_id IS NULL ");
sql.append(" ORDER BY m.DESCMARCA, "); sql.append(" ORDER BY c.NUMOPERACION, ");
sql.append(" c.fechorventa ASC, ");
sql.append(" m.DESCMARCA, ");
sql.append(" pv.PUNTOVENTA_ID, "); sql.append(" pv.PUNTOVENTA_ID, ");
sql.append(" c.fechorventa ASC "); sql.append(" u.cveusuario ");
return sql.toString(); return sql.toString();