diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java index 3505fbc5f..6462b8404 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java @@ -5,7 +5,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.text.ParseException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; import java.util.Collections; import java.util.Date; @@ -18,7 +17,6 @@ import java.util.TreeSet; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.utilerias.DateUtil; @@ -147,34 +145,21 @@ public class RelatorioMovimentosAtraso extends Relatorio { NamedParameterStatement stmt = null; try { StringBuilder sQuery = new StringBuilder(); - sQuery.append("SELECT DISTINCT B.PUNTOVENTA_ID, TO_DATE(B.FECHORVENTA,'DD/MM/YYYY') AS FECHORVENTA ") + sQuery.append("SELECT B.PUNTOVENTA_ID, TO_DATE(B.FECHORVENTA,'DD/MM/YYYY') AS FECHORVENTA ") .append("FROM BOLETO B ") + .append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ") .append("WHERE B.ACTIVO = 1 ") - .append("AND TO_DATE(B.FECHORVENTA,'DD/MM/YYYY') BETWEEN TO_DATE(:dataInicial,'DD/MM/YYYY') AND TO_DATE(:dataFinal,'DD/MM/YYYY') ") - .append("AND B.TIPOVENTA_ID IN (") - .append(Arrays.asList(Constantes.TPV_BOLETO_REMOTO,Constantes.TPV_MANUAL,Constantes.TPV_DIRECTO_NORMAL, Constantes.TPV_TRANSFERENCIAS).toString().replaceAll("[^0-9,]", "")) - .append(") ") - .append("AND ( ") - .append(" (B.INDSTATUSBOLETO = 'V' AND (B.MOTIVOCANCELACION_ID IS NULL OR B.MOTIVOCANCELACION_ID IN (") - .append(Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO,Constantes.MVO_CANCEL_TROCA).toString().replaceAll("[^0-9,]", "")) - .append(" ))) ") - .append(" OR ") - .append(" (B.INDSTATUSBOLETO = 'C' AND B.MOTIVOCANCELACION_ID IN (") - .append(Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO).toString().replaceAll("[^0-9,]", "")) - .append(" )) ") - .append(" OR ") - .append(" (B.INDSTATUSBOLETO = 'T' AND (B.MOTIVOCANCELACION_ID IS NULL OR B.MOTIVOCANCELACION_ID IN (") - .append(Arrays.asList(Constantes.MVO_CANCEL_CANCELACION,Constantes.MVO_CANCEL_DEVOLUCAO).toString().replaceAll("[^0-9,]", "")) - .append(" ))) ") - .append(" ) "); + .append("AND B.FECHORVENTA BETWEEN :dataInicial AND :dataFinal "); if(empresaId != null) { - sQuery.append("AND B.EMPRESACORRIDA_ID = :empresaId "); + sQuery.append("AND M.EMPRESA_ID = :empresaId "); } if(puntoventaId != null) { sQuery.append("AND B.PUNTOVENTA_ID = :puntoventaId "); } + + sQuery.append("GROUP BY B.PUNTOVENTA_ID, TO_DATE(B.FECHORVENTA, 'DD/MM/YYYY') "); log.info(sQuery.toString()); @@ -342,8 +327,8 @@ public class RelatorioMovimentosAtraso extends Relatorio { cal.set(Calendar.MONTH, Integer.valueOf(vetCompetencia[0]) - 1); cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1])); - this.dataInicial = DateUtil.getDateFromString(cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"); - this.dataFinal = DateUtil.getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy"); + this.dataInicial = DateUtil.inicioFecha(DateUtil.getDateFromString(cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy")); + this.dataFinal = DateUtil.fimFecha(DateUtil.getDateFromString(cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia, "dd/MM/yyyy")); } if(status != null) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper index 3bc1bc17e..58b7eda11 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml index f383ffe2c..1d5169a56 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioMovimentosAtraso.jrxml @@ -1,6 +1,6 @@ - +