git-svn-id: https://svn.coded.pt/svn/SIPRP@1031 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java

@@ -89,27 +89,22 @@ public class PlanoActuacaoDAO extends MainDAO
 	public List<HsRelatorio> getRelatoriosNotIn( List<Date> dates, Integer estabelecimentoID )
 	{
 		List<HsRelatorio> result = new LinkedList<HsRelatorio>();
-		if( dates != null )
+		dates = dates != null ? dates : new LinkedList<Date>();
+		SelectQuery query = new SelectQuery( HsRelatorio.class );
+		query.andQualifier( ExpressionFactory.noMatchExp( HsRelatorio.IS_SUBMETIDO_PROPERTY, null ) );
+		query.andQualifier( ExpressionFactory.matchExp( HsRelatorio.DELETED_DATE_PROPERTY, null ) );
+		List<HsRelatorio> all = context.performQuery( query );
+		for( HsRelatorio relatorio : all )
 		{
-			SelectQuery query = new SelectQuery( HsRelatorio.class );
+			MarcacoesEstabelecimento visita = relatorio.getToHsMarcacoesEstabelecimento();
-			query.andQualifier( ExpressionFactory.noMatchExp( HsRelatorio.IS_SUBMETIDO_PROPERTY, null ) );
+			if( visita != null )
-			query.andQualifier( ExpressionFactory.matchExp( HsRelatorio.DELETED_DATE_PROPERTY, null ) );
-			List<HsRelatorio> all = context.performQuery( query );
-			for( HsRelatorio relatorio : all )
 			{
-				MarcacoesEstabelecimento visita = relatorio.getToHsMarcacoesEstabelecimento();
+				if( estabelecimentoID == null || estabelecimentoID != null && estabelecimentoID.equals( visita.getEstabelecimentoID() ) )
-
-				if( visita != null )
 				{
-					if( estabelecimentoID == null
+					Date dateVisita = visita.getData();
-							||
+					if( dateVisita != null && !dates.contains( dateVisita ) )
-							estabelecimentoID != null && estabelecimentoID.equals( visita.getEstabelecimentoID() ) )
 					{
-						Date dateVisita = visita.getData();
+						result.add( relatorio );
-						if( dateVisita != null && !dates.contains( dateVisita ) )
-						{
-							result.add( relatorio );
-						}
 					}
 				}
 			}