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

fixes bug#0012653 

dev: valdevir
qua: josé

Correção no filtro de empresa.

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@86973 d1611594-4594-4d17-8e1d-87c2c4800839
master
emerson 2018-11-12 13:37:48 +00:00
parent 913c39805f
commit 98af2d9197
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIntegracaoAntiFraude.java
View File

@ -52,6 +52,7 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio {
instrucaoSql.append("B.NOMBPASAJERO PASSAGEIRO ");
instrucaoSql.append("FROM BOLETO B ");
instrucaoSql.append("INNER JOIN TRANSACAO_KONDUTO TK ON B.BOLETO_ID = TK.BOLETO_ID ");
instrucaoSql.append("INNER JOIN MARCA M ON B.MARCA_ID = M.MARCA_ID ");
instrucaoSql.append("LEFT JOIN CLIENTE CLI ON B.CLIENTECOMPRADOR_ID = CLI.CLIENTE_ID ");
instrucaoSql.append("LEFT JOIN CAJA C ON B.BOLETO_ID = C.TRANSACAO_ID ");
instrucaoSql.append("LEFT JOIN CAJA_DET_PAGO CDP ON C.CAJA_ID = CDP.CAJA_ID ");
@ -60,7 +61,7 @@ public class RelatorioIntegracaoAntiFraude extends Relatorio {
instrucaoSql.append("LEFT JOIN PARADA PD ON B.DESTINO_ID = PD.PARADA_ID ");
instrucaoSql.append("WHERE B.FECHORVENTA BETWEEN :dtInicial AND :dtFinal ");
instrucaoSql.append("AND TK.STATUSTRANSACAO IN("+parametros.get("statusKondutoId").toString()+") ");
instrucaoSql.append("AND B.MARCA_ID = :empresaId ");
instrucaoSql.append("AND M.EMPRESA_ID = :empresaId ");
}
@Override

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jasper
View File

Binary file not shown.

7
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioIntegracaoAntiFraude.jrxml
View File

@ -326,6 +326,13 @@
</textElement>
<textFieldExpression><![CDATA[$V{somaValorTotal}]]></textFieldExpression>
</textField>
<staticText>
<reportElement uuid="f5133a4b-5e4a-4fbd-a009-f9c4e19455cf" x="330" y="0" width="50" height="20"/>
<textElement>
<font size="8"/>
</textElement>
<text><![CDATA[Total Geral:]]></text>
</staticText>
</band>
</summary>
<noData>

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/integracaoantifraude/EventListenerExecutarRelatorioIntegracaoAntiFraude.java
View File

@ -18,7 +18,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.EventListenerExecutarRelator
public class EventListenerExecutarRelatorioIntegracaoAntiFraude extends EventListenerExecutarRelatorio<RelatorioIntegracaoAntiFraudeController> implements EventListener {
private static final String MASCARA_DATA_COMPLETA = "dd/MM/yyyy hh:mm:ss";
private static final String MASCARA_DATA = "dd/MM/yyyy";
public EventListenerExecutarRelatorioIntegracaoAntiFraude(RelatorioIntegracaoAntiFraudeController controller) {
super(controller);
@ -80,8 +80,8 @@ public class EventListenerExecutarRelatorioIntegracaoAntiFraude extends EventLis
}
private String obtemPeriodo() {
return FormataUtil.formataDataToString((Date)getController().getDtInicial().getValue(), "", MASCARA_DATA_COMPLETA)
+" até "+FormataUtil.formataDataToString((Date)getController().getDtFinal().getValue(), "", MASCARA_DATA_COMPLETA);
return FormataUtil.formataDataToString((Date)getController().getDtInicial().getValue(), "", MASCARA_DATA)
+" até "+FormataUtil.formataDataToString((Date)getController().getDtFinal().getValue(), "", MASCARA_DATA);
}
}