From 5eb39c958b458a36c1d1235d49a5efca01acdcec Mon Sep 17 00:00:00 2001
From: wilian <wilian@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 10 Oct 2016 17:36:31 +0000
Subject: [PATCH] fixes bug #8086

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@61437 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioVendasPacotesBoletos.java   |  36 +++++++++++++++---
 ...elatorioVendasPacotesBoletos_es.properties |   1 +
 ...torioVendasPacotesBoletos_pt_BR.properties |   1 +
 .../RelatorioVendasPacotesBoletos.jasper      | Bin 29228 -> 30009 bytes
 .../RelatorioVendasPacotesBoletos.jrxml       |  10 ++++-
 ...latorioVendasPacotesBoletosController.java |  13 +++++++
 .../filtroRelatorioVendasPacotesBoletos.zul   |  14 +++++++
 7 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java
index 893e04dd9..1d2bceabe 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java
@@ -24,6 +24,9 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioVendasPacotesBoletos extends Relatorio {
 	
 	private static Logger log = Logger.getLogger(RelatorioVendasPacotesBoletos.class);
+	
+	public static final Integer VENDIDOS = 1;
+	public static final Integer CANCELADOS = 0;
 
 	private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 	
@@ -38,6 +41,7 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 	private Integer destinoId;
 	private Integer usuarioId;
 	private Integer tipoTarifaPacoteId;
+	private Integer situacaoBilheteId;
 	
 	public RelatorioVendasPacotesBoletos(Map<String, Object> parametros, Connection conexao, final String... nomeSubReporte) throws Exception {
 		super(parametros, conexao);
@@ -57,11 +61,17 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 				destinoId = parametros.get("destinoId") != null && !parametros.get("destinoId").equals("null") ? Integer.valueOf(parametros.get("destinoId").toString()) : null;
 				usuarioId = parametros.get("usuarioId") != null && !parametros.get("usuarioId").equals("null") ? Integer.valueOf(parametros.get("usuarioId").toString()) : null;
 				tipoTarifaPacoteId = parametros.get("tipoTarifaPacoteId") != null && !parametros.get("tipoTarifaPacoteId").equals("null") ? Integer.valueOf(parametros.get("tipoTarifaPacoteId").toString()) : null;
+				situacaoBilheteId = parametros.get("situacaoBilheteId") != null && !parametros.get("situacaoBilheteId").equals("null") ? Integer.valueOf(parametros.get("situacaoBilheteId").toString()) : null;
 				
 				Connection conexao = this.relatorio.getConexao();
 				processarVendasPacote(conexao);
-				processarVendasAvulsas(conexao);
-				processarVendasAvulsasCancelados(conexao);
+				
+				if(situacaoBilheteId == null || !CANCELADOS.equals(situacaoBilheteId)) {
+					processarVendasAvulsas(conexao);
+				}
+				if(situacaoBilheteId == null || CANCELADOS.equals(situacaoBilheteId)) {
+					processarVendasAvulsasCancelados(conexao);
+				}
 				processarVendasPacoteTotais();
 				
 				setNomeSubReporte(nomeSubReporte);
@@ -76,7 +86,7 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 		NamedParameterStatement stmt = null;
 		
 		try {
-			stmt = carregarNamedParameterStatementVendasPacotes(conexao, false);
+			stmt = carregarNamedParameterStatementVendasPacotes(conexao);
 			rset = stmt.executeQuery();
 	
 			if(lsDadosRelatorio == null) {
@@ -162,8 +172,8 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 		return relatorioVendasPacotesBoletosBean;
 	}
 
-	private NamedParameterStatement carregarNamedParameterStatementVendasPacotes(Connection conexao, boolean cancelados) throws SQLException {
-		String sql = getSqlVendasPacotes(cancelados);
+	private NamedParameterStatement carregarNamedParameterStatementVendasPacotes(Connection conexao) throws SQLException {
+		String sql = getSqlVendasPacotes();
 		log.info(sql);
 		
 		NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
@@ -195,11 +205,14 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 		if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) {
 			stmt.setInt("tipoTarifaPacoteId", tipoTarifaPacoteId);
 		}
+		if(situacaoBilheteId != null) {
+			stmt.setInt("situacaoPacote",SituacaoVendaPacote.CANCELADO.getShortValue());
+		}
 		
 		return stmt;
 	}
 
-	protected String getSqlVendasPacotes(boolean cancelado) {
+	protected String getSqlVendasPacotes() {
 		StringBuilder sQuery = new StringBuilder();
 		
 		sQuery.append("SELECT DES.CVEPARADA AS CVEDESTINO, ORI.CVEPARADA AS CVEORIGEM, ORI.DESCPARADA AS ORIGEM, DES.DESCPARADA AS DESTINO, R.NUMRUTA, R.DESCRUTA, PC.NOMCONVENIO, TTP.DESCTIPOTARIFA, VP.SITUACAO, ")
@@ -254,6 +267,17 @@ public class RelatorioVendasPacotesBoletos extends Relatorio {
 		if(tipoTarifaPacoteId != null && tipoTarifaPacoteId > 0) {
 			sQuery.append("AND TTP.TIPOTARIFAPACOTE_ID = :tipoTarifaPacoteId ");
 		}
+		
+		if(situacaoBilheteId != null) {
+		}
+		
+		if(situacaoBilheteId != null && !CANCELADOS.equals(situacaoBilheteId)) {
+			sQuery.append("AND VP.SITUACAO <> :situacaoPacote ");
+		}
+		
+		if(situacaoBilheteId != null && CANCELADOS.equals(situacaoBilheteId)) {
+			sQuery.append("AND VP.SITUACAO = :situacaoPacote ");
+		}
 
 		sQuery.append("GROUP BY DES.CVEPARADA, ORI.CVEPARADA, ORI.DESCPARADA, DES.DESCPARADA, R.NUMRUTA, R.DESCRUTA, PC.NOMCONVENIO, TTP.DESCTIPOTARIFA, VP.SITUACAO, 'PACOTE' ")
 			  .append("ORDER BY DES.CVEPARADA, ORI.CVEPARADA, ORI.DESCPARADA, DES.DESCPARADA, R.NUMRUTA, R.DESCRUTA, PC.NOMCONVENIO, TTP.DESCTIPOTARIFA, VP.SITUACAO, 'PACOTE' ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties
index af32ee071..e82996bf4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_es.properties
@@ -16,6 +16,7 @@ cabecalho.origem=Origem:
 cabecalho.destino=Destino:
 cabecalho.usuario=Usuário:
 cabecalho.tipoTarifaPacote=Tipo Tarifa:
+cabecalho.situacaoBilhete=Situação:
 label.empresa=Empresa:
 label.trecho=Trecho:
 label.cancelados = - CANCELADOS
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties
index 829f9c49a..02bf53593 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasPacotesBoletos_pt_BR.properties
@@ -16,6 +16,7 @@ cabecalho.origem=Origem:
 cabecalho.destino=Destino:
 cabecalho.usuario=Usuário:
 cabecalho.tipoTarifaPacote=Tipo Tarifa:
+cabecalho.situacaoBilhete=Situação:
 label.empresa=Empresa:
 label.trecho=Trecho:
 label.cancelados=- CANCELADOS
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jasper
index 0b285766a3a5fa4684aa95b4aba4be59db16a292..4347f63525063f7f82abd5ab8d596391b71cc224 100644
GIT binary patch
delta 8584
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
Jq#oB2_diT?0_Ok#

delta 7748
zcmcgx3wRXO6+UMIWV0Dw3E`3O2pD;6LXzeECL!5KAlVH`h$KM5k}OGV*o0(*7L~yl
zYD-19wOV{zm6n2_k)#MJwWUREMSN1N+FIY$qPDfRwb=j8on$j)ThvnXanJnopELKI
zd*_~e?kor1<K1uYzMF^hz_we4JEAyV+%swi4{FOwK9@PJZO!O+qIpc4Z^9=rz1Pu3
z&Jo)uZ%bGlBF>bz`5}sOr<-t5+l(of^h#Jpbm5<fn54S0sYzb^;_(?pW9mZGt0?<C
z4;Xr}sYNQfj5o@=m16cx4~#FH=}oMUWF?J4;@z2ZVKi=5LE^gqZ1kO3(&))qKCTl<
zvv>1NqG?p3czt$O$}O@NQ|vH<pmL%kc}@81QrserFNp7>48`$zU2t1={4m8zb2$Q9
z)%oBKarYcICy0--<Hfsk-sIil*xVy2`(>Y|xG#b;r8S*(LO8Rabf#cWXZH!iJ6$*z
zCWzJZKWB%yZSHV!a&gQMl4GC&(&;hzlp51saa-1{DKALY6vrckqO@ixoe-f|5TT4x
zu&D_zG1wRkoHqL7A|q#__%ORdxA`qwkjZT#IB#sq8`8TeUXS2iX-)5)5Z)~)Cqh9v
zAp5Mp4!^hCeZG`alJc?iW{M9ZcvD)_TPK7!3rcSa_Vo6l*qgh{?k(UcNr{3t%@o|z
zn^HuH(cbvQ%23&?=(g%C8>Og>pg4Wp8k_T7oA+&dG^g@PQU=LrOc56$8l^R(Q7}R@
z-4(WIEJcrK;$$@27d~qb=Cy?-DHCNdrbvwtjMAFHC>SA_?h0ElmZC>6spi!DKL0X%
zG{HqBDf47BrkE2U8l^R(Q7}R@-4(WIEJcrK=9tkmEf)4@`WKX>_+&JuD2xz|(wfmI
z7$KVO3R^UmqDM4^W;6o}tHlTNWB9tZ5k8H%KqMCpg`8P5UO%V$iBk_fLPY7jOsp+B
zCt=!j_vC5QGp9|RIlXF1=H#iF?r36>zG7_KlSQ#w+sDP(QN|>i?4({aRj1z6Cx$ed
zu2Zx^Gj(z(G+U<_h34wyRA|0Vu?l7Dq$`x8Q(uKVI`vcNJe~S0l&{kOg%;~HP$8pG
zr#J<DI>jrrM5jRtmFSe9&{CZSD|Eh2Lli34X{bWWbsDD7N}UoFs?sS*A-_(;6{^;0
zghBzGMgkcaajj0H6j`rRvO?d`X|zIXbsD2kqfX~2v`(iKg<5nvSD{v&#wv87PU95%
zrcUE&f}GWhb#f_msZOa189Jq9&_t=eOs8~(uF%QiuF@$}aaZf)R_I#s?)e+0Uq@S=
zc<6d2XMM0flvf{Us6imx6)l(?k}mT%gS<hJ-(yM=*-H|KxE*v8Q{M~x>-`z6q56i5
zLVr^<?GR5cbI0C7x5m=VbQ@EqaIY9A(#vCe-Ju>#@;T@(Jhv#jq{vfTRqQG96_+~b
zZl?ah#$12MUmR%ghZ>vf8y$2n(*R{qRhnPusjBdKJr4RIQ*>)ftKT%)#UhwKc(j9d
zGwDqMa5ar(fnbf_LH9BB2{nfN^(_wCCtfX2On88)pVeQE&s*wQ2FDMIz7<1<wKK(8
zn%wNt?5Yyq(&8NW`iYoVF^V4&l@-Hs4k4OQeN$s8Jg@N=`Kud40S7%2j<GO%Syhg2
zsTaK-4zs16!lHugQcsD49uvnZ5{#eAxS9jibr|6<FcX&F0$)yc0bCvphf<bbT)H&7
zAiu&>?4T!@VoNYrReAZIf?V|WtFVufoZ|eV(gF`WKgBdKJVvi4r!?Q^b<oprnwMWt
z>M0)Rpl2|HHG!5;eGnl$$Ko~D&?pDJAhs?~%sc^IU~N-#paoO-5}v}Vs12-j&~Fi{
zHNl-@f0b#l$SNN^$U(ou5^8B(-5h9YY?jmVItxx7k6z!vHsPN37J`Sz>MpPEz+Mt&
z??DH>2LpL5tnw}`Tp)-0K2wIdb`Gs@F8mXG=lBYi7J9q%AL4y?jnka-kI|*sh4l{p
z0t@RQi}^(KTY26*`X{EyT(%AVU~NWzFchc_G)L3Fn0k%RpHQaLB>LP*rx?fAe%1cf
zfogw4U1NH%ac#iCnh-19DZRKi@`n4sAiVyucmvVwaB>Vyl@oJ+<>0hvjz#DV=%gXN
zb5^-8UR>CJNvOF#SR2j#g{yL^dmzU-c>u>VC5$gP-DtKM949zg=fMas*}+4_^_8<6
ziJT<4;o_Of6vs#&<)k|~S)9Vn7(Pd8QiQ82$ruaA;Q?7Mmd7(iC1;>77v?3b?tE38
zW}`bZkJFhF!`3|#gEN_ig!OXe=*UfL>F^|RvMQm^6epcTpw3n9vP7OP1D%1F7JjM*
zGd>H9nm{XQc#f0a=46aN!@={JhK653aiFEKwYfU5pfy<2fR~Xiwynxa$g#bqg8G(F
zG<(Ebt4797;`5xG%L|#t3xA&xBF*1-;36!ewJo)H-*Pu{pd>ExkL>G{lX{Yir0XKl
z>UWJQRm@VDmzYlT>Kg*s>opWXB3IiZ{scBA0BUl>Hm}&O&1)J>G_TmH%`5h4^NL;C
zykd{W)q(Ygq6#?$Us5-t9|rrPtAnPwct6dMVwMzhq?ji~mJ|!5$dw|`kaD3Ei=-%!
z!Yf6Q6va}MN>L`oGASygSRqBF6sx3IEk%tKYow@?;sPleqzFpUBt^3nAt}~NagmE>
z?57P9ULwUtDK<%QxfEAQu~~|1r1;kT7#!2LAs?VLF}P;05r_LN^c^(;m;^Pm16-*c
zw9S>)LEm*v?4TRN&&8QD@5TAUhqFZyP76!$3~HR}A*we;;hwaBD>d%>2k3T<4%40Z
zC+9LX?gutzmMhhWyT?Y&fzeJIGY`y<Y)lrIAKRD(VD{LUTrhiWOdgo~ZOlS2Mw^XV
z1ZuyHDFD-9W4vGv*q9<P2W?C-n1^jlDVRrXOc|J;8a8SfsGr%G3NS}(%nC5Sv@w-n
z9=9>8z&vSVR)hJqji~{1?10hz4Xpun+-6h<=2;ta0hs4)Oaqt~ZA=i%Z){8xn3ru#
zGniKnkkM^{gh0J!Gg=Sk_crDtFn_Qy8^UYzI-K|jKQhEo1x|d+X&SAdg|rfPmDE60
z@;3y!p8Rwdt)>U5ntnkw2A!Y)y+>>4Gpgl&RL99w&y(l^&ZTc~88vVnt>q0A<So?5
zw^0-CqjmfkHS=@S!f#QCKc!a9N$a)YbfK0`7in4aO|6(VXf<>(5&@??E47xZ#GvUI
z!JF0y-ac&5+cI-g<KFF}B(o9BA8pL0@Gw;hUV&j=iD6!aVQz*e933rBS6iNzqmvJ;
zPEH=ClX6c;jr+*P7*~S&vyIve=C3y98ZdveG2J#2oZm6&*CCp%h~|1kvkjBJ9g{8)
z&!_Zv#P$zZ^upa|a+i(z9&i-4h$px($=C&O1Zw%0fEGYohjuC2wP-h>-HEmb?Espz
zeH!g$Y-DiEZZrc8{qXa$4xo9_wxI1m+l%(_K{{35tAn|4r*?ify!ap)U5fcq5v7bK
zcQYE-jZf;v_wU9>x#BshoudnP@}~zmro4llfFB%Wy&Rf;(ENl4b?}gQ#vyow>p^O6
z=h26GKsy^F+WB1AK4#gD>uH<UX=|C@XqisvX&UM>jptP9DV`_73aHC-Lzju^*x-Dt
zyNsUQEwJ12NXyjS)3nTPN`JOYC-*d6-`&(G+(}0*+o?TmFK_2*hv`&1&$I>*&$D6G
zeL!Iob3nAg>TPb%-Zr)KJag7D9a-u{7#q7d_4pjTof&3?3lLiRLC!4)bBSq{*TMN9
zhk@8&nk>d$EGD@Sz6#U!VeP5n`VhVk3EyTK-AZ*>zU#2%gy>!@>YcQSevE~^8%1{?
z7PoOf-9-Cg(oT2NLs;bpK|hL>ewYr?&#~H%&{29EEB*<3mY%|@KSr<8vsn4h;RJjF
ztN%AVg<e4hyvmp3dtev+f%o9_^gO-8C+K}-!v|UveT0noSX)A$AS?c+ZKZ!AGd|O9
zWn_oJtUbWJwTHQnc9@;oQO1FQy=TbUvzN5SSIXM6m$Zg_b6+}Z&tB3RSW90%YtLTN
z8fqI-1Ny>Qd&Z<)a^|E}CdSM!lC{OBWi67{qRx=Cu=?*wYn-07oP=-A5jY2oMx7sn
z`aYH}<#Du$Q|Vexqb;0CHz4h9;;H!jn}(lMX3-v=P5XF09pEfFgmc3Y_TUGGeEb}+
z2&w9&m)VE(EWwv-DaY_Kc5^vT;gxJ~B^#IXYTm`wyoYP~d9LFV+<<S8wOSOf)4bfQ
zE#dXr7QRs1$`@-p_!4C8CT%ZYhNQg;NxK<I`z<8xb|h`dS4mow&abP~Moe1c>npVp
zlh&}6<^OA`jhM8Cbs+c}N^QiXHM$N4sH0_P&RWalizMyor8Z)v#r}&O=zlG>^241`
zY8j=LQEC~bmQiXMrIt}@acIARQE3^KmQiULm6lOy`B4K|i&D!dwTx2BD7B1I%P6&s
zQp+f{j8coVbTdjVqtr4=Eu+*jN-d+*GD<C@)G|sfqtr4=Eu+*jN-d+*GD@w6QmdiT
tYN)gtDy@b}tI0|`=6rczB@R(Sm3vCh{{jfnB;k%8F7EKfh_u$e{|1D13G)B|

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jrxml
index 31ebdbb96..bcc6b3211 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasPacotesBoletos.jrxml
@@ -17,6 +17,7 @@
 	<parameter name="tipoTarifaPacote" class="java.lang.String"/>
 	<parameter name="periodoPacote" class="java.lang.String"/>
 	<parameter name="periodoVenda" class="java.lang.String"/>
+	<parameter name="situacaoBilhete" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -27,7 +28,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="142" splitType="Stretch">
+		<band height="160" splitType="Stretch">
 			<textField>
 				<reportElement x="0" y="0" width="620" height="20" uuid="43b2c28d-4760-4890-b00d-25e931e79c74"/>
 				<textElement markup="none">
@@ -84,6 +85,13 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$R{cabecalho.periodoPacote} + " " + $P{periodoPacote}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="0" y="140" width="802" height="20" uuid="10191622-490c-4eb8-800c-efe85abed02b"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$R{cabecalho.situacaoBilhete} + " " + $P{situacaoBilhete}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java
index 7066bf2ee..f9829b7fb 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasPacotesBoletosController.java
@@ -20,6 +20,7 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.ComboitemRenderer;
 import org.zkoss.zul.Datebox;
+import org.zkoss.zul.Radio;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Parada;
@@ -67,6 +68,9 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom
 	private MyComboboxParada cmbParadaDestino;
 	private MyComboboxParadaCve cmbParadaDestinoCve;
 	private MyComboboxUsuario cmbUsuario;
+	private Radio rTodos;
+	private Radio rVendidos;
+	private Radio rCancelados;
 
 	public List<Empresa> getLsEmpresa() {
 		return lsEmpresa;
@@ -189,6 +193,15 @@ public class RelatorioVendasPacotesBoletosController extends MyGenericForwardCom
 			parametros.put("tipoTarifaPacote", tipoTarifaPacote.getDesctipotarifa());
 		}
 		
+		parametros.put("situacaoBilhete", "Todos");
+		if(rVendidos.isChecked()) {
+			parametros.put("situacaoBilhete", "Vendidos");
+			parametros.put("situacaoBilheteId", RelatorioVendasPacotesBoletos.VENDIDOS);
+		} else if(rCancelados.isChecked()) {
+			parametros.put("situacaoBilhete", "Cancelados");
+			parametros.put("situacaoBilheteId", RelatorioVendasPacotesBoletos.CANCELADOS);
+		}
+		
 		Relatorio relatorio = gerarRelatorioVendaPacotesBoletos(parametros);
 		
 		Map<String, Object> args = new HashMap<String, Object>();
diff --git a/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul b/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul
index 07529f25b..ae9e43020 100644
--- a/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul
+++ b/web/gui/relatorios/filtroRelatorioVendasPacotesBoletos.zul
@@ -92,6 +92,20 @@
 						format="dd/MM/yyyy" lenient="false"
 						maxlength="10" />
 				</row>
+				
+				<row spans="1,3">
+					<label
+						value="${c:l('relatorioVendasPacotesBoletosController.lbSituacaoBilhete.value')}" />
+					<radiogroup>
+						<radio id="rTodos"
+							   label="${c:l('relatorioVendasPacotesBoletosController.lbSituacaoBilheteTodos.value')}"
+							   checked="true"/>
+						<radio id="rVendidos"
+							   label="${c:l('relatorioVendasPacotesBoletosController.lbSituacaoBilheteVendidos.value')}"/>
+						<radio id="rCancelados"
+							   label="${c:l('relatorioVendasPacotesBoletosController.lbSituacaoBilheteCancelados.value')}"/>
+					</radiogroup>
+				</row>
 			</rows>
 		</grid>
 		<toolbar>