diff --git a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeExempDao.java b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeExempDao.java index a19caa7..1796dfb 100644 --- a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeExempDao.java +++ b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeExempDao.java @@ -18,16 +18,16 @@ @Repository @ItemConfiguration public interface IDemandeExempDao extends JpaRepository { - @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification") + @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification desc") List getDemandesEnAttenteGrosVolume(@Param("limite") int limite); - @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification") + @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification desc") List getDemandesEnAttentePetitVolume(@Param("limite") int limite); - @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) > :limite order by d.dateModification asc") + @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) > :limite order by d.dateModification desc") List getDemandesToProceedWithoutDATGrosVolume(@Param("limite") int limite); - @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) <= :limite order by d.dateModification asc") + @Query("select d from DemandeExemp d join d.ligneFichierExemps l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) <= :limite order by d.dateModification desc") List getDemandesToProceedWithoutDATPetitVolume(@Param("limite") int limite); @Query("select e from TypeExemp e where e.numTypeExemp in (select d.typeExemp.numTypeExemp from DemandeExemp d where d.numDemande = :numDemande)") diff --git a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeModifDao.java b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeModifDao.java index 1f9f7fc..e1e9167 100644 --- a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeModifDao.java +++ b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeModifDao.java @@ -37,10 +37,10 @@ public interface IDemandeModifDao extends JpaRepository { @Query("select new fr.abes.item.core.dto.DemandeDto(d, COUNT(l)) from DemandeModif d LEFT JOIN d.ligneFichierModifs l where d.etatDemande.numEtat = 9 GROUP BY d") List getAllArchivedDemandesModifExtended(); - @Query("select d from DemandeModif d join d.ligneFichierModifs l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification") + @Query("select d from DemandeModif d join d.ligneFichierModifs l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification desc") List getDemandesEnAttenteGrosVolume(@Param("limite") int limite); - @Query("select d from DemandeModif d join d.ligneFichierModifs l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification") + @Query("select d from DemandeModif d join d.ligneFichierModifs l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification desc") List getDemandesEnAttentePetitVolume(@Param("limite") int limite); @Query("select d from DemandeModif d where d.etatDemande.numEtat = 10 order by d.dateModification asc") diff --git a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeRecouvDao.java b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeRecouvDao.java index 881bc29..d5ffd22 100644 --- a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeRecouvDao.java +++ b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeRecouvDao.java @@ -13,16 +13,16 @@ @ItemConfiguration public interface IDemandeRecouvDao extends JpaRepository { - @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification") + @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification desc") List getDemandesEnAttenteGrosVolume(@Param("limite") int limite); - @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification") + @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification desc") List getDemandesEnAttentePetitVolume(@Param("limite") int limite); - @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) > :limite order by d.dateModification asc") + @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) > :limite order by d.dateModification desc") List getDemandesToProceedWithoutDATGrosVolume(@Param("limite") int limite); - @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) <= :limite order by d.dateModification asc") + @Query("select d from DemandeRecouv d join d.ligneFichierRecouvs l where d.etatDemande.numEtat = 5 and d.indexRecherche.code != 'DAT' group by d having count(l) <= :limite order by d.dateModification desc") List getDemandesToProceedWithoutDATPetitVolume(@Param("limite") int limite); @Query("select d from DemandeRecouv d where d.etatDemande.numEtat = 10 order by d.dateModification asc") diff --git a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeSuppDao.java b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeSuppDao.java index c5f45c3..c66761f 100644 --- a/core/src/main/java/fr/abes/item/core/repository/item/IDemandeSuppDao.java +++ b/core/src/main/java/fr/abes/item/core/repository/item/IDemandeSuppDao.java @@ -29,10 +29,10 @@ public interface IDemandeSuppDao extends JpaRepository { @Query("select new fr.abes.item.core.dto.DemandeDto(d, COUNT(l)) FROM DemandeSupp d LEFT JOIN d.ligneFichierSupps l where d.etatDemande.numEtat = 9 GROUP BY d") List getAllArchivedDemandesSuppExtended(); - @Query("select d from DemandeSupp d join d.ligneFichierSupps l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification") + @Query("select d from DemandeSupp d join d.ligneFichierSupps l where d.etatDemande.numEtat = 5 group by d having count(l) > :limite order by d.dateModification desc") List getDemandesEnAttenteGrosVolume(@Param("limite") int limite); - @Query("select d from DemandeSupp d join d.ligneFichierSupps l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification") + @Query("select d from DemandeSupp d join d.ligneFichierSupps l where d.etatDemande.numEtat = 5 group by d having count(l) <= :limite order by d.dateModification desc") List getDemandesEnAttentePetitVolume(@Param("limite") int limite); @Query("select d from DemandeSupp d where d.etatDemande.numEtat = 7 and (day(current_date) - day(d.dateModification)) > 90 order by d.dateModification asc")