Redmine #4105 Alterando relatórios para mostrar última data final do contrato e valor total do mesmo

geovane.filho
1 parent 4a4946eb
Showing 7 changed files with 35 additions and 20 deletions Show diff stats
cit-contratos-web/src/main/resources/reports/cronogramaExecucao.jrxml
cit-contratos-web/src/main/resources/reports/encerramentoContrato.jrxml
cit-contratos-web/src/main/resources/reports/eventoAditivo.jrxml
cit-contratos-web/src/main/resources/reports/eventoEmpenho.jrxml
cit-contratos-web/src/main/resources/reports/eventoRepactuacao.jrxml
cit-contratos-web/src/main/resources/reports/eventoRescisaoContrato.jrxml
cit-contratos-web/src/main/resources/reports/registroOcorrencia.jrxml
@@ -58,7 +58,11 @@
 	</parameter>
 	<parameter name="OBSERVACAO_NAO_APLICA" class="java.lang.Boolean"/>
 	<queryString>
-		<![CDATA[SELECT CE.CODIGO, C.NUMEROANOCONTRATO, C.DATAVIGENCIAINICIAL, C.DATAVIGENCIAFINAL, PE.NOME AS CONTRATADO, C.VALORCONTRATO
+		<![CDATA[SELECT CE.CODIGO, C.NUMEROANOCONTRATO, C.DATAVIGENCIAINICIAL,
+	(CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND aditivodeprazo = true) ELSE C.datavigenciafinal END) AS dataFinal, PE.NOME AS CONTRATADO,
+	(C.VALORCONTRATO +
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) AS valorTotalContrato
 	FROM cnt_cronogramaexecucao CE
 		INNER JOIN cnt_contrato C ON C.ID = CE.CONTRATO_ID
 		INNER JOIN FORNECEDOR F ON F.ID = C.FORNECEDOR_ID
@@ -69,9 +73,9 @@
 	<field name="codigo" class="java.lang.String"/>
 	<field name="numeroanocontrato" class="java.lang.String"/>
 	<field name="datavigenciainicial" class="java.sql.Timestamp"/>
-	<field name="datavigenciafinal" class="java.sql.Timestamp"/>
+	<field name="datafinal" class="java.sql.Timestamp"/>
 	<field name="contratado" class="java.lang.String"/>
-	<field name="valorcontrato" class="java.math.BigDecimal"/>
+	<field name="valortotalcontrato" class="java.math.BigDecimal"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -198,7 +202,7 @@
 						<rightPen lineWidth="1.0"/>
 					</box>
 					<textElement textAlignment="Left" verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA[$F{datavigenciafinal}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{datafinal}]]></textFieldExpression>
 				</textField>
 			</frame>
 			<frame>
@@ -256,7 +260,7 @@
 						<rightPen lineWidth="1.0"/>
 					</box>
 					<textElement textAlignment="Left" verticalAlignment="Middle"/>
-					<textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{valortotalcontrato}]]></textFieldExpression>
 				</textField>
 			</frame>
 		</band>
@@ -2,7 +2,7 @@
 <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="encerramentoContrato" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
 	<property name="ireport.zoom" value="1.3636363636363635"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="781"/>
+	<property name="ireport.y" value="686"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -32,7 +32,12 @@
 	</parameter>
 	<queryString>
 		<![CDATA[SELECT encerramento.numTermo, encerramento.dataemissao AS dataemissao, c.numeroAnoContrato AS numAnoContrato, dTipoContrato.descricao AS tipoContrato, dAquisicao.descricao AS tipoAquisicao, c.numeroProcesso AS numProcesso,
-	c.dataCelebracao, c.datavigenciainicial, c.datavigenciafinal, c.valorContrato, pesForn.nome AS contratada, pesJForn.cnpj AS cnpjContratada, org.nome AS contratante, encerramento.introducao, encerramento.motivo,
+	c.dataCelebracao, c.datavigenciainicial,
+	(CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) ELSE c.datavigenciafinal END) AS datavigenciafinal,
+	(c.VALORCONTRATO +
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) AS valorContrato,
+	pesForn.nome AS contratada, pesJForn.cnpj AS cnpjContratada, org.nome AS contratante, encerramento.introducao, encerramento.motivo,
 	encerramento.encaminhamentos, encerramento.pendencias, encerramento.decisao, c.objetoContratacao, encerramento.dataEmissao AS dataEncerramento
 	FROM cnt_encerramentocontrato AS encerramento
 	INNER JOIN cnt_contrato c ON c.id = encerramento.contrato_id
@@ -48,7 +48,9 @@
 	dominioObjeto.descricao as tipoObjeto,
 	c.numeroAnoContrato AS numanocontrato,
 	c.numeroProcesso AS numeroProcesso,
-	c.valorcontrato as valorContrato,
+	(c.VALORCONTRATO +
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
 	pesForn.nome AS contratada,
 	pesJForn.cnpj AS cnpjcontratado,
 	c.objetocontratacao As objetocontrato,
 <?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="encerramentoContrato" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
-	<property name="ireport.zoom" value="3.0"/>
+	<property name="ireport.zoom" value="1.8627639691774651"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="440"/>
+	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -41,7 +41,9 @@
 	dominioCategoria.descricao as categoria,
 	c.numeroAnoContrato AS numanocontrato,
 	c.numeroProcesso AS numeroProcesso,
-	c.valorcontrato as valorContrato,
+	(C.VALORCONTRATO +
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
 	pesForn.nome AS contratada,
 	pesJForn.cnpj AS cnpjcontratado,
 	c.objetocontratacao As objetocontrato,
@@ -69,9 +71,7 @@ LEFT JOIN cnt_cn_envolvido gestor ON (gestor.contrato_id = c.id AND gestor.papel
 	LEFT JOIN parceiro_colaborador cPreposto ON cPreposto.id = preposto.envolvido_id
 	LEFT JOIN pessoa pesPreposto ON pesPreposto.id = parPreposto.pessoa_id
  
-WHERE EMPENHO.ID = $P{EMPENHO_ID};
-
-]]>
+WHERE EMPENHO.ID = $P{EMPENHO_ID};]]>
 	</queryString>
 	<field name="numeroempenho" class="java.lang.String"/>
 	<field name="valorempenhado" class="java.math.BigDecimal"/>
@@ -38,8 +38,10 @@
 	c.numeroProcesso AS numeroProcesso,
 	c.datacelebracao AS dataCelebracao,
 	c.datavigenciainicial AS dataVigenciaInicial,
-	c.datavigenciafinal AS dataVigenciaFinal,
-	c.valorcontrato as valorContrato,
+	(CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) ELSE c.datavigenciafinal END) AS dataVigenciaFinal,
+	(c.VALORCONTRATO +
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
 	pesForn.nome AS fornecedorContratada,
 	pesJForn.cnpj AS cnpjFornecedorContratada,
 	c.objetocontratacao AS objetoContrato,
@@ -99,8 +99,10 @@ order by dataevento]]&gt;
 	c.numeroProcesso AS numeroProcesso,
 	c.datacelebracao as datacelebracao,
 	c.datavigenciainicial as vigenciainicial,
-	c.datavigenciafinal as vigenciafinal,
-	c.valorcontrato as valorContrato,
+	(CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) ELSE c.datavigenciafinal END) as vigenciafinal,
+	(c.VALORCONTRATO +
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
+		(CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
 	pesForn.nome AS contratada,
 	pesJForn.cnpj AS cnpjcontratado,
 	c.objetocontratacao As objetocontrato,
@@ -2,7 +2,7 @@
 <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="registroOcorrencia" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="e3539b84-00a7-49ab-94ac-e56c384a5198">
 	<property name="ireport.zoom" value="1.4641000000000013"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="428"/>
+	<property name="ireport.y" value="332"/>
 	<property name="com.jaspersoft.studio.data.sql.tables" value="cGFyY2Vpcm9fY29sYWJvcmFkb3IgLDE1LDExODMsZTFiNzExOWItN2ZhZi00NDA4LTk2MzgtOTI5&#xA;ZTJmMjIzMjVmO3BhcmNlaXJvIEFTICwyMjcsMTUsOWViMzc4NzgtMTY4Yy00ODg4LWI2YzktZDBm&#xA;OTJmYmZlMjVlO2N0cnRfZW52b2x2aWRvICw1ODcsMTYxMywxM2NlMDk4Yi1jNmVmLTQ0M2YtOGIy&#xA;Yi0yMmRhNWZmZjMzNWE7Y3RydF9jb250cmF0byBBUyAsODM1LDU2MyxjNjM1NzE0YS0yMDhiLTQ1&#xA;NDUtOGYzMC04YWY4ZGRkYzg4Njk7Zm9ybmVjZWRvciBBUyAsMTI0MCw0NTcsNDNkM2RlMTQtMjdm&#xA;MS00ODMwLWI2ZTQtZmIxZjYxZTlhNmY3O3Blc3NvYSAsMjI3LDEyODksZWEyZGMzNzEtZDI4Yi00&#xA;YWJlLWIwMGYtMjc1MjRjNmQyMzM5O3JvX3JlZ2lzdHJvb2NvcnJlbmNpYSBBUyAsNTg3LDEyMSwx&#xA;YWMxZjE4NS05ZjU4LTQ2NzItODQxMC04ZmMyMDQyMTVjZDQ7cGVzc29hanVyaWRpY2EgQVMgLDM5&#xA;NCwxMjEsMzE2NzVmY2QtOGY1Yi00YjI0LWE4MzAtOWY0Y2U3ZTAyZDM5O3BhcmNlaXJvICwzOTQs&#xA;ODAyLGQxYzQ0MWQ1LWQ4OTItNDAyMS1iMWE4LWU1NGE3NWQzNWVlNTtwYXJjZWlyb19jb2xhYm9y&#xA;YWRvciAsMTUsNjk2LGIwNTZkMjkxLTE5NzktNGZhYi04OGZlLTI2NzM5NTEwODRmYTtvZl9vcmRl&#xA;bWZvcm5lY2ltZW50byBBUyAsODM1LDEyMSwzYjFkZjkzOS1jYWQ2LTQyOTktOTM0OS1mZDVhYzlk&#xA;Yzg2OWI7Y3RydF9lbnZvbHZpZG8gLDU4Nyw2ODMsNjUxOTBkOGEtMWQ2Yi00YmQ2LTk3ZWQtZjU1&#xA;OGMxNDM0MWQ5O3BhcmNlaXJvICwzOTQsMTI4OSxjNDBlNWNiNS02MzA2LTQ5MGMtYjVkZC00OGJj&#xA;YmE2NjFiMzE7cGFyY2Vpcm9fY29sYWJvcmFkb3IgLDE1LDIxMzYsM2UyZGMxN2ItM2MyZC00MWJl&#xA;LWI1YTctNmEyZmEyNGRlNWZjO3Blc3NvYSAsMjI3LDgwMiwxOGU4YWQwZi01YTMxLTQxNjItOTFl&#xA;OC1kMDA5YThmNDI3NDA7cGVzc29hICwyMjcsMTc1NSxjMGQ0YWZkOS05MWQ5LTRiNjEtOTNhOC1k&#xA;MWViZDk3ZTIzZDg7ZG9taW5pbyBBUyAsMTA5MywzMjEsYjdlZjlmOGQtMzMyNy00MmRkLTg2OWUt&#xA;ZjI4MmU3NDI2YTA5O2N0cnRfZW52b2x2aWRvICw1ODcsMTA4MCxhZDU1NDNmZi0xYWRiLTQ5Yjkt&#xA;OGY2OC0wMDQxZDZkYTgzNDM7cGFyY2Vpcm8gLDM5NCwxNzI4LDZmODgwNjI0LTc5MWItNDgzNi05&#xA;NmUzLTkyNWM0YzdjMTc3NDs="/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="citgrpdb"/>
 	<parameter name="registroOcorrenciaId" class="java.lang.Long">
@@ -23,7 +23,7 @@ ctrt.id AS ctrt_id,
 ctrt.numeroanocontrato AS numeroContrato,
 (SELECT dominio.descricao FROM dominio WHERE dominio.id = ctrt.dominiotipocontrato_id ) AS tipoContrato,
 ctrt.datavigenciainicial AS dataVigenciaInicialContrato,
-ctrt.datavigenciafinal AS dataVigenciaFinalContrato,
+CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = ctrt.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = ctrt.id AND aditivodeprazo = true) ELSE ctrt.datavigenciafinal END AS dataVigenciaFinalContrato,
 ofs.numordemfornecimento AS numordemfornecimento,
 pessoajuridica.razaosocial AS nomeFornecedor,
 pessoajuridica.cnpj AS cnpj,
...	...	@@ -58,7 +58,11 @@
58	58	</parameter>
59	59	<parameter name="OBSERVACAO_NAO_APLICA" class="java.lang.Boolean"/>
60	60	<queryString>
61		- <![CDATA[SELECT CE.CODIGO, C.NUMEROANOCONTRATO, C.DATAVIGENCIAINICIAL, C.DATAVIGENCIAFINAL, PE.NOME AS CONTRATADO, C.VALORCONTRATO
	61	+ <![CDATA[SELECT CE.CODIGO, C.NUMEROANOCONTRATO, C.DATAVIGENCIAINICIAL,
	62	+ (CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND aditivodeprazo = true) ELSE C.datavigenciafinal END) AS dataFinal, PE.NOME AS CONTRATADO,
	63	+ (C.VALORCONTRATO +
	64	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
	65	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) AS valorTotalContrato
62	66	FROM cnt_cronogramaexecucao CE
63	67	INNER JOIN cnt_contrato C ON C.ID = CE.CONTRATO_ID
64	68	INNER JOIN FORNECEDOR F ON F.ID = C.FORNECEDOR_ID
...	...	@@ -69,9 +73,9 @@
69	73	<field name="codigo" class="java.lang.String"/>
70	74	<field name="numeroanocontrato" class="java.lang.String"/>
71	75	<field name="datavigenciainicial" class="java.sql.Timestamp"/>
72		- <field name="datavigenciafinal" class="java.sql.Timestamp"/>
	76	+ <field name="datafinal" class="java.sql.Timestamp"/>
73	77	<field name="contratado" class="java.lang.String"/>
74		- <field name="valorcontrato" class="java.math.BigDecimal"/>
	78	+ <field name="valortotalcontrato" class="java.math.BigDecimal"/>
75	79	<background>
76	80	<band splitType="Stretch"/>
77	81	</background>
...	...	@@ -198,7 +202,7 @@
198	202	<rightPen lineWidth="1.0"/>
199	203	</box>
200	204	<textElement textAlignment="Left" verticalAlignment="Middle"/>
201		- <textFieldExpression><![CDATA[$F{datavigenciafinal}]]></textFieldExpression>
	205	+ <textFieldExpression><![CDATA[$F{datafinal}]]></textFieldExpression>
202	206	</textField>
203	207	</frame>
204	208	<frame>
...	...	@@ -256,7 +260,7 @@
256	260	<rightPen lineWidth="1.0"/>
257	261	</box>
258	262	<textElement textAlignment="Left" verticalAlignment="Middle"/>
259		- <textFieldExpression><![CDATA[$F{valorcontrato}]]></textFieldExpression>
	263	+ <textFieldExpression><![CDATA[$F{valortotalcontrato}]]></textFieldExpression>
260	264	</textField>
261	265	</frame>
262	266	</band>
...	...
...	...	@@ -2,7 +2,7 @@
2	2	<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="encerramentoContrato" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3	3	<property name="ireport.zoom" value="1.3636363636363635"/>
4	4	<property name="ireport.x" value="0"/>
5		- <property name="ireport.y" value="781"/>
	5	+ <property name="ireport.y" value="686"/>
6	6	<style name="table">
7	7	<box>
8	8	<pen lineWidth="1.0" lineColor="#000000"/>
...	...	@@ -32,7 +32,12 @@
32	32	</parameter>
33	33	<queryString>
34	34	<![CDATA[SELECT encerramento.numTermo, encerramento.dataemissao AS dataemissao, c.numeroAnoContrato AS numAnoContrato, dTipoContrato.descricao AS tipoContrato, dAquisicao.descricao AS tipoAquisicao, c.numeroProcesso AS numProcesso,
35		- c.dataCelebracao, c.datavigenciainicial, c.datavigenciafinal, c.valorContrato, pesForn.nome AS contratada, pesJForn.cnpj AS cnpjContratada, org.nome AS contratante, encerramento.introducao, encerramento.motivo,
	35	+ c.dataCelebracao, c.datavigenciainicial,
	36	+ (CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) ELSE c.datavigenciafinal END) AS datavigenciafinal,
	37	+ (c.VALORCONTRATO +
	38	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
	39	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) AS valorContrato,
	40	+ pesForn.nome AS contratada, pesJForn.cnpj AS cnpjContratada, org.nome AS contratante, encerramento.introducao, encerramento.motivo,
36	41	encerramento.encaminhamentos, encerramento.pendencias, encerramento.decisao, c.objetoContratacao, encerramento.dataEmissao AS dataEncerramento
37	42	FROM cnt_encerramentocontrato AS encerramento
38	43	INNER JOIN cnt_contrato c ON c.id = encerramento.contrato_id
...	...
...	...	@@ -48,7 +48,9 @@
48	48	dominioObjeto.descricao as tipoObjeto,
49	49	c.numeroAnoContrato AS numanocontrato,
50	50	c.numeroProcesso AS numeroProcesso,
51		- c.valorcontrato as valorContrato,
	51	+ (c.VALORCONTRATO +
	52	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
	53	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
52	54	pesForn.nome AS contratada,
53	55	pesJForn.cnpj AS cnpjcontratado,
54	56	c.objetocontratacao As objetocontrato,
...	...
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<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="encerramentoContrato" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3		- <property name="ireport.zoom" value="3.0"/>
	3	+ <property name="ireport.zoom" value="1.8627639691774651"/>
4	4	<property name="ireport.x" value="0"/>
5		- <property name="ireport.y" value="440"/>
	5	+ <property name="ireport.y" value="0"/>
6	6	<style name="table">
7	7	<box>
8	8	<pen lineWidth="1.0" lineColor="#000000"/>
...	...	@@ -41,7 +41,9 @@
41	41	dominioCategoria.descricao as categoria,
42	42	c.numeroAnoContrato AS numanocontrato,
43	43	c.numeroProcesso AS numeroProcesso,
44		- c.valorcontrato as valorContrato,
	44	+ (C.VALORCONTRATO +
	45	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
	46	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = C.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
45	47	pesForn.nome AS contratada,
46	48	pesJForn.cnpj AS cnpjcontratado,
47	49	c.objetocontratacao As objetocontrato,
...	...	@@ -69,9 +71,7 @@ LEFT JOIN cnt_cn_envolvido gestor ON (gestor.contrato_id = c.id AND gestor.papel
69	71	LEFT JOIN parceiro_colaborador cPreposto ON cPreposto.id = preposto.envolvido_id
70	72	LEFT JOIN pessoa pesPreposto ON pesPreposto.id = parPreposto.pessoa_id
71	73
72		-WHERE EMPENHO.ID = $P{EMPENHO_ID};
73		-
74		-]]>
	74	+WHERE EMPENHO.ID = $P{EMPENHO_ID};]]>
75	75	</queryString>
76	76	<field name="numeroempenho" class="java.lang.String"/>
77	77	<field name="valorempenhado" class="java.math.BigDecimal"/>
...	...
...	...	@@ -38,8 +38,10 @@
38	38	c.numeroProcesso AS numeroProcesso,
39	39	c.datacelebracao AS dataCelebracao,
40	40	c.datavigenciainicial AS dataVigenciaInicial,
41		- c.datavigenciafinal AS dataVigenciaFinal,
42		- c.valorcontrato as valorContrato,
	41	+ (CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) ELSE c.datavigenciafinal END) AS dataVigenciaFinal,
	42	+ (c.VALORCONTRATO +
	43	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
	44	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
43	45	pesForn.nome AS fornecedorContratada,
44	46	pesJForn.cnpj AS cnpjFornecedorContratada,
45	47	c.objetocontratacao AS objetoContrato,
...	...
...	...	@@ -99,8 +99,10 @@ order by dataevento]]>
99	99	c.numeroProcesso AS numeroProcesso,
100	100	c.datacelebracao as datacelebracao,
101	101	c.datavigenciainicial as vigenciainicial,
102		- c.datavigenciafinal as vigenciafinal,
103		- c.valorcontrato as valorContrato,
	102	+ (CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND aditivodeprazo = true) ELSE c.datavigenciafinal END) as vigenciafinal,
	103	+ (c.VALORCONTRATO +
	104	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 1)) ELSE 0 END) -
	105	+ (CASE WHEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) > 0 THEN (SELECT sum(valoraditivo) FROM cnt_ev_aditivo WHERE contratoaditivo_id = c.id AND tipoalteracaovalor_id = (SELECT id FROM dominio WHERE chave = 'tipoAlteracaoValor' AND codigo = 2)) ELSE 0 END)) as valorContrato,
104	106	pesForn.nome AS contratada,
105	107	pesJForn.cnpj AS cnpjcontratado,
106	108	c.objetocontratacao As objetocontrato,
...	...
...	...	@@ -2,7 +2,7 @@
2	2	<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="registroOcorrencia" language="groovy" pageWidth="555" pageHeight="802" columnWidth="555" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="e3539b84-00a7-49ab-94ac-e56c384a5198">
3	3	<property name="ireport.zoom" value="1.4641000000000013"/>
4	4	<property name="ireport.x" value="0"/>
5		- <property name="ireport.y" value="428"/>
	5	+ <property name="ireport.y" value="332"/>
6	6	<property name="com.jaspersoft.studio.data.sql.tables" value="cGFyY2Vpcm9fY29sYWJvcmFkb3IgLDE1LDExODMsZTFiNzExOWItN2ZhZi00NDA4LTk2MzgtOTI5 ZTJmMjIzMjVmO3BhcmNlaXJvIEFTICwyMjcsMTUsOWViMzc4NzgtMTY4Yy00ODg4LWI2YzktZDBm OTJmYmZlMjVlO2N0cnRfZW52b2x2aWRvICw1ODcsMTYxMywxM2NlMDk4Yi1jNmVmLTQ0M2YtOGIy Yi0yMmRhNWZmZjMzNWE7Y3RydF9jb250cmF0byBBUyAsODM1LDU2MyxjNjM1NzE0YS0yMDhiLTQ1 NDUtOGYzMC04YWY4ZGRkYzg4Njk7Zm9ybmVjZWRvciBBUyAsMTI0MCw0NTcsNDNkM2RlMTQtMjdm MS00ODMwLWI2ZTQtZmIxZjYxZTlhNmY3O3Blc3NvYSAsMjI3LDEyODksZWEyZGMzNzEtZDI4Yi00 YWJlLWIwMGYtMjc1MjRjNmQyMzM5O3JvX3JlZ2lzdHJvb2NvcnJlbmNpYSBBUyAsNTg3LDEyMSwx YWMxZjE4NS05ZjU4LTQ2NzItODQxMC04ZmMyMDQyMTVjZDQ7cGVzc29hanVyaWRpY2EgQVMgLDM5 NCwxMjEsMzE2NzVmY2QtOGY1Yi00YjI0LWE4MzAtOWY0Y2U3ZTAyZDM5O3BhcmNlaXJvICwzOTQs ODAyLGQxYzQ0MWQ1LWQ4OTItNDAyMS1iMWE4LWU1NGE3NWQzNWVlNTtwYXJjZWlyb19jb2xhYm9y YWRvciAsMTUsNjk2LGIwNTZkMjkxLTE5NzktNGZhYi04OGZlLTI2NzM5NTEwODRmYTtvZl9vcmRl bWZvcm5lY2ltZW50byBBUyAsODM1LDEyMSwzYjFkZjkzOS1jYWQ2LTQyOTktOTM0OS1mZDVhYzlk Yzg2OWI7Y3RydF9lbnZvbHZpZG8gLDU4Nyw2ODMsNjUxOTBkOGEtMWQ2Yi00YmQ2LTk3ZWQtZjU1 OGMxNDM0MWQ5O3BhcmNlaXJvICwzOTQsMTI4OSxjNDBlNWNiNS02MzA2LTQ5MGMtYjVkZC00OGJj YmE2NjFiMzE7cGFyY2Vpcm9fY29sYWJvcmFkb3IgLDE1LDIxMzYsM2UyZGMxN2ItM2MyZC00MWJl LWI1YTctNmEyZmEyNGRlNWZjO3Blc3NvYSAsMjI3LDgwMiwxOGU4YWQwZi01YTMxLTQxNjItOTFl OC1kMDA5YThmNDI3NDA7cGVzc29hICwyMjcsMTc1NSxjMGQ0YWZkOS05MWQ5LTRiNjEtOTNhOC1k MWViZDk3ZTIzZDg7ZG9taW5pbyBBUyAsMTA5MywzMjEsYjdlZjlmOGQtMzMyNy00MmRkLTg2OWUt ZjI4MmU3NDI2YTA5O2N0cnRfZW52b2x2aWRvICw1ODcsMTA4MCxhZDU1NDNmZi0xYWRiLTQ5Yjkt OGY2OC0wMDQxZDZkYTgzNDM7cGFyY2Vpcm8gLDM5NCwxNzI4LDZmODgwNjI0LTc5MWItNDgzNi05 NmUzLTkyNWM0YzdjMTc3NDs="/>
7	7	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="citgrpdb"/>
8	8	<parameter name="registroOcorrenciaId" class="java.lang.Long">
...	...	@@ -23,7 +23,7 @@ ctrt.id AS ctrt_id,
23	23	ctrt.numeroanocontrato AS numeroContrato,
24	24	(SELECT dominio.descricao FROM dominio WHERE dominio.id = ctrt.dominiotipocontrato_id ) AS tipoContrato,
25	25	ctrt.datavigenciainicial AS dataVigenciaInicialContrato,
26		-ctrt.datavigenciafinal AS dataVigenciaFinalContrato,
	26	+CASE WHEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = ctrt.id AND aditivodeprazo = true) IS NOT NULL THEN (SELECT max(datafim) FROM cnt_ev_aditivo WHERE contratoaditivo_id = ctrt.id AND aditivodeprazo = true) ELSE ctrt.datavigenciafinal END AS dataVigenciaFinalContrato,
27	27	ofs.numordemfornecimento AS numordemfornecimento,
28	28	pessoajuridica.razaosocial AS nomeFornecedor,
29	29	pessoajuridica.cnpj AS cnpj,
...	...