fixed bug #7746
git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@58694 d1611594-4594-4d17-8e1d-87c2c4800839master
frederico
parent
aba7465577
commit
5038071a10
|
|
@ -46,6 +46,7 @@ public class RelatorioRemarcacaoDevolucao extends Relatorio {
|
|||
dataResult.put("agencia", rset.getString("agencia"));
|
||||
dataResult.put("linha", rset.getString("linha"));
|
||||
dataResult.put("servico", rset.getInt("servico"));
|
||||
dataResult.put("dataViagem", rset.getTimestamp("dataViagem"));
|
||||
if (isRemarcacao) {
|
||||
dataResult.put("dataViagemOriginal", rset.getTimestamp("dataViagemOriginal"));
|
||||
}
|
||||
|
|
@ -83,6 +84,7 @@ public class RelatorioRemarcacaoDevolucao extends Relatorio {
|
|||
sql.append("agencia.NOMBPUNTOVENTA as agencia, ");
|
||||
sql.append("linha.DESCRUTA as linha, ");
|
||||
sql.append("servico.CORRIDA_ID as servico, ");
|
||||
sql.append("boleto.FECHORVIAJE as dataViagem, ");
|
||||
sql.append(isRemarcacao ? "boletoOriginal.FECHORVIAJE as dataViagemOriginal, " : " ");
|
||||
sql.append("CASE WHEN cliente.CLIENTE_ID IS NULL THEN boleto.NOMBPASAJERO ELSE cliente.NOMBCLIENTE END as passageiro, ");
|
||||
sql.append("CASE WHEN cliente.CLIENTE_ID IS NULL THEN boleto.DESCNUMDOC ELSE cliente.NUMIDENTIFICAUNO END as documento, ");
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ detail.destino=Destino
|
|||
detail.agencia=Agência
|
||||
detail.linha=Linha
|
||||
detail.servico=Serviço
|
||||
detail.dataViagem=Data Viagem
|
||||
detail.dataViagemOriginal=Data Viagem Original
|
||||
detail.passageiro=Passageiro
|
||||
detail.documento=Doc
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ detail.destino=Destino
|
|||
detail.agencia=Agência
|
||||
detail.linha=Linha
|
||||
detail.servico=Serviço
|
||||
detail.dataViagem = Data Viagem
|
||||
detail.dataViagemOriginal=Data Viagem Original
|
||||
detail.passageiro=Passageiro
|
||||
detail.documento=Doc
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -114,6 +114,7 @@
|
|||
<field name="agencia" class="java.lang.String"/>
|
||||
<field name="linha" class="java.lang.String"/>
|
||||
<field name="servico" class="java.lang.Integer"/>
|
||||
<field name="dataViagem" class="java.util.Date"/>
|
||||
<field name="dataViagemOriginal" class="java.util.Date"/>
|
||||
<field name="passageiro" class="java.lang.String"/>
|
||||
<field name="preco" class="java.math.BigDecimal"/>
|
||||
|
|
@ -135,6 +136,7 @@
|
|||
<field name="agencia" class="java.lang.String"/>
|
||||
<field name="linha" class="java.lang.String"/>
|
||||
<field name="servico" class="java.lang.Integer"/>
|
||||
<field name="dataViagem" class="java.util.Date"/>
|
||||
<field name="dataViagemOriginal" class="java.util.Date"/>
|
||||
<field name="passageiro" class="java.lang.String"/>
|
||||
<field name="preco" class="java.math.BigDecimal"/>
|
||||
|
|
@ -215,7 +217,6 @@
|
|||
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($P{data})]]></dataSourceExpression>
|
||||
</datasetRun>
|
||||
<jr:column width="90" uuid="7c52851d-9ca3-466e-9a9a-9edbf5cb7722">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="137da473-f682-4209-8fc7-bbc60a9851bb" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -236,7 +237,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="73369793-0d88-43ab-9f2b-a7d82aea6557">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="287869c0-3b83-4be5-9a77-3a838e165e6b" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -257,7 +257,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="31cc66ac-de74-4b6b-afc0-6c8446e70ec9">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="bcf47ee4-dde6-472e-a8ba-9dcb95ead828" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -278,7 +277,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="46fa6332-955c-49ad-a298-af0efdfb0521">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="b494236c-76c4-479b-b5b4-f2e99bf5e636" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -299,7 +297,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="f0564294-2879-457d-be66-2c65118f4805">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="63be6b99-a4b3-4820-8e03-4a91932fcd6f" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -320,7 +317,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="84967c49-db8f-4cb5-bfd6-e191775555b8">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="943b0707-f849-42d5-afee-4f4523d5361a" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -341,7 +337,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="a8cb0e77-2b52-4cf8-967a-e707e33102e7">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="3dcb6050-c6e1-4eb7-835d-5ef21e11c1ad" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -362,7 +357,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="c016b561-84f8-4004-b14c-f93e028b9a4e">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="54614ac3-b675-4f4b-b16e-a093c0938165" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -382,8 +376,27 @@
|
|||
</textField>
|
||||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="90" uuid="a4c504bc-3120-455c-8e1f-145a72e327a8">
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="83acdcd3-ea46-4df6-9504-c994bb10e925" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
|
||||
<printWhenExpression><![CDATA[$V{PAGE_NUMBER}==1]]></printWhenExpression>
|
||||
</reportElement>
|
||||
<textElement markup="none">
|
||||
<font isBold="true" pdfFontName="Helvetica-Bold"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.dataViagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
</jr:columnHeader>
|
||||
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
|
||||
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
|
||||
<reportElement uuid="94cd1c11-c955-48a6-8e63-bfc0dc10cf6a" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="90" uuid="b218d2fe-8df1-4c72-8bb1-e810f674d5d9">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="aa475f49-13f6-4101-859f-3d2f3402a260" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -404,7 +417,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="90" uuid="d5e189c1-875b-402b-940e-20d8e254e085">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="dec4d559-0a21-4a7c-a854-f1a55a2c3f31" x="0" y="0" width="90" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -425,7 +437,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="f1ebd3b7-4c66-42b7-903a-6bf62cb2d34b">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="bc0152ce-9ebc-42cd-95de-88fd7679457f" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -446,7 +457,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="7a53b7d4-3bbc-494b-9f5f-8451efa5a158">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField isBlankWhenNull="true">
|
||||
<reportElement uuid="a24dc6d8-906a-4549-a372-2fb8c9f5cb49" x="0" y="0" width="61" height="30" isRemoveLineWhenBlank="true">
|
||||
|
|
@ -477,7 +487,6 @@
|
|||
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($P{data})]]></dataSourceExpression>
|
||||
</datasetRun>
|
||||
<jr:column width="90" uuid="f9ac65cb-5f28-42ab-ba30-9a36833f0b66">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="e85eadd5-58fd-4a3a-acdc-981a8ad74785" x="0" y="0" width="90" height="30"/>
|
||||
|
|
@ -495,8 +504,25 @@
|
|||
</textField>
|
||||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="90" uuid="6913094e-406d-4225-95a8-575265ef01be">
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="14cdcd85-b8b7-4e73-a05f-7e7ee87df3c3" x="0" y="0" width="90" height="30"/>
|
||||
<textElement markup="none">
|
||||
<font isBold="true" pdfFontName="Helvetica-Bold"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{detail.dataViagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
</jr:columnHeader>
|
||||
<jr:detailCell style="table 4_TD" height="20" rowSpan="1">
|
||||
<textField isStretchWithOverflow="true" pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="true">
|
||||
<reportElement uuid="0a02b65a-3ff1-4241-87b9-966f313c3574" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="90" height="20"/>
|
||||
<textElement/>
|
||||
<textFieldExpression><![CDATA[$F{dataViagem}]]></textFieldExpression>
|
||||
</textField>
|
||||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="cf9c12ab-2e1b-4f80-af3b-58e805f07c17">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="2d02763a-7550-4bbb-b444-b6a8bb1bb8c5" x="0" y="0" width="61" height="30"/>
|
||||
|
|
@ -515,7 +541,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="b4498f40-4a3d-47f1-811c-a8dfbe3eb3ff">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="9d02e5bd-0c77-4de8-937e-83683d1a24f4" x="0" y="0" width="61" height="30"/>
|
||||
|
|
@ -534,7 +559,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="325894dd-a30b-47bf-b704-86ed6f53821c">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="36b379f4-8509-4ac1-b06c-2ef4230fe869" x="0" y="0" width="61" height="30"/>
|
||||
|
|
@ -553,7 +577,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="90" uuid="bd26312a-c242-4726-9588-12306d5cab07">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="a098eece-64a6-4535-9444-7044510d4891" x="0" y="0" width="90" height="30"/>
|
||||
|
|
@ -572,7 +595,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="646acd43-a90c-4db2-98be-b5030af74b22">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="3abefbba-f547-4679-b46d-033069bfa3f0" x="0" y="0" width="61" height="30"/>
|
||||
|
|
@ -591,7 +613,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="c5f20838-c6d2-4939-bffe-c4c4fb925150">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="e20c9100-2224-48ce-a7c4-8b93f71932b8" x="0" y="0" width="61" height="30"/>
|
||||
|
|
@ -610,7 +631,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="61" uuid="7f35ff8d-ef6c-416b-b4e5-3c4368a4f7e8">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="8afd26a3-f97b-4097-ae84-dfa21b313dd1" x="0" y="0" width="61" height="30"/>
|
||||
|
|
@ -629,7 +649,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="90" uuid="44267c11-d4a4-422f-9ecb-ced2bd605986">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="1446b64b-5f3e-4c41-9b84-8165a008908f" x="0" y="0" width="90" height="30"/>
|
||||
|
|
@ -648,7 +667,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="62" uuid="eb283198-934b-4c96-aaf4-792b99aa7377">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="619e0051-d9bc-4e09-9fa3-4982466a19e1" x="0" y="0" width="62" height="30"/>
|
||||
|
|
@ -667,7 +685,6 @@
|
|||
</jr:detailCell>
|
||||
</jr:column>
|
||||
<jr:column width="62" uuid="80c7a7d7-012f-4afb-851d-7d903edffe14">
|
||||
<jr:tableHeader style="table 4_TH" height="0" rowSpan="1"/>
|
||||
<jr:columnHeader style="table 4_CH" height="30" rowSpan="1">
|
||||
<textField>
|
||||
<reportElement uuid="19b6d697-6adb-49a4-8be2-9c4d813c169c" x="0" y="0" width="62" height="30"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue