diff --git a/trunk/SIPRPSoft/lib/shst.jar b/trunk/SIPRPSoft/lib/shst.jar index 9e287013..2045d780 100644 Binary files a/trunk/SIPRPSoft/lib/shst.jar and b/trunk/SIPRPSoft/lib/shst.jar differ diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties index d334a401..be0da99d 100644 --- a/trunk/SIPRPSoft/properties/version.properties +++ b/trunk/SIPRPSoft/properties/version.properties @@ -1,6 +1,6 @@ #siprpsoft versioning file -#Thu Aug 26 12:49:43 WEST 2010 +#Fri Aug 27 10:10:39 WEST 2010 major=12 name=siprpsoft minor=2 -build=4 +build=5 diff --git a/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java b/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java index fe9a6323..70b83220 100644 --- a/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java @@ -436,18 +436,17 @@ public class PlanoActuacaoDataProvider { List fks = new LinkedList(); - /* - FROM hs_relatorio_posto_risco - INNER JOIN hs_relatorio_risco ON hs_relatorio_risco.id = hs_relatorio_posto_risco.risco_id - left outer JOIN hs_relatorio_medida ON hs_relatorio_medida.risco_id = hs_relatorio_risco.id AND hs_relatorio_medida.deleted_date IS NULL - */ + ForeignKey fk1 = new ForeignKey( HsRelatorioPostoRiscoData.class, HsRelatorioPostoRiscoData.RISCO_ID_FULL, HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL ); fk1.setJoin( JOIN.INNER ); ForeignKey fk2 = new ForeignKey( HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL, HsRelatorioMedidaData.class, HsRelatorioMedidaData.RISCO_ID_FULL ); fk2.setJoin( JOIN.OUTER ); fk2.setJoinExpression( fk2.getJoinExpression().and( new Field( HsRelatorioMedidaData.DELETED_DATE_FULL ).isEqual( null )) ); + ForeignKey fk3 = new ForeignKey( HsRelatorioMedidaData.class, HsRelatorioMedidaData.ID_FULL, HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.MEDIDA_ID_FULL ); + fk3.setJoin( JOIN.INNER ); fks.add( fk1 ); fks.add( fk2 ); + fks.add( fk3 ); // fks.add( new ForeignKey( HsRelatorioPostoMedidaData.class, HsRelatorioPostoMedidaData.MEDIDA_ID_FULL, HsRelatorioMedidaData.class, HsRelatorioMedidaData.ID_FULL ) ); // fks.add( new ForeignKey( HsRelatorioMedidaData.class, HsRelatorioMedidaData.RISCO_ID_FULL, HsRelatorioRiscoData.class, HsRelatorioRiscoData.ID_FULL ) );