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

Merge pull request 'fixes bug#AL-4653' (!739) from AL-4653 into master 

Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/739
Reviewed-by: Célio de Souza Ribeiro JR <celio@rjconsultores.com.br>
master 1.145.7
Célio de Souza Ribeiro JR 2024-09-26 20:52:43 +00:00
parent b09364d950 9ea53d5d55
commit c77ef45113
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.145.6</version> <version>1.145.7</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

11
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesCancelados.java
View File

@ -39,6 +39,7 @@ public class RelatorioBilhetesCancelados extends Relatorio {
Map<String, Object> parametros = this.relatorio.getParametros(); Map<String, Object> parametros = this.relatorio.getParametros();
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append(" select "); sql.append(" select ");
sql.append(" mc.descmotivo, ");
sql.append(" u.CVEUSUARIO CVEBILHETEIRO, "); sql.append(" u.CVEUSUARIO CVEBILHETEIRO, ");
sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, "); sql.append(" uc.CVEUSUARIO CVEBILHETEIRO_CANCELADO, ");
sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, "); sql.append(" B.indstatusboleto IMPRESSAO_POSTERIOR, ");
@ -87,10 +88,8 @@ public class RelatorioBilhetesCancelados extends Relatorio {
sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id "); sql.append(" left join ciudad co ON co.ciudad_id = p_origen.ciudad_id ");
sql.append(" left join estado est ON est.estado_id = co.estado_id "); sql.append(" left join estado est ON est.estado_id = co.estado_id ");
sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') "); sql.append(" LEFT JOIN boleto utilizado ON (utilizado.boleto_id = b.transacaooriginal_id AND b.INDSTATUSBOLETO = 'E') ");
sql.append(" LEFT JOIN motivo_cancelacion mc ON mc.motivocancelacion_id = b.motivocancelacion_id ");
sql.append(" WHERE "); sql.append(" WHERE m.EMPRESA_ID = :EMPRESA_ID ");
sql.append(" (b.indreimpresion = 0 OR b.INDSTATUSBOLETO = 'E') ");
sql.append(" and m.EMPRESA_ID = :EMPRESA_ID ");
if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) { if (parametros.get(DATA_INICIAL) != null && parametros.get(DATA_FINAL) != null) {
if (parametros.get(TIPO_DATA) != null) { if (parametros.get(TIPO_DATA) != null) {
if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) { if ((parametros.get(TIPO_DATA).toString().equals(DATA_VENDA))) {
@ -178,9 +177,7 @@ public class RelatorioBilhetesCancelados extends Relatorio {
dataResult.put("SENTIDO", rset.getInt("SENTIDO")); dataResult.put("SENTIDO", rset.getInt("SENTIDO"));
dataResult.put("COD_LINHA", rset.getString("COD_LINHA")); dataResult.put("COD_LINHA", rset.getString("COD_LINHA"));
dataResult.put("DESC_LINHA", rset.getString("DESC_LINHA")); dataResult.put("DESC_LINHA", rset.getString("DESC_LINHA"));
if (rset.getString("STATUS_PASSAGEM") != null) { dataResult.put("DESCMOTIVO", rset.getString("DESCMOTIVO"));
dataResult.put("STATUS_PASSAGEM", IndStatusBoleto.valueOf(rset.getString("STATUS_PASSAGEM")).getValue());
}
dataResult.put("TARIFA", rset.getString("TARIFA")); dataResult.put("TARIFA", rset.getString("TARIFA"));
dataResult.put("TX_EMBARQUE", rset.getString("TX_EMBARQUE")); dataResult.put("TX_EMBARQUE", rset.getString("TX_EMBARQUE"));
dataResult.put("PEDAGIO", rset.getString("PEDAGIO")); dataResult.put("PEDAGIO", rset.getString("PEDAGIO"));

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

Binary file not shown.

11
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBilhetesCancelados.jrxml
View File

@ -1,8 +1,8 @@
<?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="RelatorioBilhetesCancelados" pageWidth="1266" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1226" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c"> <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="RelatorioBilhetesCancelados" pageWidth="1266" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1226" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="b92fb063-a827-4619-8a69-5c78e3afbb8c">
<property name="ireport.zoom" value="4.279675059165056"/> <property name="ireport.zoom" value="4.279675059165056"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="3039"/>
<property name="ireport.y" value="198"/> <property name="ireport.y" value="197"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/> <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/> <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@ -68,6 +68,7 @@
<field name="PASSAGEIRO" class="java.lang.String"/> <field name="PASSAGEIRO" class="java.lang.String"/>
<field name="DOC" class="java.lang.String"/> <field name="DOC" class="java.lang.String"/>
<field name="LOCALIZADOR" class="java.lang.String"/> <field name="LOCALIZADOR" class="java.lang.String"/>
<field name="DESCMOTIVO" class="java.lang.String"/>
<background> <background>
<band splitType="Stretch"/> <band splitType="Stretch"/>
</background> </background>
@ -330,7 +331,7 @@
<font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <font fontName="SansSerif" size="6" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/> <paragraph lineSpacing="Single"/>
</textElement> </textElement>
<text><![CDATA[Status]]></text> <text><![CDATA[Mot. Can.]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="235c8f23-9c13-48cd-ab7a-e74363424caf" stretchType="RelativeToTallestObject" x="805" y="0" width="72" height="10" isPrintWhenDetailOverflows="true"/> <reportElement uuid="235c8f23-9c13-48cd-ab7a-e74363424caf" stretchType="RelativeToTallestObject" x="805" y="0" width="72" height="10" isPrintWhenDetailOverflows="true"/>
@ -584,11 +585,11 @@
<textFieldExpression><![CDATA[$F{SENTIDO} == 0 ? "Ida" : "Volta"]]></textFieldExpression> <textFieldExpression><![CDATA[$F{SENTIDO} == 0 ? "Ida" : "Volta"]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="true"> <textField pattern="" isBlankWhenNull="true">
<reportElement uuid="27ec5d64-d949-4b02-a4a7-d6c5db93b3bd" stretchType="RelativeToTallestObject" x="877" y="0" width="30" height="12" isPrintWhenDetailOverflows="true"/> <reportElement uuid="27ec5d64-d949-4b02-a4a7-d6c5db93b3bd" positionType="Float" x="877" y="0" width="30" height="12" isPrintWhenDetailOverflows="true"/>
<textElement textAlignment="Left"> <textElement textAlignment="Left">
<font size="6"/> <font size="6"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{STATUS_PASSAGEM}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{DESCMOTIVO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="" isBlankWhenNull="true"> <textField pattern="" isBlankWhenNull="true">
<reportElement uuid="f5f01da5-4ea3-41ba-8b58-b1f7e8e70601" stretchType="RelativeToTallestObject" x="805" y="0" width="72" height="12" isPrintWhenDetailOverflows="true"/> <reportElement uuid="f5f01da5-4ea3-41ba-8b58-b1f7e8e70601" stretchType="RelativeToTallestObject" x="805" y="0" width="72" height="12" isPrintWhenDetailOverflows="true"/>

3
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesCanceladosController.java
View File

@ -41,6 +41,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendasBilheteiro; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendasBilheteiro;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendasBilheteiroSelecionados;
@Controller("relatorioBilhetesCanceladosController") @Controller("relatorioBilhetesCanceladosController")
@Scope("prototype") @Scope("prototype")
@ -86,7 +87,7 @@ public class RelatorioBilhetesCanceladosController extends MyGenericForwardCompo
lsTiposCancelamento = motivoCancelacionService.obtenerTodosEspecificos(escolhidos); lsTiposCancelamento = motivoCancelacionService.obtenerTodosEspecificos(escolhidos);
motivosCancelacionList.setData(lsTiposCancelamento); motivosCancelacionList.setData(lsTiposCancelamento);
puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro()); puntoVentaList.setItemRenderer(new RenderRelatorioVendasBilheteiro());
puntoVentaSelList.setItemRenderer(new RenderRelatorioVendasBilheteiroSelecionados());
} }
public List<Empresa> getLsEmpresa() { public List<Empresa> getLsEmpresa() {

2
web/gui/relatorios/filtroRelatorioBilhetesCancelados.zul
View File

@ -73,7 +73,7 @@
<listhead> <listhead>
<listheader <listheader
label="${c:l('relatorioBilhetesCanceladosController.lbPuntoVenta.value')}" /> label="${c:l('relatorioBilhetesCanceladosController.lbPuntoVenta.value')}" />
<listheader width="35%" <listheader width="55%"
label="${c:l('relatorioBilhetesCanceladosController.lbEmpresa.value')}" /> label="${c:l('relatorioBilhetesCanceladosController.lbEmpresa.value')}" />
<listheader width="20%" <listheader width="20%"
label="${c:l('relatorioBilhetesCanceladosController.lbNumero.value')}" /> label="${c:l('relatorioBilhetesCanceladosController.lbNumero.value')}" />