refactor : Retouche sauts de lignes, suppression @column

abes-esr · Nov 12, 2024 · 2d36caf · 2d36caf
1 parent d920f05
commit 2d36caf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/src/main/java/fr/abes/item/core/dto/DemandeDto.java b/core/src/main/java/fr/abes/item/core/dto/DemandeDto.java
@@ -2,7 +2,6 @@
 
 import fr.abes.item.core.entities.baseXml.LibProfile;
 import fr.abes.item.core.entities.item.Demande;
-import jakarta.persistence.Column;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,7 +13,6 @@
 public class DemandeDto {
     private Demande demande;
 
-    @Column(name = "NB_LIGNEFICHIER")
     private Integer nbLignes;
 
     public DemandeDto(Demande demande, Integer nbLignes) {

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
@@ -9,22 +9,26 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Optional;
 
 @Repository
 @ItemConfiguration
 public interface IDemandeSuppDao extends JpaRepository<DemandeSupp, Integer> {
 
     @Query("select new fr.abes.item.core.dto.DemandeDto(d, COUNT(l)) FROM DemandeSupp d JOIN d.ligneFichierSupps l WHERE d.etatDemande.numEtat NOT IN (9, 10) GROUP BY d")
     List<DemandeDto> getAllActiveDemandesSuppForAdminExtended();
+
     @Query("select new fr.abes.item.core.dto.DemandeDto(d, COUNT(l)) FROM DemandeSupp d JOIN d.ligneFichierSupps l where d.iln = :iln and d.etatDemande.numEtat not in (9, 10) GROUP BY d")
     List<DemandeDto> getAllActiveDemandesSuppForAdmin(@Param("iln") String iln);
+
     @Query("select new fr.abes.item.core.dto.DemandeDto(d, COUNT(l)) FROM DemandeSupp d JOIN d.ligneFichierSupps l where d.iln = :iln and d.etatDemande.numEtat = 9 GROUP BY d")
     List<DemandeDto> getAllArchivedDemandesSupp(@Param("iln") String iln);
+
     @Query("select d from DemandeSupp d where d.iln = :iln and d.etatDemande.numEtat not in (9, 2, 10)")
     List<DemandeDto> getActiveDemandesSuppForUserExceptedPreparedStatus(@Param("iln") String iln);
+
     @Query("select new fr.abes.item.core.dto.DemandeDto(d, COUNT(l)) FROM DemandeSupp d JOIN d.ligneFichierSupps l where d.etatDemande.numEtat = 9 GROUP BY d")
     List<DemandeDto> getAllArchivedDemandesSuppExtended();
+
     List<DemandeSupp> findDemandeSuppsByEtatDemande_IdOrderByDateModificationAsc(Integer id);
 
     @Query("select d from DemandeSupp d where d.etatDemande.numEtat = 7 and (day(current_date) - day(d.dateModification)) > 90 order by d.dateModification asc")