Download as
Browse Code »

Commit 678d43f300aed3895032ea8d97b69d2ecb4f2ec7

Authored by rogeriocassimiro
Committed by ROGERIO CASSIMIRO DE SOUZA
1 parent 45fc66df
Exists in master

redmine #2040 alteracao servico para envio dos parametros para relatorio

Showing 3 changed files with 25 additions and 3 deletions   Show diff stats
citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/ReportTermoResponsabilidadeController.java
  Diff comments   View file @678d43f
... ... @@ -5,6 +5,7 @@ import java.io.IOException;
5 5 import java.io.InputStream;
6 6 import java.sql.Connection;
7 7 import java.sql.SQLException;
  8 +import java.util.Date;
8 9 import java.util.HashMap;
9 10 import java.util.Map;
10 11  
... ... @@ -145,7 +146,7 @@ public class ReportTermoResponsabilidadeController extends GenericController<Bem
145 146 */
146 147 @RequestMapping(method = RequestMethod.GET, value = "/tru")
147 148 @ResponseBody
148   - public void gerarPdfTermoResponsabilidadeUnidade(@RequestParam(value = "idTermo") Long idTermo,
  149 + public void gerarPdfTermoResponsabilidadeUnidade(@RequestParam(value = "idTermo") Long idTermo, @RequestParam(value = "idUL") Long idUL, @RequestParam(value = "dataReferencia") Date dataReferencia,
149 150 @RequestParam(value = "download") boolean download, HttpServletResponse response) throws SQLException, JRException, IOException {
150 151  
151 152 Connection conn = null;
... ... @@ -180,6 +181,8 @@ public class ReportTermoResponsabilidadeController extends GenericController<Bem
180 181 parameters.put("SUBREPORT_CABECALHO_DIR", jasperReportCabecalho);
181 182 parameters.put("SUBREPORT_PARAMETERS_MAP", subReportParameters);
182 183 parameters.put("REPORT_CONNECTION", conn);
  184 + parameters.put("idUL",idUL);
  185 + parameters.put("dataReferencia",dataReferencia);
183 186  
184 187 JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, conn);
185 188  
... ...
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidadeUnidade.jrxml
  Diff comments   View file @678d43f
... ... @@ -2,13 +2,19 @@
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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
3 3 <property name="ireport.zoom" value="1.5"/>
4 4 <property name="ireport.x" value="0"/>
5   - <property name="ireport.y" value="240"/>
  5 + <property name="ireport.y" value="18"/>
6 6 <parameter name="SUBREPORT_CABECALHO_DIR" class="java.lang.Object"/>
7 7 <parameter name="SUBREPORT_PARAMETERS_MAP" class="java.util.Map"/>
8 8 <parameter name="idTermo" class="java.lang.Long">
9 9 <defaultValueExpression><![CDATA[]]></defaultValueExpression>
10 10 </parameter>
11 11 <parameter name="organizacao" class="java.lang.String"/>
  12 + <parameter name="dataReferencia" class="java.util.Date">
  13 + <defaultValueExpression><![CDATA[]]></defaultValueExpression>
  14 + </parameter>
  15 + <parameter name="idUL" class="java.lang.Long">
  16 + <defaultValueExpression><![CDATA[]]></defaultValueExpression>
  17 + </parameter>
12 18 <queryString>
13 19 <![CDATA[SELECT termo.numeroTermo,
14 20 estruturaOrganizacional.nome AS estruturaatual,
... ... @@ -61,6 +67,19 @@ AND material.datainativo IS NULL
61 67 LEFT JOIN Localizacao localizacao ON localizacao.id = estruturaOrganizacional.localizacao_id
62 68 LEFT JOIN Endereco endereco ON endereco.id = localizacao.endereco_id
63 69 WHERE termo.id = $P{idTermo}
  70 +and bempatrimonial.id in (
  71 + select t.bempatrimonial_id
  72 + from
  73 +(
  74 +select ti.bempatrimonial_id, t.unidadedestino_id, ti.unidadeorigem_id, t.datatransferencia as dataIni,
  75 +(select min(ts.datatransferencia) from transferenciaitem tis inner join transferencia ts on (ts.id = tis.transferencia_id)
  76 +where tis.bempatrimonial_id = ti.bempatrimonial_id and ts.datatransferencia > t.datatransferencia and tis.unidadeorigem_id = t.unidadedestino_id) as dataFim
  77 +from transferenciaitem ti
  78 +inner join transferencia t on (t.id = ti.transferencia_id)
  79 +where t.unidadedestino_id = $P{idUL} AND t.datainativo is null) as t
  80 +where t.dataIni <= $P{dataReferencia} AND (T.DATAFIM >= $P{dataReferencia} OR T.DATAFIM IS NULL)
  81 +order by t.bempatrimonial_id
  82 +)
64 83 GROUP BY termo.numeroTermo,
65 84 estruturaOrganizacional.id,
66 85 estruturaOrganizacional.nome,
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EmissaoTermoResponsabilidadeController.js
  Diff comments   View file @678d43f
... ... @@ -117,7 +117,7 @@ citApp.controller(&#39;EmissaoTermoResponsabilidadeController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;
117 117  
118 118 $scope.gerarReportTermoResponsabilidadeUnidade = function(idTermo){
119 119  
120   - $scope.url = '/citgrp-patrimonio-web/rest/reportTermoResponsabilidade/tru?idTermo=' + idTermo;
  120 + $scope.url = '/citgrp-patrimonio-web/rest/reportTermoResponsabilidade/tru?idTermo=' + idTermo+'&idUL='+$scope.estruturaOrganizacionalLocalizadora.id+'&dataReferencia='+$scope.dataReferencia;
121 121  
122 122 $scope.visualizarRelatorio($scope.url, $translate.instant('PATRIMONIO.LABEL.TITULO_TERMO_UNIDADE_PATRIMONIO'));
123 123 };
... ...