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

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

trunk/SIPRPSoft/src/siprp/data/provider/PlanoActuacaoDataProvider.java

@@ -436,18 +436,17 @@ public class PlanoActuacaoDataProvider
 	{
 		
 		List<ForeignKey> fks = new LinkedList<ForeignKey>();
-		/*
+		
-		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 ) );