diff --git a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java index b7999b71..b5653ec8 100644 --- a/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java +++ b/trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java @@ -89,27 +89,22 @@ public class PlanoActuacaoDAO extends MainDAO public List getRelatoriosNotIn( List dates, Integer estabelecimentoID ) { List result = new LinkedList(); - if( dates != null ) + dates = dates != null ? dates : new LinkedList(); + 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 all = context.performQuery( query ); + for( HsRelatorio relatorio : all ) { - 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 all = context.performQuery( query ); - for( HsRelatorio relatorio : all ) + MarcacoesEstabelecimento visita = relatorio.getToHsMarcacoesEstabelecimento(); + if( visita != null ) { - MarcacoesEstabelecimento visita = relatorio.getToHsMarcacoesEstabelecimento(); - - if( visita != null ) + if( estabelecimentoID == null || estabelecimentoID != null && estabelecimentoID.equals( visita.getEstabelecimentoID() ) ) { - if( estabelecimentoID == null - || - estabelecimentoID != null && estabelecimentoID.equals( visita.getEstabelecimentoID() ) ) + Date dateVisita = visita.getData(); + if( dateVisita != null && !dates.contains( dateVisita ) ) { - Date dateVisita = visita.getData(); - if( dateVisita != null && !dates.contains( dateVisita ) ) - { - result.add( relatorio ); - } + result.add( relatorio ); } } }