From c9f7afb23d56588b6ab16cd05d56511fc16acb18 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Wed, 5 Aug 2026 19:07:05 +0100 Subject: [PATCH] reajustement workflow --- .../rfu/metier/ImpositionsTfuController.java | 22 +++++++++++++++++-- .../export_donnee_imposition_vers_sigibe.sql | 4 ++++ .../integrer_avis_dans_table_eavis.sql | 13 +++++++++-- 3 files changed, 35 insertions(+), 4 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 8ba4e1c..aa50ed8 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 @@ -1,14 +1,17 @@ package io.gmss.fiscad.controllers.rfu.metier; +import io.gmss.fiscad.entities.infocad.parametre.Structure; import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.StatusAvis; import io.gmss.fiscad.exceptions.*; import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService; +import io.gmss.fiscad.interfaces.infocad.parametre.StructureService; import io.gmss.fiscad.interfaces.rfu.metier.ImpositionsTfuService; import io.gmss.fiscad.paylaods.ApiResponse; import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb; +import io.gmss.fiscad.paylaods.request.crudweb.StructurePaylaodWeb; import io.gmss.fiscad.security.CurrentUser; import io.gmss.fiscad.security.UserPrincipal; import io.swagger.v3.oas.annotations.Operation; @@ -29,6 +32,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.client.HttpClientErrorException; +import java.util.Optional; + @RestController @AllArgsConstructor @@ -39,6 +44,8 @@ import org.springframework.web.client.HttpClientErrorException; public class ImpositionsTfuController { private final ImpositionsTfuService impositionsTfuService; + private final StructureService structureService; + private final EnqueteService enqueteService; private static final Logger logger = LoggerFactory.getLogger(ImpositionsTfuController.class); @@ -54,11 +61,22 @@ public class ImpositionsTfuController { HttpStatus.OK ); } - User user=currentUser.getUser(); + + if(impositionsTfuPaylaodWeb.getStructureId()==null){ + return new ResponseEntity<>( + new ApiResponse<>(false, null, "Veuillez préciser la strucuture."), + HttpStatus.OK + ); + } + + User user = currentUser.getUser(); + + StructurePaylaodWeb st = structureService.getStructureById(impositionsTfuPaylaodWeb.getStructureId()).orElseGet(null); + if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){ return new ResponseEntity<>( - new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."), + new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource. Votre centre : "+ user.getStructure().getNom() +" le centre de liquidation : "+ st.getNom()), HttpStatus.OK ); } diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql index b60269f..38bcfe5 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql @@ -121,6 +121,10 @@ FROM impositions_tfu imp order by exo.annee,dimp.parcelle_id,dimp.nature_impot, dimp.montant_taxe-coalesce(dimp.acompte,0)-coalesce(dimp.retenu_irf,0) desc ; +select * from e_avis_view + +select * +from impositions_tfu; --------------------------------------------------- diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_avis_dans_table_eavis.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_avis_dans_table_eavis.sql index 65ce6b0..c4a91c7 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_avis_dans_table_eavis.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_avis_dans_table_eavis.sql @@ -63,6 +63,15 @@ $$; call integrer_eavis(); -select * from eavis +call integrer_eavis_detail(); -delete from eavis; \ No newline at end of file +select * +from e_avis_view ; + +select * from eavis; + + +select * from eavis_detail; + +select * +from donnees_imposition_tfu; \ No newline at end of file -- 2.49.1