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

fixed bug #7906 - correção filtros RelatorioObservacaoConferenciaMovimento 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@62122 d1611594-4594-4d17-8e1d-87c2c4800839
master
frederico 2016-10-28 16:56:23 +00:00
parent c19e33ad29
commit 9a35465167
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java
View File

@ -61,11 +61,20 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
.append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ") .append("LEFT JOIN EVENTO_EXTRA EE ON EE.EVENTOEXTRA_ID = LOG.EVENTOEXTRA_ID ")
.append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ") .append("LEFT JOIN TIPO_EVENTO_EXTRA TEE ON TEE.TIPOEVENTOEXTRA_ID = EE.TIPOEVENTOEXTRA_ID ")
.append("WHERE LOG.ACTIVO = 1 ") .append("WHERE LOG.ACTIVO = 1 ")
.append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ") .append("AND C.DATAMOVIMENTO BETWEEN :dataInicial AND :dataFinal ");
.append("AND LOG.STATUS = :pendencia ")
.append("AND B.IMPORTETAXAEMBARQUE = :taxaEmbarque ")
.append("AND B.IMPORTEOUTROS = :outros ");
if(pendencia){
sQuery.append("AND LOG.STATUS = 1 ");
}
if (taxaEmbarque) {
sQuery.append("AND B.IMPORTETAXAEMBARQUE > 0 ");
}
if (outros) {
sQuery.append("AND B.IMPORTEOUTROS > 0 ");
}
if (credito != null){ if (credito != null){
sQuery.append("AND LOG.INDCREDITO = :credito "); sQuery.append("AND LOG.INDCREDITO = :credito ");
} }
@ -92,9 +101,6 @@ public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
} }
stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime())); stmt.setDate("dataInicial", new java.sql.Date(dataInicial.getTime()));
stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime())); stmt.setDate("dataFinal", new java.sql.Date(dataFinal.getTime()));
stmt.setBoolean("pendencia", pendencia);
stmt.setBoolean("taxaEmbarque", taxaEmbarque);
stmt.setBoolean("outros", outros);
if (credito != null){ if (credito != null){
stmt.setBoolean("credito", credito); stmt.setBoolean("credito", credito);

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

Binary file not shown.

6
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioObservacaoConferenciaMovimento.jrxml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioObservacaoConferenciaMovimento" pageWidth="1200" pageHeight="720" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1180" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4"> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioObservacaoConferenciaMovimento" pageWidth="1200" pageHeight="720" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1180" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
<property name="ireport.zoom" value="2.415765000000081"/> <property name="ireport.zoom" value="1.50000000000005"/>
<property name="ireport.x" value="1909"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/> <property name="ireport.y" value="0"/>
<style name="Crosstab Data Text" hAlign="Center"/> <style name="Crosstab Data Text" hAlign="Center"/>
<parameter name="empresa" class="java.lang.String"/> <parameter name="empresa" class="java.lang.String"/>
@ -219,7 +219,7 @@
<textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{preco}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="d1baff93-b9bd-4e66-8826-37f87ab01fd3" stretchType="RelativeToTallestObject" isPrintRepeatedValues="false" mode="Transparent" x="529" y="0" width="375" height="12" backcolor="#E6E6E6"/> <reportElement uuid="d1baff93-b9bd-4e66-8826-37f87ab01fd3" stretchType="RelativeToTallestObject" mode="Transparent" x="529" y="0" width="375" height="12" backcolor="#E6E6E6"/>
<textElement verticalAlignment="Middle"> <textElement verticalAlignment="Middle">
<font size="9" isBold="false"/> <font size="9" isBold="false"/>
</textElement> </textElement>