[Redmine Atendimento #4890]Paginar transferencias por ids

erick.sato
1 parent 2adf4dba
Showing 8 changed files with 97 additions and 36 deletions Show diff stats
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/dao/TransferenciaDao.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/dao/impl/TransferenciaDaoHibernate.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/TransferenciaService.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/viewHelper/TransferenciaVH.java
citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/TransferenciaController.java
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/TransferenciaListController.js
citgrp-patrimonio-web/src/main/webapp/html/transferencia/transferenciaList.html
@@ -3,6 +3,8 @@ package br.com.centralit.api.dao;
 import java.util.Calendar;
 import java.util.List;
+import com.googlecode.genericdao.search.SearchResult;
+
 import br.com.centralit.api.model.BemPatrimonial;
 import br.com.centralit.api.model.Transferencia;
 import br.com.centralit.api.viewHelper.TransferenciaVH;
@@ -146,5 +148,5 @@ public interface TransferenciaDao extends CitGenericDAO {
 	 * @param transferenciaVH
 	 * @return {@link String}
 	 */
-	String filtrarTransferencias(TransferenciaVH transferenciaVH);
+	SearchResult filtrarTransferencias(TransferenciaVH transferenciaVH);
 }
@@ -2,15 +2,20 @@ package br.com.centralit.api.dao.impl;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
+import com.googlecode.genericdao.search.Field;
+import com.googlecode.genericdao.search.Filter;
+import com.googlecode.genericdao.search.Search;
+import com.googlecode.genericdao.search.SearchResult;
+import com.googlecode.genericdao.search.Sort;
+
 import br.com.centralit.api.dao.TransferenciaDao;
 import br.com.centralit.api.model.BemPatrimonial;
 import br.com.centralit.api.model.Transferencia;
@@ -21,9 +26,6 @@ import br.com.centralit.framework.util.UtilColecao;
 import br.com.centralit.framework.util.UtilDate;
 import br.com.centralit.framework.util.UtilObjeto;
-import com.googlecode.genericdao.search.Filter;
-import com.googlecode.genericdao.search.Sort;
-
 /**
  * <p>
  * <img src="http://centralit.com.br/images/logo_central.png">
@@ -193,9 +195,12 @@ public class TransferenciaDaoHibernate extends CitGenericDAOImpl implements Tran
 	 * @return {@link Collection}
 	 */
 	@Override
-	public String filtrarTransferencias(TransferenciaVH transferenciaVH) {
+	public SearchResult filtrarTransferencias(TransferenciaVH transferenciaVH) {
-		SearchSeven searchSeven = new SearchSeven(this.persistentClass);
+		SearchSeven searchSeven = new SearchSeven(transferenciaVH.getSearchParams());
+		searchSeven.setResultMode(Search.RESULT_SINGLE);
+		
+		searchSeven.setDistinct(true);
 		addFilterNumeroPatrimonial(transferenciaVH, searchSeven);
 		addFilterNumeroTermo(transferenciaVH, searchSeven);
@@ -206,10 +211,31 @@ public class TransferenciaDaoHibernate extends CitGenericDAOImpl implements Tran
 		addFilterUnidadeOrigem(transferenciaVH, searchSeven);
 		addFilterUnidadeDestino(transferenciaVH, searchSeven);
-        searchSeven.addField("id");
+		List<Field> fields = new ArrayList<Field>();
+		List<Sort> sorts = new ArrayList<Sort>();
+		fields.add(new Field("id"));
+		sorts.add(new Sort("id"));	
+		searchSeven.setFields(fields);
+		searchSeven.setSorts(sorts);
         List<Long> ids = this.search(searchSeven);
-        Set<Long> idSet = new HashSet<Long>(ids);
-		return !UtilColecao.isVazio(idSet) ? idSet.toString().replace("[", "").replace("]", "").replace(" ", "") : "";
+        
+		@SuppressWarnings("rawtypes")
+		SearchResult result = new SearchResult();
+		result.setTotalCount(this.count(searchSeven));
+		
+		fields = new ArrayList<Field>();
+		searchSeven = new SearchSeven(transferenciaVH.getSearchParams());
+		searchSeven.setResultMode(Search.RESULT_MAP);
+		for (String field : transferenciaVH.getSearchParams().getFields()) {
+			fields.add(new Field(field));
+		}
+		searchSeven.setFields(fields);
+		searchSeven.addFilterIn("id", ids);
+		searchSeven.setFirstResult(0);
+		result.setResult(this.search(searchSeven));
+
+		return result;
+        
 	}
 	private void addFilterNumeroPatrimonial(TransferenciaVH transferenciaVH, SearchSeven searchSeven) {
@@ -3,6 +3,8 @@ package br.com.centralit.api.service;
 import java.util.Calendar;
 import java.util.List;
+import com.googlecode.genericdao.search.SearchResult;
+
 import br.com.centralit.api.model.AdicaoBemPrincipal;
 import br.com.centralit.api.model.AdicaoBemPrincipalItem;
 import br.com.centralit.api.model.BemPatrimonial;
@@ -190,7 +192,7 @@ public interface TransferenciaService extends GenericService&lt;Transferencia, Long
 	 * @param transferenciaVH
 	 * @return {@link String}
 	 */
-	String filtrarTransferencias(TransferenciaVH transferenciaVH);
+	SearchResult filtrarTransferencias(TransferenciaVH transferenciaVH);
 	/**
 	 * Método responsável por validar se a transferência a ser realizada já foi realizada no mesmo dia
@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.Validator;
+import com.googlecode.genericdao.search.SearchResult;
+
 import br.com.centralit.api.dao.TransferenciaDao;
 import br.com.centralit.api.model.AdicaoBemPrincipal;
 import br.com.centralit.api.model.AdicaoBemPrincipalItem;
@@ -888,7 +890,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl&lt;Transferencia, 
 	 * @return {@link String}
 	 */
 	@Override
-	public String filtrarTransferencias(TransferenciaVH transferenciaVH) {
+	public SearchResult filtrarTransferencias(TransferenciaVH transferenciaVH) {
 		return this.transferenciaDao.filtrarTransferencias(transferenciaVH);
 	}
@@ -2,11 +2,13 @@ package br.com.centralit.api.viewHelper;
 import java.io.Serializable;
 import java.util.Calendar;
+import java.util.List;
 import br.com.centralit.api.model.Colaborador;
 import br.com.centralit.api.model.EstruturaOrganizacional;
 import br.com.centralit.api.model.Transferencia;
 import br.com.centralit.framework.json.Views;
+import br.com.centralit.framework.model.SearchParams;
 import com.fasterxml.jackson.annotation.JsonView;
@@ -108,6 +110,8 @@ public class TransferenciaVH implements Serializable {
 	private String numPatrimonial;
 	private boolean intervaloNumeroPatrimonial;
+	
+	private SearchParams searchParams;
 	/**
 	 * Retorna o valor do atributo <code>numDocumentoInicio</code>
@@ -510,4 +514,12 @@ public class TransferenciaVH implements Serializable {
 		this.intervaloNumeroPatrimonial = intervaloNumeroPatrimonial;
 	}
+	public SearchParams getSearchParams() {
+		return searchParams;
+	}
+
+	public void setSearchParams(SearchParams searchParams) {
+		this.searchParams = searchParams;
+	}
+
 }
@@ -16,15 +16,6 @@ import java.util.Map;
 import javax.persistence.PersistenceException;
 import javax.servlet.http.HttpServletResponse;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRPrintPage;
-import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrint;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.design.JasperDesign;
-import net.sf.jasperreports.engine.xml.JRXmlLoader;
-
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +28,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import com.googlecode.genericdao.search.SearchResult;
+
 import br.com.centralit.api.model.MyMensagemRetorno;
 import br.com.centralit.api.model.MyRetornoStatus;
 import br.com.centralit.api.model.Transferencia;
@@ -62,6 +55,16 @@ import br.com.centralit.framework.util.UtilColecao;
 import br.com.centralit.framework.util.UtilDataBase;
 import br.com.centralit.framework.util.UtilObjeto;
 import br.com.centralit.framework.util.UtilString;
+import br.com.centralit.framework.view.GridVH;
+import br.com.centralit.framework.view.ResultResponseVH;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JRPrintPage;
+import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperFillManager;
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperReport;
+import net.sf.jasperreports.engine.design.JasperDesign;
+import net.sf.jasperreports.engine.xml.JRXmlLoader;
 /**
  * <p><img src="http://centralit.com.br/images/logo_central.png"></p>
@@ -336,8 +339,18 @@ public class TransferenciaController extends GenericController&lt;Transferencia&gt;{
 	 */
 	@RequestMapping(value = "/filtrarTransferencias", method = RequestMethod.POST, produces = "application/json")
 	@ResponseBody
-	public String filtrarTransferencias(@RequestBody TransferenciaVH transferenciaVH) {
-		return this.transferenciaService.filtrarTransferencias(transferenciaVH);
+	public ResponseBodyWrapper filtrarTransferencias(@RequestBody TransferenciaVH transferenciaVH) {
+		SearchResult searchResult = transferenciaService.filtrarTransferencias(transferenciaVH);
+		
+		GridVH gridVH = new GridVH();
+		gridVH.setObjects(searchResult.getResult());
+		gridVH.addTotalItensTotalPages(transferenciaVH.getSearchParams(), Long.valueOf(searchResult.getTotalCount()));
+
+		ResultResponseVH resultResponseVH = new ResultResponseVH(gridVH);
+
+		ResponseBodyWrapper responseBody = new ResponseBodyWrapper(resultResponseVH, this.getListView());
+
+		return responseBody;
 	}
 	@RequestMapping(method = RequestMethod.POST, value = "")
@@ -39,6 +39,8 @@ citApp.controller(&#39;TransferenciaListController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;$transla
 		            {type: 'date', field: 'referenciaVigente'}]
 	};
+	$scope.filtrarCustomizado = false;
+	
 	// ABRE TRANSFERENCIA SELECIONADA
 	$scope.abrirTransferencia = function(edit){
 		var transferencia = $scope.transferenciaChecked;
@@ -130,19 +132,20 @@ citApp.controller(&#39;TransferenciaListController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;$transla
 	$scope.filtrarTransferencias = function() {
 		$scope.setLoadingGet(true);
 		tratarFormatoDatas();
-		if($scope.transferenciaVH.intervaloNumeroPatrimonial){
-			$scope.transferenciaVH.numPatrimonial = null;
-		}else{
-			$scope.transferenciaVH.numPatrimonialInicio = null;
-			$scope.transferenciaVH.numPatrimonialFim = null;
-		}
+		$scope.transferenciaVH.searchParams = $scope.filterCriteria;
 		return TransferenciaRepository.filtrarTransferencias($scope.transferenciaVH).then(function(result){
 			if(result){
-				$scope.filterCriteria.filters.forEach(function(filtro){
-					if(filtro.field === "id")
-						filtro.value = result;
-				});
-				$scope.fetchResult();
+				
+				$scope.transferencias = result.originalElement.objects;
+
+				$scope.totalPages = result.originalElement.totalPages;
+				$scope.totalItens =  result.originalElement.totalItens;
+
+				if(!$scope.filtersCopy){
+					$scope.filtersCopy = angular.copy($scope.filterCriteria.filters);
+				}
+				$scope.filtrarCustomizado = true;
+				$scope.setLoading(false);
 			} else {
 				$scope.showAlert('warning', $translate.instant('MSG.NENHUM_REGISTRO_ENCONTRADO'), " ", false);
@@ -154,6 +157,7 @@ citApp.controller(&#39;TransferenciaListController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;$transla
 	$scope.limparModalBuscaTransferencia = function() {
 		$scope.transferenciaVH = { intervaloNumeroPatrimonial : false};
+		$scope.filtrarCustomizado = false;
 	};
 	$scope.findEstruturaGestora =  function(value) {
@@ -56,6 +56,6 @@
 	</div>
     <list-view ng-lista="transferencias" ng-repository="TransferenciaRepository" ng-headers="headers" ng-filter-criteria="filterCriteria" ng-item-selecionado="transferenciaChecked" 
-       ng-lista-itens-selecionados="listaSelecionados" ng-check-on="true"></list-view>
+       ng-lista-itens-selecionados="listaSelecionados" ng-check-on="true" set-total-pages="totalPages" set-total-itens="totalItens" use-custom-filter-temp="filtrarCustomizado" ng-custom-filter="filtrarTransferencias()"></list-view>
 </div><!-- .page-content -->
 \ No newline at end of file
	@@ -56,6 +56,6 @@		@@ -56,6 +56,6 @@
56	</div>	56	</div>
57		57
58	<list-view ng-lista="transferencias" ng-repository="TransferenciaRepository" ng-headers="headers" ng-filter-criteria="filterCriteria" ng-item-selecionado="transferenciaChecked"	58	<list-view ng-lista="transferencias" ng-repository="TransferenciaRepository" ng-headers="headers" ng-filter-criteria="filterCriteria" ng-item-selecionado="transferenciaChecked"
59	- ng-lista-itens-selecionados="listaSelecionados" ng-check-on="true"></list-view>	59	+ ng-lista-itens-selecionados="listaSelecionados" ng-check-on="true" set-total-pages="totalPages" set-total-itens="totalItens" use-custom-filter-temp="filtrarCustomizado" ng-custom-filter="filtrarTransferencias()"></list-view>
60		60
61	</div><!-- .page-content -->	61	</div><!-- .page-content -->
62	\ No newline at end of file	62	\ No newline at end of file