Download as
Browse Code »

Commit 545c0fbc2d05239647b98c46bca50c72e7cbd5e1

Authored by luis.camargo
1 parent fd331afd
Exists in master

redmine #4115 Correções

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
  Diff comments   View file @545c0fb
@@ -60,10 +60,10 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN};]]> @@ -60,10 +60,10 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN};]]>
60 <parameter name="DATA_INICIAL" class="java.util.Date"/> 60 <parameter name="DATA_INICIAL" class="java.util.Date"/>
61 <parameter name="DATA_FINAL" class="java.util.Date"/> 61 <parameter name="DATA_FINAL" class="java.util.Date"/>
62 <parameter name="DATA_FINAL_TOKEN" class="java.lang.String"> 62 <parameter name="DATA_FINAL_TOKEN" class="java.lang.String">
63 - <defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and p.datapenalizacao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression> 63 + <defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and lp.emissao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression>
64 </parameter> 64 </parameter>
65 <parameter name="DATA_INICIAL_TOKEN" class="java.lang.String"> 65 <parameter name="DATA_INICIAL_TOKEN" class="java.lang.String">
66 - <defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and p.datapenalizacao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression> 66 + <defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and lp.emissao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression>
67 </parameter> 67 </parameter>
68 <queryString> 68 <queryString>
69 <![CDATA[select c.numeroanocontrato as numanocontrato, pess.nome as contratada 69 <![CDATA[select c.numeroanocontrato as numanocontrato, pess.nome as contratada
cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml
  Diff comments   View file @545c0fb
@@ -52,10 +52,10 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN}]]&gt; @@ -52,10 +52,10 @@ where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN}]]&gt;
52 <parameter name="DATA_INICIAL" class="java.util.Date"/> 52 <parameter name="DATA_INICIAL" class="java.util.Date"/>
53 <parameter name="DATA_FINAL" class="java.util.Date"/> 53 <parameter name="DATA_FINAL" class="java.util.Date"/>
54 <parameter name="DATA_FINAL_TOKEN" class="java.lang.String"> 54 <parameter name="DATA_FINAL_TOKEN" class="java.lang.String">
55 - <defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and p.datapenalizacao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression> 55 + <defaultValueExpression><![CDATA[( $P{DATA_FINAL} != null ? " and r.datarepactuacao <= '" + $P{DATA_FINAL} + "'" : "" )]]></defaultValueExpression>
56 </parameter> 56 </parameter>
57 <parameter name="DATA_INICIAL_TOKEN" class="java.lang.String"> 57 <parameter name="DATA_INICIAL_TOKEN" class="java.lang.String">
58 - <defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and p.datapenalizacao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression> 58 + <defaultValueExpression><![CDATA[( $P{DATA_INICIAL} != null ? " and r.datarepactuacao >= '" + $P{DATA_INICIAL} + "'" : "" )]]></defaultValueExpression>
59 </parameter> 59 </parameter>
60 <queryString> 60 <queryString>
61 <![CDATA[select c.numeroanocontrato as numanocontrato, pess.nome as contratada 61 <![CDATA[select c.numeroanocontrato as numanocontrato, pess.nome as contratada