22/01/2009

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

trunk/AnaliseAcidentesTrabalho/src/java/db/AnalisesDataProvider.java

@@ -1256,15 +1256,17 @@ public class AnalisesDataProvider {
         Integer newId = getMaxAnaliseId();
 
         //calc analise_nr
-        java.util.Date now = new java.util.Date();
+        java.util.Date data_acidente = new java.util.Date(a.getData_acidente().getTime());
+        //java.util.Date now = new java.util.Date();
         Calendar cal = new GregorianCalendar();
-        cal.setTime(now);        
+        //cal.setTime(now);        
+        cal.setTime(data_acidente);
         int ano = cal.get(Calendar.YEAR);
-        if(c.getAnalise_year().intValue() != ano)
-        {
-            c.setAnalise_year(new Integer(ano));
-            c.setLast_analise_nr(new Integer(0));
-        }
+//        if(c.getAnalise_year().intValue() != ano)
+//        {
+//            c.setAnalise_year(new Integer(ano));
+//            c.setLast_analise_nr(new Integer(0));
+//        }
         //String seq_str = new Integer(10000 + newId.intValue()).toString();
         int i_analise_nr = c.getLast_analise_nr().intValue() + 1;
         c.setLast_analise_nr(new Integer(i_analise_nr));