|
|
|
|
@ -16,10 +16,13 @@ import com.evolute.utils.data.MappableObject;
|
|
|
|
|
import com.evolute.utils.db.DBManager;
|
|
|
|
|
import com.evolute.utils.db.Executer;
|
|
|
|
|
import com.evolute.utils.jdo.JDOProvider;
|
|
|
|
|
import com.evolute.utils.sql.Assignment;
|
|
|
|
|
import com.evolute.utils.sql.Expression;
|
|
|
|
|
import com.evolute.utils.sql.Field;
|
|
|
|
|
import com.evolute.utils.sql.Insert;
|
|
|
|
|
import com.evolute.utils.sql.Select;
|
|
|
|
|
import com.evolute.utils.sql.Select2;
|
|
|
|
|
import com.evolute.utils.sql.Update;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.Comparator;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
@ -216,7 +219,7 @@ public class ProcessoDataProvider
|
|
|
|
|
null );
|
|
|
|
|
Virtual2DArray array = EXECUTER.executeQuery( select );
|
|
|
|
|
if( array.columnLength() == 0 || array.get( 0, 0 ) == null )
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
@ -225,6 +228,30 @@ public class ProcessoDataProvider
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void saveObservacoesConsultaData( Integer consultaDataID, String observacao )
|
|
|
|
|
throws Exception
|
|
|
|
|
{
|
|
|
|
|
IDObject observacaoAntiga = getObservacoesConsultaData( consultaDataID );
|
|
|
|
|
if( observacaoAntiga != null )
|
|
|
|
|
{
|
|
|
|
|
Update update =
|
|
|
|
|
new Update( "consultas_datas_observacoes",
|
|
|
|
|
new Assignment[]{
|
|
|
|
|
new Assignment( "observacao", observacao ) },
|
|
|
|
|
new Field( "id" ).isEqual( observacaoAntiga.getID() ) );
|
|
|
|
|
EXECUTER.executeQuery( update );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
Insert insert =
|
|
|
|
|
new Insert( "consultas_datas_observacoes",
|
|
|
|
|
new Assignment[]{
|
|
|
|
|
new Assignment( "observacao", observacao ),
|
|
|
|
|
new Assignment( "trabalhadores_consultas_datas_id", consultaDataID ) } );
|
|
|
|
|
EXECUTER.executeQuery( insert );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Integer getLastConsultaDataIDForConsulta( Integer consultaID )
|
|
|
|
|
throws Exception
|
|
|
|
|
{
|
|
|
|
|
@ -253,7 +280,7 @@ public class ProcessoDataProvider
|
|
|
|
|
throws Exception
|
|
|
|
|
{
|
|
|
|
|
Select select =
|
|
|
|
|
new Select2( new String[]{ "consultas_datas_observacoes" },
|
|
|
|
|
new Select2( new String[]{ "trabalhadores_consultas_datas_observacoes" },
|
|
|
|
|
new Integer[]{},
|
|
|
|
|
new Expression[]{},
|
|
|
|
|
new String[]{ "id", "observacao" },
|
|
|
|
|
@ -273,6 +300,30 @@ public class ProcessoDataProvider
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void saveObservacoesECDsData( Integer ecdsDataID, String observacao )
|
|
|
|
|
throws Exception
|
|
|
|
|
{
|
|
|
|
|
IDObject observacaoAntiga = getObservacoesECDsData( ecdsDataID );
|
|
|
|
|
if( observacaoAntiga != null )
|
|
|
|
|
{
|
|
|
|
|
Update update =
|
|
|
|
|
new Update( "trabalhadores_ecds_datas_observacoes",
|
|
|
|
|
new Assignment[]{
|
|
|
|
|
new Assignment( "observacao", observacao ) },
|
|
|
|
|
new Field( "id" ).isEqual( observacaoAntiga.getID() ) );
|
|
|
|
|
EXECUTER.executeQuery( update );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
Insert insert =
|
|
|
|
|
new Insert( "trabalhadores_ecds_datas_observacoes",
|
|
|
|
|
new Assignment[]{
|
|
|
|
|
new Assignment( "observacao", observacao ),
|
|
|
|
|
new Assignment( "trabalhadores_ecds_datas_id", ecdsDataID ) } );
|
|
|
|
|
EXECUTER.executeQuery( insert );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public Integer getLastECDsDataIDForECDs( Integer ecdsID )
|
|
|
|
|
throws Exception
|
|
|
|
|
{
|
|
|
|
|
|