Download as
Browse Code »

Commit ea3e7c3d60494ff3b2dcae0629c40d48893ff01f

Authored by erick.sato
2 parents 1969d838 d5bbd12b
Exists in master

Merge branch 'tarefa-4214' into cnt-1.0.0-alfa11

Showing 1 changed file with 10 additions and 10 deletions   Show diff stats
cit-contratos-web/src/main/resources/reports/eventoRepactuacao.jrxml
  Diff comments   View file @ea3e7c3
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
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="eventoRepactuacao" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f"> 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="eventoRepactuacao" 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="1.4641000000000042"/> 3 <property name="ireport.zoom" value="1.4641000000000042"/>
4 <property name="ireport.x" value="0"/> 4 <property name="ireport.x" value="0"/>
5 - <property name="ireport.y" value="0"/> 5 + <property name="ireport.y" value="426"/>
6 <style name="table"> 6 <style name="table">
7 <box> 7 <box>
8 <pen lineWidth="1.0" lineColor="#000000"/> 8 <pen lineWidth="1.0" lineColor="#000000"/>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 ocorrencia.sequencialano AS numeroOcorrencia, 50 ocorrencia.sequencialano AS numeroOcorrencia,
51 REPACTUACAO.justificativarepactuacao AS justificativaRepactuacao, 51 REPACTUACAO.justificativarepactuacao AS justificativaRepactuacao,
52 pesGestor.nome AS gestor, cGestor.matricula AS gestorMatricula, pesAdm.nome AS fiscalAdm, 52 pesGestor.nome AS gestor, cGestor.matricula AS gestorMatricula, pesAdm.nome AS fiscalAdm,
53 - cAdm.matricula AS fiscalAdmMatricula, pesReq.nome AS fiscalRequisitante, cReq.matricula AS fiscalRequisitanteMatricula 53 + cAdm.matricula AS fiscalAdmMatricula, pesTec.nome AS fiscalTecnico, cTec.matricula AS fiscalTecnicoMatricula
54 FROM cnt_ev_repactuacao AS REPACTUACAO 54 FROM cnt_ev_repactuacao AS REPACTUACAO
55 INNER JOIN cnt_cn_evento EVENTO ON EVENTO.ID = REPACTUACAO.ID 55 INNER JOIN cnt_cn_evento EVENTO ON EVENTO.ID = REPACTUACAO.ID
56 INNER JOIN cnt_contrato C ON C.ID = EVENTO.CONTRATO_ID 56 INNER JOIN cnt_contrato C ON C.ID = EVENTO.CONTRATO_ID
@@ -68,10 +68,10 @@ FROM cnt_ev_repactuacao AS REPACTUACAO @@ -68,10 +68,10 @@ FROM cnt_ev_repactuacao AS REPACTUACAO
68 LEFT JOIN parceiro parAdm ON parAdm.id = fAdm.envolvido_id 68 LEFT JOIN parceiro parAdm ON parAdm.id = fAdm.envolvido_id
69 LEFT JOIN parceiro_colaborador cAdm ON cAdm.id = fAdm.envolvido_id 69 LEFT JOIN parceiro_colaborador cAdm ON cAdm.id = fAdm.envolvido_id
70 LEFT JOIN pessoa pesAdm ON pesAdm.id = parAdm.pessoa_id 70 LEFT JOIN pessoa pesAdm ON pesAdm.id = parAdm.pessoa_id
71 - LEFT JOIN cnt_cn_envolvido fReq ON (fReq.contrato_id = c.id AND fReq.papelenvolvidocontrato_id = (SELECT id FROM dominio WHERE chave = 'tipoPapelEnvolvidoContrato' AND codigo = 5))  
72 - LEFT JOIN parceiro parReq ON parReq.id = fReq.envolvido_id  
73 - LEFT JOIN parceiro_colaborador cReq ON cReq.id = fReq.envolvido_id  
74 - LEFT JOIN pessoa pesReq ON pesReq.id = parReq.pessoa_id 71 + LEFT JOIN cnt_cn_envolvido fTec ON (fTec.contrato_id = c.id AND fTec.papelenvolvidocontrato_id = (SELECT id FROM dominio WHERE chave = 'tipoPapelEnvolvidoContrato' AND codigo = 3))
  72 + LEFT JOIN parceiro parTec ON parTec.id = fTec.envolvido_id
  73 + LEFT JOIN parceiro_colaborador cTec ON cTec.id = fTec.envolvido_id
  74 + LEFT JOIN pessoa pesTec ON pesTec.id = parTec.pessoa_id
75 75
76 WHERE REPACTUACAO.ID = $P{REPACTUACAO_ID};]]> 76 WHERE REPACTUACAO.ID = $P{REPACTUACAO_ID};]]>
77 </queryString> 77 </queryString>
@@ -94,8 +94,8 @@ WHERE REPACTUACAO.ID = $P{REPACTUACAO_ID};]]&gt; @@ -94,8 +94,8 @@ WHERE REPACTUACAO.ID = $P{REPACTUACAO_ID};]]&gt;
94 <field name="gestormatricula" class="java.lang.String"/> 94 <field name="gestormatricula" class="java.lang.String"/>
95 <field name="fiscaladm" class="java.lang.String"/> 95 <field name="fiscaladm" class="java.lang.String"/>
96 <field name="fiscaladmmatricula" class="java.lang.String"/> 96 <field name="fiscaladmmatricula" class="java.lang.String"/>
97 - <field name="fiscalrequisitante" class="java.lang.String"/>  
98 - <field name="fiscalrequisitantematricula" class="java.lang.String"/> 97 + <field name="fiscaltecnico" class="java.lang.String"/>
  98 + <field name="fiscaltecnicomatricula" class="java.lang.String"/>
99 <detail> 99 <detail>
100 <band height="416" splitType="Stretch"> 100 <band height="416" splitType="Stretch">
101 <staticText> 101 <staticText>
@@ -564,7 +564,7 @@ $F{numerorepactuacao}.substring(5,9)]]&gt;&lt;/textFieldExpression&gt; @@ -564,7 +564,7 @@ $F{numerorepactuacao}.substring(5,9)]]&gt;&lt;/textFieldExpression&gt;
564 <textElement textAlignment="Center" verticalAlignment="Middle"> 564 <textElement textAlignment="Center" verticalAlignment="Middle">
565 <font isBold="true"/> 565 <font isBold="true"/>
566 </textElement> 566 </textElement>
567 - <textFieldExpression><![CDATA[$F{fiscalrequisitante} != null ? $F{fiscalrequisitante} : "FISCAL REQUISITANTE"]]></textFieldExpression> 567 + <textFieldExpression><![CDATA[$F{fiscaltecnico} != null ? $F{fiscaltecnico} : "FISCAL TÉCNICO"]]></textFieldExpression>
568 </textField> 568 </textField>
569 <textField isStretchWithOverflow="true" isBlankWhenNull="true"> 569 <textField isStretchWithOverflow="true" isBlankWhenNull="true">
570 <reportElement positionType="Float" mode="Transparent" x="0" y="25" width="178" height="25" isPrintWhenDetailOverflows="true" backcolor="#FFFFFF" uuid="83673995-ff57-47d6-a2e4-fb4a85891c36"/> 570 <reportElement positionType="Float" mode="Transparent" x="0" y="25" width="178" height="25" isPrintWhenDetailOverflows="true" backcolor="#FFFFFF" uuid="83673995-ff57-47d6-a2e4-fb4a85891c36"/>
@@ -606,7 +606,7 @@ $F{numerorepactuacao}.substring(5,9)]]&gt;&lt;/textFieldExpression&gt; @@ -606,7 +606,7 @@ $F{numerorepactuacao}.substring(5,9)]]&gt;&lt;/textFieldExpression&gt;
606 <textElement textAlignment="Center" verticalAlignment="Middle"> 606 <textElement textAlignment="Center" verticalAlignment="Middle">
607 <font isBold="false"/> 607 <font isBold="false"/>
608 </textElement> 608 </textElement>
609 - <textFieldExpression><![CDATA[$F{fiscalrequisitantematricula}]]></textFieldExpression> 609 + <textFieldExpression><![CDATA[$F{fiscaltecnicomatricula}]]></textFieldExpression>
610 </textField> 610 </textField>
611 </frame> 611 </frame>
612 <staticText> 612 <staticText>