no message

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

trunk/WEB-INF/classes/siprp/pagina/doGetListaEmpresas.java

@@ -51,12 +51,16 @@ empresa_nome = null;
 
                     while ( index < max )
                     {
-                        temp=""+rs.get(index,0); // converter de int para String
+						String str = (String)rs.get(index,1);
-                        dbQuery = new StringBuffer();
+						if( str != null && str.trim().length() > 0 )
-                        dbQuery.append("/"+super.servletName+"/?"+temp); // contruir url
+						{
-                        links.add(dbQuery.toString());
+							temp=""+rs.get(index,0); // converter de int para String
-                        desc.add((String)rs.get(index,1));
+							dbQuery = new StringBuffer();
-                        ++index;
+							dbQuery.append("/"+super.servletName+"/?"+temp); // contruir url
+							links.add(dbQuery.toString());
+							desc.add((String)rs.get(index,1));
+							++index;
+						}
                     }
                     stmt.close();
                     con.close();

trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresPendentes.java

@@ -55,13 +55,13 @@ public class doGetListaTrabalhadoresPendentes
                         dbQuery.append( "SELECT id, nome, ( ultima_consulta IS NOT NULL AND realizada = 'y' ),"
 										+ " ( ultimo_exame IS NOT NULL AND realizado = 'y' ),"
 										+ " proxima_consulta IS NOT NULL, proximo_exame IS NOT NULL, "
-										+ " ( proxima_consulta IS NOT NULL AND current_date - proxima_consulta <= 14 ), "
+										+ " ( proxima_consulta IS NOT NULL AND proxima_consulta - current_date <= 14 ), "
-										+ " ( proximo_exame IS NOT NULL AND current_date - proximo_exame <= 14 )"
+										+ " ( proximo_exame IS NOT NULL AND proximo_exame - current_date <= 14 )"
 										+ " FROM trabalhadores "
 										+ " WHERE estabelecimento_id = '"+estabelecimentoId+"'"
 										+ " AND ( ultima_consulta IS NULL OR realizada = 'n' OR"
-										+ " ( proxima_consulta IS NOT NULL AND current_date - proxima_consulta <= 14 )"
+										+ " ( proxima_consulta IS NOT NULL AND proxima_consulta - current_date <= 14 )"
-										+ " OR ( proximo_exame IS NOT NULL AND ( realizado = 'n' OR current_date - proximo_exame <= 14 ) ) )"
+										+ " OR ( proximo_exame IS NOT NULL AND ( realizado = 'n' OR proximo_exame - current_date <= 14 ) ) )"
 										+ " ORDER BY nome" );
                         stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
                         rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );

trunk/WEB-INF/classes/siprp/pagina/doGetListaTrabalhadoresTudo.java

@@ -55,8 +55,8 @@ public class doGetListaTrabalhadoresTudo
                         dbQuery.append( "SELECT id, nome, data_ficha FROM trabalhadores "
 										+ "WHERE estabelecimento_id = '"+estabelecimentoId+"'"
 										+ " AND ultima_consulta IS NOT NULL AND realizada = 'y' AND"
-										+ " ( proxima_consulta IS NULL OR current_date - proxima_consulta > 14 )"
+										+ " ( proxima_consulta IS NULL OR proxima_consulta - current_date > 14 )"
-										+ " AND ( proximo_exame IS NULL OR ( realizado = 'y' AND current_date - proximo_exame > 14 ) )"
+										+ " AND ( proximo_exame IS NULL OR ( realizado = 'y' AND proximo_exame - current_date > 14 ) )"
 										+ " ORDER BY nome" );
                         stmt = con.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
                         rs = new ResultSet2DArray( stmt.executeQuery( dbQuery.toString()) );