Download as
Browse Code »

Commit 487f097466d28dfe35707c751c07b85c785ce048

Authored by luis.camargo
1 parent 763e9bb5
Exists in master

redmine #4235 Correções nos relatórios;

Showing 1 changed file with 5 additions and 8 deletions   Show diff stats
cit-contratos-web/src/main/resources/reports/relatorioEventoNaoConformidade.jrxml
  Diff comments   View file @487f097
@@ -52,12 +52,12 @@ evNaoConformidade.respostacontratada as resposta @@ -52,12 +52,12 @@ evNaoConformidade.respostacontratada as resposta
52 52
53 from cnt_cn_evento as eventos 53 from cnt_cn_evento as eventos
54 54
55 -left join cnt_ev_registro_nc as evNaoConformidade on evNaoConformidade.id = eventos.id  
56 -left join cnt_tr_sancao as trSancao on trSancao.id = evNaoConformidade.tiponaoconformidade_id  
57 -left join dominio as tipoEvento on tipoEvento.id = eventos.tipoevento_id 55 +inner join cnt_ev_registro_nc as evNaoConformidade on evNaoConformidade.id = eventos.id
  56 +inner join cnt_tr_sancao as trSancao on trSancao.id = evNaoConformidade.tiponaoconformidade_id
  57 +inner join dominio as tipoEvento on tipoEvento.id = eventos.tipoevento_id
58 58
59 where eventos.contrato_id = $P{contratoId} 59 where eventos.contrato_id = $P{contratoId}
60 -and tipoEvento.chave = 'tipoEventoContrato' and tipoEvento.codigo = '7' 60 +
61 $P!{DATA_INICIAL} 61 $P!{DATA_INICIAL}
62 $P!{DATA_FINAL} 62 $P!{DATA_FINAL}
63 63
@@ -90,9 +90,6 @@ left join cnt_contrato as contrato on contrato.id = eventos.contrato_id @@ -90,9 +90,6 @@ left join cnt_contrato as contrato on contrato.id = eventos.contrato_id
90 left join dominio as tipoEvento on tipoEvento.id = eventos.tipoevento_id 90 left join dominio as tipoEvento on tipoEvento.id = eventos.tipoevento_id
91 91
92 where eventos.contrato_id = $P{contratoId} 92 where eventos.contrato_id = $P{contratoId}
93 -and tipoEvento.chave = 'tipoEventoContrato'  
94 -and tipoEvento.codigo = '7'  
95 -  
96 group by contrato.id, tipoEvento.id, eventos.id 93 group by contrato.id, tipoEvento.id, eventos.id
97 limit 1]]> 94 limit 1]]>
98 </queryString> 95 </queryString>
@@ -172,7 +169,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d @@ -172,7 +169,7 @@ $P{dataFinal} != null ? &quot;Até &quot; + new SimpleDateFormat(&quot;dd/MM/yyyy&quot;).format($P{d
172 <text><![CDATA[1. Relatórios]]></text> 169 <text><![CDATA[1. Relatórios]]></text>
173 </staticText> 170 </staticText>
174 <componentElement> 171 <componentElement>
175 - <reportElement x="15" y="40" width="534" height="30" uuid="687f8495-5035-426f-8cde-dfbd8bfae41d"> 172 + <reportElement x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="687f8495-5035-426f-8cde-dfbd8bfae41d">
176 <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.VerticalRowLayout"/> 173 <property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.VerticalRowLayout"/>
177 </reportElement> 174 </reportElement>
178 <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" whenNoDataType="AllSectionsNoDetail"> 175 <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" whenNoDataType="AllSectionsNoDetail">