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

fixes bug#8885 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@68421 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucas.calixto 2017-05-02 18:17:50 +00:00
parent c3c6dcfd09
commit 4099c0e3ab
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
View File

@ -277,27 +277,24 @@ public class RelatorioVendasComissao extends Relatorio {
protected String getSqlCancelados() {
StringBuilder sQuery = new StringBuilder();
String query = "SELECT B.NUMFOLIOSISTEMA, B.CORRIDA_ID, B.FECHORVIAJE, B.NUMASIENTO, B.PRECIOPAGADO, B.FECHORVENTA, COALESCE(PV2.NOMBPUNTOVENTA, PV1.NOMBPUNTOVENTA) NOMBPUNTOVENTA, "
+ "(COALESCE (B.PRECIOPAGADO,0) + COALESCE (B.IMPORTETAXAEMBARQUE,0) + COALESCE (B.IMPORTESEGURO,0) + COALESCE (B.IMPORTEPEDAGIO,0) + COALESCE (B.IMPORTEOUTROS,0)) AS TOTAL "
+ "FROM BOLETO B "
+ "JOIN MARCA M2 ON M2.MARCA_ID = B.MARCA_ID "
+ "LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = B.PUNTOVENTA_ID "
+ "LEFT JOIN PUNTO_VENTA PV2 ON PV2.PUNTOVENTA_ID = B.PTOVTAVENTA_ID "
+ "WHERE (B.MOTIVOCANCELACION_ID IN(32, 99)) "
+ "AND B.FECHORVENTA BETWEEN CAST (:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) ";
sQuery.append("SELECT C.NUMFOLIOSISTEMA, C.CORRIDA_ID, C.FECHORVIAJE, C.NUMASIENTO, C.PRECIOPAGADO, C.FECHORVENTA, COALESCE(PV2.NOMBPUNTOVENTA, PV1.NOMBPUNTOVENTA) NOMBPUNTOVENTA, ")
.append("(COALESCE (C.PRECIOPAGADO,0) + COALESCE (C.IMPORTETAXAEMBARQUE,0) + COALESCE (C.IMPORTESEGURO,0) + COALESCE (C.IMPORTEPEDAGIO,0) + COALESCE (C.IMPORTEOUTROS,0)) AS TOTAL ")
.append("FROM CAJA C ")
.append("LEFT JOIN MARCA M ON M.MARCA_ID = C.MARCA_ID ")
.append("LEFT JOIN PUNTO_VENTA PV1 ON PV1.PUNTOVENTA_ID = C.PUNTOVENTA_ID ")
.append("LEFT JOIN PUNTO_VENTA PV2 ON PV2.PUNTOVENTA_ID = C.PTOVTAVENTA_ID ")
.append("WHERE C.INDSTATUSBOLETO = 'C' ")
.append("AND (C.MOTIVOCANCELACION_ID IN(32, 10) AND C.INDREIMPRESION = 0) ");
sQuery.append("AND C.FECHORVENTA BETWEEN CAST(:fecInicio AS DATE) AND CAST(:fecFinal AS DATE) ");
if(parametros.get("EMPRESA_ID")!= null) {
sQuery.append("AND M.EMPRESA_ID =:EMPRESA_ID ");
query += "AND M.EMPRESA_ID =:EMPRESA_ID ";
}
if (StringUtils.isNotBlank(stringLsPuntoVentaId)) {
sQuery.append("AND C.PTOVTAVENTA_ID IN(" + stringLsPuntoVentaId + ") ");
query += "AND B.PUNTOVENTA_ID IN(" + stringLsPuntoVentaId + ") ";
}
return sQuery.toString();
return query;
}