From db1fd2c8213b6a276f779b77338b19d592e25cc4 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Mon, 9 Mar 2026 20:31:09 +0100 Subject: [PATCH] Gestion des barem --- .../rfu/metier/ImpositionsTfuController.java | 5 +- .../crudweb/BaremRfuBatiPayloadWeb.java | 13 ++++- .../rfu/parametre/BaremRfuRepository.java | 48 +++++++++++++++---- 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java index 81d4df2..cadfc3b 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java @@ -47,9 +47,8 @@ public class ImpositionsTfuController { public ResponseEntity createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) { try { if(currentUser==null){ - return new ResponseEntity<>( - new ApiResponse<>(true, null, "Vous n'etes pas autorisé à accéder à cette ressource."), + new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."), HttpStatus.OK ); } @@ -57,7 +56,7 @@ public class ImpositionsTfuController { if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){ return new ResponseEntity<>( - new ApiResponse<>(true, null, "Vous n'etes pas autorisé à accéder à cette ressource."), + new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."), HttpStatus.OK ); } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BaremRfuBatiPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BaremRfuBatiPayloadWeb.java index 6e87ff9..f097b73 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BaremRfuBatiPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BaremRfuBatiPayloadWeb.java @@ -24,10 +24,18 @@ public class BaremRfuBatiPayloadWeb { private String quartierCode; private String quartierNom; + private Long communeId; + private String communeCode; + private String communeNom; + public BaremRfuBatiPayloadWeb(Long id, Long valeurLocative, Double tfuMetreCarre, Long tfuMinimum, Long categorieBatimentId, String categorieBatimentNom, String categorieBatimentStanding, Long arrondissementId, String arrondissementCode, String arrondissementNom, Long quartierId, String quartierCode, - String quartierNom ) { + String quartierNom, + Long communeId, + String communeCode, + String communeNom + ) { this.id = id; this.valeurLocative = valeurLocative; this.tfuMetreCarre = tfuMetreCarre; @@ -41,5 +49,8 @@ public class BaremRfuBatiPayloadWeb { this.quartierId = quartierId; this.quartierCode = quartierCode; this.quartierNom = quartierNom; + this.communeId = communeId; + this.communeCode = communeCode; + this.communeNom = communeNom; } } diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java index 0e72e27..36ff193 100644 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java @@ -27,12 +27,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c """) Page findAllPayloadPaged(Pageable pageable); @@ -50,12 +54,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c """) List findAllPayload(); @@ -73,12 +81,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c WHERE a.id = :arrondissementId """) List findByArrondissementId( @@ -99,12 +111,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c WHERE b.id = :baremRfuBatiId """) Optional findByBaremRfuBatieId( @@ -125,12 +141,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c WHERE a.id = :arrondissementId """) Page findByArrondissementIdPaged( @@ -152,12 +172,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c WHERE a.id = :arrondissementId and cb.id = :categorieBatimentId """) @@ -180,12 +204,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c WHERE cb.id = :categorieBatimentId """) List findByCategorieBatiment( @@ -207,12 +235,16 @@ public interface BaremRfuRepository extends JpaRepository { a.nom, q.id, q.code, - q.nom + q.nom, + c.id, + c.code, + c.nom ) FROM BaremRfuBati b LEFT JOIN b.categorieBatiment cb LEFT JOIN b.arrondissement a LEFT JOIN b.quartier q + LEFT JOIN a.commune c WHERE cb.id = :categorieBatimentId and q.id = :quartierId """)