This is an automated email from the git hooks/post-receive script. New commit to branch feature/7909_import_generique_id_obsoletes in repository tutti. See http://git.codelutin.com/tutti.git commit fa6349e9037578b41cb222d3714e234c0b824fdd Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jan 17 18:36:09 2016 +0100 Correction de la requete pour récupérer les navires obsolètes --- tutti-persistence/src/main/resources/queries-failsafe.hbm.xml | 1 - .../src/test/resources/genericFormat/withObsoletes/operation.csv | 2 +- tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index e666615..0a16a0a 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -1344,7 +1344,6 @@ AND v.status.code IN (:statusValidCode, :statusTemporaryCode, :statusDisableCode) AND vrp.vesselRegistrationPeriodPk.startDateTime <= :refDate AND vf.startDateTime <= :refDate - AND coalesce(vf.endDateTime, :refDate) >= :refDate ORDER BY v.code, vf.startDateTime, vrp.vesselRegistrationPeriodPk.startDateTime ]]> <!-- FIXME le navire n'a plus de période ouverte de registre AND coalesce(vrp.endDateTime, :refDate) >= :refDate --> diff --git a/tutti-service/src/test/resources/genericFormat/withObsoletes/operation.csv b/tutti-service/src/test/resources/genericFormat/withObsoletes/operation.csv index 349dc91..8f521ca 100644 --- a/tutti-service/src/test/resources/genericFormat/withObsoletes/operation.csv +++ b/tutti-service/src/test/resources/genericFormat/withObsoletes/operation.csv @@ -1,2 +1,2 @@ Annee;Serie;Serie_Partielle;Code_Station;Id_Operation;Poche;Engin;Rang_Engin;Navire;DateDeb;LatDeb;LongDeb;DateFin;LatFin;LongFin;Duree;Strate;Sous_Strate;Localite;Validite_OP;Rectiligne;Distance;Saisisseur;Navire_Associe;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Car [...] -2015;Campagne EVHOE;1;A;1;1;GOV 36/47;1;868095;27/11/2013 00:00:00;12.0;23.0;27/11/2013 01:00:00;12.0;23.1;60;Strate Cc4;NA;NA;Y;Y;10888;Angelique JADAUD;278970;;582.107;Y;150.1;Y;432.007;Y;0.0;Y;1412.1;N;150.0;N;582.0;Y;-9.0;?;150.0;Y;432.0;Y;0.0;Y;-9.0;?;0.107;Y;0.1;Y;0.1;Y;0.007;Y;0.0;Y;0.0;Y;3.0;Y;CAM-EVHOE;379;100158;136495;868095;63353;;;2158;278970 \ No newline at end of file +2015;Campagne EVHOE;1;A;1;1;GOV 36/47;1;868095;27/11/2013 00:00:00;12.0;23.0;27/11/2013 01:00:00;12.0;23.1;60;Strate Cc4;NA;NA;Y;Y;10888;Angelique JADAUD;278970;;582.107;Y;150.1;Y;432.007;Y;0.0;Y;1412.1;N;150.0;N;582.0;Y;-9.0;?;150.0;Y;432.0;Y;0.0;Y;-9.0;?;0.107;Y;0.1;Y;0.1;Y;0.007;Y;0.0;Y;0.0;Y;3.0;Y;CAM-EVHOE;379;100158;136495;868095;63353;;;2158;278970|267465 \ No newline at end of file diff --git a/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv b/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv index 9883e35..aefcc8b 100644 --- a/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv +++ b/tutti-service/src/test/resources/genericFormat/withObsoletes/survey.csv @@ -1,2 +1,2 @@ Annee;Serie;Serie_Partielle;Navire;Nombre_Poches;Pays;Zone_Etude;Campagne;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire;Serie_Id;Campagne_Id;Navire_Id;Engin_Id;Port_Deb_Campagne_Id;Port_Fin_Campagne_Id;Chef_Mission_Id;Resp_Salle_Tri_Id -2015;Campagne EVHOE;1;868095;1;FRA;EVHOE - Golfe de Gascogne / Mer Celtique;EVHOE 2015;;17/10/2015 07:00:00;Brest;30/11/2015 20:00:00;Brest;Jean Claude MAHE|Jean-Pierre LEAUTE|Lionel PAWLOWSKI;Erwan DUHAMEL|Francois GARREN|Ludovic BOUCHE;;CAM-EVHOE;100000;267465;379|67|22;515;530;133;128 +2015;Campagne EVHOE;1;868095;1;FRA;EVHOE - Golfe de Gascogne / Mer Celtique;EVHOE 2015;;17/10/2015 07:00:00;Brest;30/11/2015 20:00:00;Brest;Jean Claude MAHE|Jean-Pierre LEAUTE|Lionel PAWLOWSKI;Erwan DUHAMEL|Francois GARREN|Ludovic BOUCHE;;CAM-EVHOE;100000;1003931;379|67|22;515;530;133;128 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.