From 9b32cbd194d839414257c448e0e19564b06e4443 Mon Sep 17 00:00:00 2001 From: luis.camargo Date: Fri, 1 Apr 2016 09:52:52 -0300 Subject: [PATCH] redmine #4115 Alterações (numero do contrato passa não ser obrigatório) solicitadas pela analista; --- cit-contratos-api/src/main/java/br/com/centralit/api/dao/ContratoEventoDao.java | 2 ++ cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoDaoHibernate.java | 2 +- cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoEventoDaoHibernate.java | 15 ++++++++++++++- cit-contratos-api/src/main/java/br/com/centralit/api/service/ContratoService.java | 2 ++ cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------ cit-contratos-web/src/main/java/br/com/centralit/controller/ContratoEventoController.java | 5 +++-- cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------- cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------- cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------- cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js | 3 ++- cit-contratos-web/src/main/webapp/html/consultaRelatorios/consultaRelatoriosList.html | 2 +- 11 files changed, 317 insertions(+), 253 deletions(-) diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/dao/ContratoEventoDao.java b/cit-contratos-api/src/main/java/br/com/centralit/api/dao/ContratoEventoDao.java index f36e4ad..9a1b4dc 100644 --- a/cit-contratos-api/src/main/java/br/com/centralit/api/dao/ContratoEventoDao.java +++ b/cit-contratos-api/src/main/java/br/com/centralit/api/dao/ContratoEventoDao.java @@ -50,4 +50,6 @@ public interface ContratoEventoDao extends CitGenericDAO { Collection findAllByContratoIntervalDataEmissao(Long contratoId, Date dataInicial, Date dateFinal); Collection findAllByContratoTipoTermoDataEmissao(List codigosTermo, Date dataInicial, Date dateFinal); + + Collection findAllByTipoEvento(List tiposEvento); } \ No newline at end of file diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoDaoHibernate.java b/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoDaoHibernate.java index 00c6c78..58e391b 100644 --- a/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoDaoHibernate.java +++ b/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoDaoHibernate.java @@ -100,5 +100,5 @@ public class ContratoDaoHibernate extends CitGenericDAOImpl implements ContratoD return this.search(searchSeven, this.persistentClass); } - + } diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoEventoDaoHibernate.java b/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoEventoDaoHibernate.java index a392353..fc009d6 100644 --- a/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoEventoDaoHibernate.java +++ b/cit-contratos-api/src/main/java/br/com/centralit/api/dao/impl/ContratoEventoDaoHibernate.java @@ -1,6 +1,5 @@ package br.com.centralit.api.dao.impl; -import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; import java.util.List; @@ -119,4 +118,18 @@ public class ContratoEventoDaoHibernate extends CitGenericDAOImpl implements Con return this.search(search); } + + @Override + public Collection findAllByTipoEvento(List tiposEvento) { + SearchSeven search = new SearchSeven(); + + search.addFilterIn("tipoEvento.id", tiposEvento); + + search.addSort("dataEvento", false); + + search.addSort("id", false); + + return this.search(search); + } + } diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/service/ContratoService.java b/cit-contratos-api/src/main/java/br/com/centralit/api/service/ContratoService.java index dcd444b..231f085 100644 --- a/cit-contratos-api/src/main/java/br/com/centralit/api/service/ContratoService.java +++ b/cit-contratos-api/src/main/java/br/com/centralit/api/service/ContratoService.java @@ -72,4 +72,6 @@ public interface ContratoService extends GenericService { Collection findAutoCompleteContratoPorNumeroAndOrganizacao(String numeroAnoContrato, Long idOrganizacao); + Collection findAllByEvento(Long[] idsTipoEvento); + } diff --git a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java index cdaffd8..f95a47d 100644 --- a/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java +++ b/cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java @@ -279,7 +279,7 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl jasperPrints = new ArrayList(); JasperPrint jasperPrincipal = new JasperPrint(); - if (UtilObjeto.isReferencia(idsTiposRelatorios)) { + if (UtilObjeto.isReferencia(idsTipoEvento)) { Integer index = 1; - for (Long idTipoRelatorio : idsTiposRelatorios) { - Dominio dominioTipoRelatorio = dominioService.find(idTipoRelatorio); - if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_EMPENHO) { - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REGISTRO_EMPENHO", this.getIdioma()); - jasperPrint = this.contratoEmpenhoService.getJasperPrintRelatorioEmpenho(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); + if (idContrato == null) { - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_LIBERA_PAGAMENTO) { - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_LIBERACAO_PAGAMENTO", this.getIdioma()); - jasperPrint = this.eventoLiberacaoPagamentoService.getJasperPrintRelatorioLiberacaoPagamento(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); - - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_REPACTUACAO) { - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_REPACTUACAO", this.getIdioma()); - jasperPrint = this.repactuacaoService.getJasperPrintRelatorioRepactuacao(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); + Collection contratoEventos = contratoEventoDao.findAllByTipoEvento(Arrays.asList(idsTipoEvento)); + List idsContratos = new ArrayList(); + for (ContratoEvento contratoEvento : contratoEventos) { + if (!idsContratos.contains(contratoEvento.getContrato().getId())) { + idsContratos.add(contratoEvento.getContrato().getId()); + } + } + + for (Long contrato : idsContratos) { + + for (Long idTipoEvento : idsTipoEvento) { + Dominio dominioTipoRelatorio = dominioService.find(idTipoEvento); + + jasperPrint = selecionaRelatorio(contrato, dataInicial, dataFinal, conn, jasperPrint, usuarioLogado, dominioTipoRelatorio); + + jasperPrincipal = addJasperPrint(jasperPrint, jasperPrints, jasperPrincipal, index); + index++; + continue; + } + } + - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_NAO_CONFORMIDADE) { - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_NAO_CONFORMIDADE", this.getIdioma()); - jasperPrint = this.eventoRegistroNaoConformidadeService.getJasperPrintRelatorioRegistroNaoConformidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); + } else { - } else if (dominioTipoRelatorio.getCodigo() == DominioContrato.TIPO_EVENTO_PENALIDADE) { - String titulo = this.internacionalizacaoService.getTranslate("CONTRATOS.LABEL.RELATORIO_PENALIDADE_APLICADA", this.getIdioma()); - jasperPrint = this.eventoPenalidadeService.getJasperPrintRelatorioPenalidade(idContrato, dataInicial, dataFinal, conn, usuarioLogado, titulo); - } + for (Long idTipoEvento : idsTipoEvento) { + Dominio dominioTipoRelatorio = dominioService.find(idTipoEvento); - jasperPrincipal = addJasperPrint(jasperPrint, jasperPrints, jasperPrincipal, index); - index++; - continue; + jasperPrint = selecionaRelatorio(idContrato, dataInicial, dataFinal, conn, jasperPrint, usuarioLogado, dominioTipoRelatorio); + jasperPrincipal = addJasperPrint(jasperPrint, jasperPrints, jasperPrincipal, index); + index++; + continue; + } } + if (!UtilColecao.isVazio(jasperPrints)) { for (JasperPrint jasper : jasperPrints) { for (int j = 0; j < jasper.getPages().size(); j++) { @@ -342,4 +351,31 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl @RequestMapping(method = RequestMethod.GET, value = "/pdfGerarRelatorios") public void gerarRelatorios( @RequestParam(value = "idsTiposRelatorio") String idsRelatoriosSelecionados, - @RequestParam(value = "idContrato") Long idContrato, + @RequestParam(value = "idContrato", required = false) String idContrato, @RequestParam(value = "dataInicial", required = false) String dataInicial, @RequestParam(value = "dataFinal", required = false) String dataFinal, @RequestParam(value = "download") boolean download, HttpServletResponse response) throws SQLException, JRException, IOException { Long[] arrayLong = getArrayLong(idsRelatoriosSelecionados); + Long contratoId = StringUtils.isNumeric(idContrato) ? Long.parseLong(idContrato) : null; Date dataInicio = StringUtils.isEmpty(dataInicial) || dataInicial.equalsIgnoreCase("null") ? null : UtilDate.jsonToDate(UtilDate.dataInicioFormatada(dataInicial)); Date dataFim = StringUtils.isEmpty(dataFinal) || dataFinal.equalsIgnoreCase("null") ? null : UtilDate.jsonToDate(UtilDate.dataInicioFormatada(dataFinal)); - this.contratoEventoService.gerarRelatorios(arrayLong, idContrato, dataInicio, dataFim, download, response); + this.contratoEventoService.gerarRelatorios(arrayLong, contratoId, dataInicio, dataFim, download, response); } } diff --git a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml index ec8684b..5de712f 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml @@ -78,25 +78,48 @@ where c.id = $P{CONTRATO_ID}]]> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + + + + + @@ -104,40 +127,40 @@ where c.id = $P{CONTRATO_ID}]]> - + - - - - - + + + + + - + - + - - - - - + + + + + - + - - - - - + + + + + @@ -145,41 +168,21 @@ where c.id = $P{CONTRATO_ID}]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + + + + + + + + - + diff --git a/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml index 2ad2987..7abf0d7 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioPenalidades.jrxml @@ -75,25 +75,48 @@ where c.id = $P{CONTRATO_ID}]]> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + + + + + @@ -101,40 +124,40 @@ where c.id = $P{CONTRATO_ID}]]> - + - - - - - + + + + + - + - + - - - - - + + + + + - + - - - - - + + + + + @@ -142,41 +165,21 @@ where c.id = $P{CONTRATO_ID}]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + + + + + + + + - + @@ -194,9 +197,9 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -227,10 +230,10 @@ where c.id = $P{CONTRATO_ID}]]> - - + + - + @@ -246,7 +249,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -259,10 +262,10 @@ where c.id = $P{CONTRATO_ID}]]> - - + + - + @@ -273,12 +276,12 @@ where c.id = $P{CONTRATO_ID}]]> - + - + @@ -291,10 +294,10 @@ where c.id = $P{CONTRATO_ID}]]> - - + + - + @@ -310,7 +313,7 @@ where c.id = $P{CONTRATO_ID}]]> - + @@ -323,10 +326,10 @@ where c.id = $P{CONTRATO_ID}]]> - - + + - + @@ -342,7 +345,7 @@ where c.id = $P{CONTRATO_ID}]]> - + diff --git a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml index 8e5cd1c..c4a170b 100644 --- a/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml +++ b/cit-contratos-web/src/main/resources/reports/relatorioRepactuacoes.jrxml @@ -70,25 +70,48 @@ where c.id = $P{CONTRATO_ID}]]> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + + + + + @@ -96,40 +119,40 @@ where c.id = $P{CONTRATO_ID}]]> - + - - - - - + + + + + - + - + - - - - - + + + + + - + - - - - - + + + + + @@ -137,41 +160,13 @@ where c.id = $P{CONTRATO_ID}]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - + @@ -288,6 +283,14 @@ where c.id = $P{CONTRATO_ID}]]> + + + + + + + + diff --git a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js index f6f2135..ca1b70e 100644 --- a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js +++ b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js @@ -68,8 +68,9 @@ citApp.controller('ConsultaRelatoriosController', ['$scope', '$filter', '$timeou } }); + var idContrato = $scope.contrato ? $scope.contrato.id : null; $scope.url = '/cit-contratos-web/rest/contratoEvento/pdfGerarRelatorios?idsTiposRelatorio=' - + idsRelatoriosSelecionados + '&idContrato=' + $scope.contrato.id + '&dataInicial=' + $scope.dataInicial + '&dataFinal=' + $scope.dataFinal; + + idsRelatoriosSelecionados + '&idContrato=' + idContrato + '&dataInicial=' + $scope.dataInicial + '&dataFinal=' + $scope.dataFinal; $scope.visualizarRelatorio($scope.url, $translate.instant('CONTRATOS.LABEL.RELATORIOS')); $scope.setLoading(false); diff --git a/cit-contratos-web/src/main/webapp/html/consultaRelatorios/consultaRelatoriosList.html b/cit-contratos-web/src/main/webapp/html/consultaRelatorios/consultaRelatoriosList.html index cafc5f3..f087ca2 100644 --- a/cit-contratos-web/src/main/webapp/html/consultaRelatorios/consultaRelatoriosList.html +++ b/cit-contratos-web/src/main/webapp/html/consultaRelatorios/consultaRelatoriosList.html @@ -43,7 +43,7 @@
+ ng-acao-borracha="resetForm()" ng-model="contrato" form="consultaRelatoriosForm" ng-obrigatorio="false">
-- libgit2 0.21.2