lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

novas causas de acidente

Browse Source 
git-svn-id: https://svn.coded.pt/svn/SIPRP@1641 bb69d46d-e84e-40c8-a05a-06db0d633741
lxbfYeaa
Diogo Neves 15 years ago
parent ddee7b0761
commit e19037e573
3 changed files with 15194 additions and 14401 deletions
Show Stats Download Patch File Download Diff File

4832
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/AnaliseAcidenteTrabalho.java
View File

File diff suppressed because it is too large Load Diff

2
trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/Login.java
Unescape View File

@ -604,7 +604,7 @@ public class Login extends AbstractPageBean
try
{
AnalisesDataProvider adp = AnalisesDataProvider.getInstance();
getSessionBean1().setCausasOptions(adp.getCausasList());
getSessionBean1().setCausasOptions( adp.getCausasAcidente() );
}
catch(Exception ex)
{

479
trunk/AnaliseAcidentesTrabalho/src/java/db/providers/AnalisesDataProvider.java
Unescape View File

@ -6,7 +6,6 @@
* To change this template, choose Tools | Template Manager
* and open the template in the editor.
*/
package db.providers;
import beans.Acidentado;
@ -29,6 +28,7 @@ import com.evolute.utils.sql.Field;
import com.evolute.utils.sql.Select2;
import com.evolute.utils.strings.StringPlainer;
import com.sun.rave.web.ui.model.Option;
import db.data.siprp.outer.CausasData;
import global.Global;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
@ -53,8 +53,8 @@ import utils.Utils;
*/
public class AnalisesDataProvider extends GenericDataProvider
{
private static AnalisesDataProvider INSTANCE = null;
private static AnalisesDataProvider INSTANCE = null;
private AnalisesDataProvider() throws Exception
{
@ -127,7 +127,6 @@ public class AnalisesDataProvider extends GenericDataProvider
st.execute( sql );
}
public String getExpression( String nome, String estabelecimento, String visitaDate, String POR )
{
String tables = "analises_acidentes";
@ -167,12 +166,9 @@ public class AnalisesDataProvider extends GenericDataProvider
return "SELECT * FROM " + tables + " WHERE " + joinConditions + whereExpression + " ";
}
/*************************************************************************/
/********************************* ACTUAIS *******************************/
/*************************************************************************/
public ArrayList searchAnalisesActualSeg( Integer estabelecimento_id,
String nome, String visitaDate, String POR, String responsavel_loja, Integer fromYear )
throws Exception
@ -214,11 +210,8 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( new Field( "EXTRACT( year FROM analises_acidentes.data_acidente )" ).isEqual( fromYear ) );
}
Expression states = new Field( "analises_acidentes.estado" ).isEqual( Global.ESTADO_SEG )
.or(
new Field( "analises_acidentes.averiguacao_posterior" ).isEqual( "y" )
.and( new Field( "analises_acidentes.averiguacao_obs" ).isEqual( "" ) )
);
Expression states = new Field( "analises_acidentes.estado" ).isEqual( Global.ESTADO_SEG ).or(
new Field( "analises_acidentes.averiguacao_posterior" ).isEqual( "y" ).and( new Field( "analises_acidentes.averiguacao_obs" ).isEqual( "" ) ) );
if ( "y".equals( responsavel_loja ) )
{
states = states.or( new Field( "analises_acidentes.estado" ).isEqual( Global.ESTADO_ASSINATURA_SEG ) );
@ -226,14 +219,26 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( states );
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analises_acidentes.analise_nr" },
null, null, null
);
new String[]
{
"analises_acidentes.analise_nr"
},
null, null, null );
// String sql = "";
// if ( responsavel_loja.matches( "y" ) )
@ -264,7 +269,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
public ArrayList searchAnalisesActualRH( Integer estabelecimento_id,
String nome, String visitaDate, String POR, String responsavel_loja, Integer fromYear )
throws Exception
@ -305,8 +309,7 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( new Field( "EXTRACT( year FROM analises_acidentes.data_acidente )" ).isEqual( fromYear ) );
}
Expression or = new Field( "estado" ).isEqual( Global.ESTADO_RH1 )
.or( new Field( "estado" ).isEqual( Global.ESTADO_RH2 ) );
Expression or = new Field( "estado" ).isEqual( Global.ESTADO_RH1 ).or( new Field( "estado" ).isEqual( Global.ESTADO_RH2 ) );
if ( "y".equals( responsavel_loja ) )
{
or = or.or( new Field( "estado" ).isEqual( Global.ESTADO_ASSINATURA_RH ) );
@ -314,14 +317,26 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( or );
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analise_nr" },
null, null, null
);
new String[]
{
"analise_nr"
},
null, null, null );
// String sql = "";
// if ( responsavel_loja.matches( "y" ) )
@ -353,7 +368,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
public ArrayList searchAnalisesActuaisHS( Integer estabelecimento_id,
String nome, String estabelecimento, String visitaDate, String POR, Integer fromYear )
throws Exception
@ -378,24 +392,33 @@ public class AnalisesDataProvider extends GenericDataProvider
public ArrayList getAnalisesActuaisHsList( Integer estabelecimentoID, Integer fromYear ) throws Exception
{
Expression where = new Field( "apagada" ).isEqual( "n" ).and(
new Field( "estado" ).isEqual( Global.ESTADO_HS )
.or( new Field( "estado" ).isEqual( Global.ESTADO_FECHAR ) )
.or( new Field( "estado" ).isEqual( Global.ESTADO_CONSOLIDACAO ) )
);
new Field( "estado" ).isEqual( Global.ESTADO_HS ).or( new Field( "estado" ).isEqual( Global.ESTADO_FECHAR ) ).or( new Field( "estado" ).isEqual( Global.ESTADO_CONSOLIDACAO ) ) );
if ( fromYear != null )
{
where = where.and( new Field( "EXTRACT( year FROM data_acidente )" ).isEqual( fromYear ) );
}
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analise_nr" },
null, null, null
);
new String[]
{
"analise_nr"
},
null, null, null );
// String sql = "SELECT * " +
// "FROM analises_acidentes " +
@ -413,14 +436,9 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
/*************************************************************************/
/******************************* SEGUIMENTO ******************************/
/*************************************************************************/
public ArrayList searchAnalisesSeguimentoSeg( Integer estabelecimento_id,
String nome, String visitaDate, String POR, String responsavel_loja, Integer fromYear )
throws Exception
@ -527,20 +545,29 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( new Field( "EXTRACT( year FROM analises_acidentes.data_acidente )" ).isEqual( fromYear ) );
}
where = where.and(
new Field( "estado" ).isLess( Global.ESTADO_HS )
.or( new Field( "estado" ).isGreater( Global.ESTADO_HS ).and( new Field( "estado" ).isLess( Global.ESTADO_CONSOLIDACAO ) ) )
.or( new Field( "estado" ).isGreater( Global.ESTADO_CONSOLIDACAO ).and( new Field( "estado" ).isLess( Global.ESTADO_FECHAR ) ) )
);
new Field( "estado" ).isLess( Global.ESTADO_HS ).or( new Field( "estado" ).isGreater( Global.ESTADO_HS ).and( new Field( "estado" ).isLess( Global.ESTADO_CONSOLIDACAO ) ) ).or( new Field( "estado" ).isGreater( Global.ESTADO_CONSOLIDACAO ).and( new Field( "estado" ).isLess( Global.ESTADO_FECHAR ) ) ) );
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analises_acidentes.analise_nr" },
null, null, null
);
new String[]
{
"analises_acidentes.analise_nr"
},
null, null, null );
// String sql = null;
// sql = "SELECT * FROM analises_acidentes WHERE (" +
@ -557,7 +584,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
public ArrayList searchAnalisesSeguimentoRH( Integer estabelecimento_id,
String nome, String visitaDate, String POR, String responsavel_loja, Integer fromYear )
throws Exception
@ -613,14 +639,26 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( or );
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analise_nr" },
null, null, null
);
new String[]
{
"analise_nr"
},
null, null, null );
Statement st = createStatement();
ResultSet rs = st.executeQuery( query.toString() );
@ -628,7 +666,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
public ArrayList searchAnalisesSeguimentoMedico( Integer estabelecimento_id, String nome, String visitaDate, String POR, Integer fromYear )
throws Exception
{
@ -671,31 +708,32 @@ public class AnalisesDataProvider extends GenericDataProvider
where = where.and( new Field( "EXTRACT( year FROM analises_acidentes.data_acidente )" ).isEqual( fromYear ) );
}
where = where.and(
new Field( "analises_acidentes.estado" ).isLess( 5 )
.or(
new Field( "analises_acidentes.estado" ).isEqual( 6 )
.and( new Field( "analises_acidentes.estado_assinatura" ).isDifferent( 2 ) )
)
.or(
new Field( "analises_acidentes.estado" ).isEqual( 6 )
.and( new Field( "analises_acidentes.estado_assinatura" ).isEqual( 2 ) )
.and( new Field( "analises_acidentes.ass_med" ).isEqual( "y" ) )
)
.or(
new Field( "analises_acidentes.estado" ).isGreater( 6 )
.and( new Field( "analises_acidentes.estado" ).isLess( 9 ) )
)
);
new Field( "analises_acidentes.estado" ).isLess( 5 ).or(
new Field( "analises_acidentes.estado" ).isEqual( 6 ).and( new Field( "analises_acidentes.estado_assinatura" ).isDifferent( 2 ) ) ).or(
new Field( "analises_acidentes.estado" ).isEqual( 6 ).and( new Field( "analises_acidentes.estado_assinatura" ).isEqual( 2 ) ).and( new Field( "analises_acidentes.ass_med" ).isEqual( "y" ) ) ).or(
new Field( "analises_acidentes.estado" ).isGreater( 6 ).and( new Field( "analises_acidentes.estado" ).isLess( 9 ) ) ) );
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analises_acidentes.analise_nr" },
null, null, null
);
new String[]
{
"analises_acidentes.analise_nr"
},
null, null, null );
Statement st = createStatement();
ResultSet rs = st.executeQuery( query.toString() );
@ -730,14 +768,26 @@ public class AnalisesDataProvider extends GenericDataProvider
}
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analise_nr" },
null, null, null
);
new String[]
{
"analise_nr"
},
null, null, null );
Statement st = createStatement();
ResultSet rs = st.executeQuery( query.toString() );
@ -796,14 +846,26 @@ public class AnalisesDataProvider extends GenericDataProvider
}
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analise_nr" },
null, null, null
);
new String[]
{
"analise_nr"
},
null, null, null );
Statement st = createStatement();
ResultSet rs = st.executeQuery( query.toString() );
@ -811,14 +873,9 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
/*************************************************************************/
/****************************** CONCLUIDOS *******************************/
/*************************************************************************/
public ArrayList getAnalisesConcluidasList( Integer estabelecimentoID, Integer fromYear ) throws Exception
{
Statement st = createStatement();
@ -835,14 +892,26 @@ public class AnalisesDataProvider extends GenericDataProvider
}
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "*" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"*"
},
where,
new String[] { "analise_nr" },
null, null, null
);
new String[]
{
"analise_nr"
},
null, null, null );
System.out.println( "\ngetAnalisesConcluidasList() : " + query.toString() + "\n" );
@ -936,7 +1005,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
//by lino
// public ArrayList searchAanalisesConcluidasList( Integer estabelecimento_id,
// Integer ano, Integer mes, Integer dia, String por, String nome, String estabelecimento )
@ -1275,7 +1343,6 @@ public class AnalisesDataProvider extends GenericDataProvider
//
// return list;
// }
private ArrayList fillAnaliseFields( ResultSet rs ) throws Exception
{
// Dblocal dblocal = new Dblocal();
@ -1506,7 +1573,8 @@ public class AnalisesDataProvider extends GenericDataProvider
a.setData_desactivacao( rs.getDate( "data_desactivacao" ) );
a.setComentario_desactivacao( rs.getString( "comentario_desactivacao" ) );
list.add( a );
} while ( rs.next() );
}
while ( rs.next() );
return list;
}
@ -1564,7 +1632,8 @@ public class AnalisesDataProvider extends GenericDataProvider
//}
list.add( t );
}while(rslocal.next());
}
while ( rslocal.next() );
}
@ -1619,7 +1688,8 @@ public class AnalisesDataProvider extends GenericDataProvider
//}
list.add( t );
}while(rslocal.next());
}
while ( rslocal.next() );
}
return list;
}
@ -1646,7 +1716,8 @@ public class AnalisesDataProvider extends GenericDataProvider
String sql3 = ") AND LOWER(numero_mecanografico) LIKE '%" + nrMecanografico.toLowerCase() + "%' AND estabelecimentos.empresa_id = " + empresa_id + " AND trabalhadores.inactivo = 'n'";
st = new StringTokenizer( nome );
int n = 0;
while (st.hasMoreTokens ()) {
while ( st.hasMoreTokens() )
{
if ( n > 0 )
{
sql2 += "AND ";
@ -1672,7 +1743,8 @@ public class AnalisesDataProvider extends GenericDataProvider
String sql3 = ") AND estabelecimentos.empresa_id = " + empresa_id + " AND trabalhadores.inactivo = 'n'";
st = new StringTokenizer( nome );
int n = 0;
while (st.hasMoreTokens ()) {
while ( st.hasMoreTokens() )
{
if ( n > 0 )
{
sql2 += "AND ";
@ -1713,7 +1785,8 @@ public class AnalisesDataProvider extends GenericDataProvider
//}
list.add( t );
}while(rslocal.next());
}
while ( rslocal.next() );
return list;
}
@ -1741,7 +1814,8 @@ public class AnalisesDataProvider extends GenericDataProvider
t.setFuncao( rslocal.getString( "funcao_proposta" ) );
t.setData_admissao( rslocal.getDate( "data_admissao" ) );
list.add( t );
}while(rslocal.next());
}
while ( rslocal.next() );
return list;
}
@ -1809,8 +1883,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return nome;
}
public String getEstabelecimentoNome( Integer estabelecimento_id ) throws Exception
{
// Dblocal dblocal = new Dblocal();
@ -1874,7 +1946,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return nome;
}
public Integer getMaxAcidentadoId()
{
Statement st = createStatement();
@ -2038,7 +2109,6 @@ public class AnalisesDataProvider extends GenericDataProvider
}
}
public AnaliseAcidente createAnalise( AnaliseAcidente a ) throws Exception
{
//Controle c = getControle();
@ -2455,7 +2525,8 @@ public class AnalisesDataProvider extends GenericDataProvider
r.setAnalise_id( new Integer( rs.getInt( "analise_id" ) ) );
r.setRecomendacao( rs.getString( "recomendacao" ) );
list.add( r );
}while(rs.next());
}
while ( rs.next() );
}
return list;
@ -2495,8 +2566,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return newId;
}
public void updateMedida( Medida m ) throws Exception
{
Statement st = createStatement();
@ -2531,14 +2600,13 @@ public class AnalisesDataProvider extends GenericDataProvider
m.setAnalise_id( new Integer( rs.getInt( "analise_id" ) ) );
m.setMedida( rs.getString( "medida" ) );
list.add( m );
}while(rs.next());
}
while ( rs.next() );
}
return list;
}
public String getNumeroCedula( Integer medico_id ) throws Exception
{
// Dblocal dblocal = new Dblocal();
@ -2586,7 +2654,8 @@ public class AnalisesDataProvider extends GenericDataProvider
//t.setActivo(rs.getString("activo"));
//t.setOrdem(new Integer(rs.getInt("ordem")));
list.add( t );
}while(rs.next());
}
while ( rs.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2641,7 +2710,8 @@ public class AnalisesDataProvider extends GenericDataProvider
list.add( t );
}
}while(rs.next());
}
while ( rs.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2695,7 +2765,8 @@ public class AnalisesDataProvider extends GenericDataProvider
//t.setActivo(rs.getString("activo"));
//t.setOrdem(new Integer(rs.getInt("ordem")));
list.add( e );
}while(rslocal.next());
}
while ( rslocal.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2750,7 +2821,8 @@ public class AnalisesDataProvider extends GenericDataProvider
//t.setActivo(rs.getString("activo"));
//t.setOrdem(new Integer(rs.getInt("ordem")));
list.add( e );
}while(rslocal.next());
}
while ( rslocal.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2789,7 +2861,8 @@ public class AnalisesDataProvider extends GenericDataProvider
m.setId( new Integer( rslocal.getInt( "id" ) ) );
m.setNome( rslocal.getString( "nome" ) );
list.add( m );
}while(rslocal.next());
}
while ( rslocal.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2828,7 +2901,8 @@ public class AnalisesDataProvider extends GenericDataProvider
t.setId( new Integer( rslocal.getInt( "id" ) ) );
t.setNome( rslocal.getString( "nome" ) );
list.add( t );
}while(rslocal.next());
}
while ( rslocal.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2844,41 +2918,71 @@ public class AnalisesDataProvider extends GenericDataProvider
return listOptions;
}
public com.sun.rave.web.ui.model.Option[] getCausasList() throws Exception
public com.sun.rave.web.ui.model.Option[] getCausasAcidente( ) throws Exception
{
ArrayList list = new ArrayList();
Causa c = new Causa();
c.setId(new Integer(0));
c.setCausa("-Seleccionar-");
list.add(c);
Statement st = createStatement();
String sql = "SELECT * FROM causas WHERE activa = 'y'";
ResultSet rs = st.executeQuery(sql);
if(rs.isBeforeFirst())
com.sun.rave.web.ui.model.Option[] options = null;
Select2 query = new Select2(
new String[] { CausasData.TABLENAME },
new Integer[] { },
new Expression[] { },
new String[] { CausasData.ID_FULL, CausasData.CAUSA_FULL },
new Field( CausasData.ACTIVA_FULL ).isEqual( "y" ),
new String[] { CausasData.ID_FULL, CausasData.CAUSA_FULL },
null, null, null
);
Virtual2DArray array = getExecuter().executeQuery( query );
if ( array != null )
{
rs.first();
do
options = new com.sun.rave.web.ui.model.Option[ array.columnLength() + 1 ];
options[ 0 ] = new Option( new Integer( 0 ), "-Seleccionar" );
for ( int i = 0; i < array.columnLength(); i++ )
{
c = new Causa();
c.setId( new Integer(rs.getInt("id")) );
c.setCausa(rs.getString("causa"));
list.add(c);
}while(rs.next());
Integer causaID = array.get( i, 0 );
String causa = array.get( i, 1 );
options[ (i+1) ] = new Option( causaID, causa );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[list.size()];
ListIterator iter = list.listIterator();
int i = 0;
while(iter.hasNext())
{
c = (Causa) iter.next();
listOptions[i] = new Option(c.getId(), c.getCausa());
i++;
}
return listOptions;
return options;
}
// public com.sun.rave.web.ui.model.Option[] getCausasList() throws Exception
// {
// ArrayList list = new ArrayList();
// Causa c = new Causa();
// c.setId( new Integer( 0 ) );
// c.setCausa( "-Seleccionar-" );
// list.add( c );
// Statement st = createStatement();
// String sql = "SELECT * FROM causas WHERE activa = 'y'";
// ResultSet rs = st.executeQuery( sql );
// if ( rs.isBeforeFirst() )
// {
// rs.first();
// do
// {
// c = new Causa();
// c.setId( new Integer( rs.getInt( "id" ) ) );
// c.setCausa( rs.getString( "causa" ) );
// list.add( c );
// }
// while ( rs.next() );
// }
//
// com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
// ListIterator iter = list.listIterator();
// int i = 0;
// while ( iter.hasNext() )
// {
// c = ( Causa ) iter.next();
//
// listOptions[i] = new Option( c.getId(), c.getCausa() );
// i++;
// }
// return listOptions;
// }
public com.sun.rave.web.ui.model.Option[] getDepartamentosList() throws Exception
{
ArrayList list = new ArrayList();
@ -2899,7 +3003,8 @@ public class AnalisesDataProvider extends GenericDataProvider
d.setId( new Integer( rs.getInt( "id" ) ) );
d.setDescricao( rs.getString( "descricao" ) );
list.add( d );
}while(rs.next());
}
while ( rs.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2945,7 +3050,8 @@ public class AnalisesDataProvider extends GenericDataProvider
s.setDescricao( rs.getString( "descricao" ) );
s.setDepartamento_id( new Integer( rs.getInt( "departamento_id" ) ) );
list.add( s );
}while(rs.next());
}
while ( rs.next() );
}
com.sun.rave.web.ui.model.Option[] listOptions = new com.sun.rave.web.ui.model.Option[ list.size() ];
@ -2961,8 +3067,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return listOptions;
}
public Causa getCausa( Integer id ) throws Exception
{
Statement st = createStatement();
@ -3003,17 +3107,32 @@ public class AnalisesDataProvider extends GenericDataProvider
Expression where = new Field( "apagada" ).isEqual( "n" );
if ( excludeYear != null )
{
where = where.and( new Field( "EXTRACT( year FROM data_acidente )" ).notIn( new Integer[] { excludeYear } ) );
where = where.and( new Field( "EXTRACT( year FROM data_acidente )" ).notIn( new Integer[]
{
excludeYear
} ) );
}
Select2 query = new Select2(
new String[] { "analises_acidentes" },
new Integer[] {},
new Expression[] {},
new String[] { "DISTINCT( cast( EXTRACT( year FROM data_acidente ) as integer ) ) AS ano" },
new String[]
{
"analises_acidentes"
},
new Integer[]
{
},
new Expression[]
{
},
new String[]
{
"DISTINCT( cast( EXTRACT( year FROM data_acidente ) as integer ) ) AS ano"
},
where,
new String[] { "ano DESC" },
null, null, null
);
new String[]
{
"ano DESC"
},
null, null, null );
query.disableOrderFieldsVerification();
Virtual2DArray array = getExecuter().executeQuery( query );
for ( int i = 0; i < array.columnLength(); i++ )
@ -3050,8 +3169,6 @@ public class AnalisesDataProvider extends GenericDataProvider
return list;
}
public String getFase( int estado )
{
if ( estado == Global.ESTADO_SEG )
@ -3159,11 +3276,9 @@ public class AnalisesDataProvider extends GenericDataProvider
System.out.println( "LOGO SIZE : " + logo.length );
return logo;
}
// private Statement createStatement()
// {
// Db db = new Db();
// return db.createStatement();
// }
}

Write Preview
Loading…
Cancel
Save