Generation tfu batie et non batie avec ressource de liste de données imposition

.gitea/workflows/cd-main.yml

@@ -52,8 +52,10 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV"
 
       # 4) Checkout du dépôt
+      #- name: Checkout repository
+      #  uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
       - name: Checkout repository
-        uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
+        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }} .
 
       # 5) Informations de contexte (sans secrets)
       - name: Show context information

.gitea/workflows/ci-develop.yml

@@ -52,8 +52,10 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV"
 
       # 4) Checkout du dépôt
+      #- name: Checkout repository
+      #  uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
       - name: Checkout repository
-        uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
+        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }} .
 
       # 5) Création des secrets runtime (CI uniquement)
       - name: Create runtime secrets

src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java

@@ -483,37 +483,7 @@ public class EnqueteController {
 
 
 
-    @PutMapping("/cloturer-enquete")
-    public ResponseEntity<?> cloturerEnquete(@CurrentUser UserPrincipal userPrincipal) {
-        try {
 
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Accès non autorisé"),
-                        HttpStatus.NOT_ACCEPTABLE
-                );
-            }
-            User user= userPrincipal.getUser();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteService.cloturerEnqueteParcelleBatimentUniteLogementByUserId(user.getId()), "enquete cloturées avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 
 
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java

@@ -7,7 +7,10 @@ import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
+import io.gmss.fiscad.security.CurrentUser;
+import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -160,6 +163,104 @@ public class DonneesImpositionTfuController {
         }
     }
 
+
+    @GetMapping("/all-page/by-imposition-id/{impositionId}")
+    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
+        try {
+            Pageable pageable = PageRequest.of(pageNo, pageSize);
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
+                    HttpStatus.OK
+            );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
+    @GetMapping("/all-page/by-imposition-id/non-batie/{impositionId}")
+    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdNonBatiePaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
+        try {
+            Pageable pageable = PageRequest.of(pageNo, pageSize);
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdNonBatiePageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
+                    HttpStatus.OK
+            );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
+
+    @GetMapping("/all-page/by-imposition-id/batie-batiment/{impositionId}")
+    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieBatimentPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
+        try {
+            Pageable pageable = PageRequest.of(pageNo, pageSize);
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
+                    HttpStatus.OK
+            );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
+    @GetMapping("/all-page/by-imposition-id/batie-unite-logement/{impositionId}")
+    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieUniteLogPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
+        try {
+            Pageable pageable = PageRequest.of(pageNo, pageSize);
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
+                    HttpStatus.OK
+            );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getDonneesImpositionTfuById(@PathVariable Long id) {
         try {
@@ -182,31 +283,91 @@ public class DonneesImpositionTfuController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    @Operation(summary = "Générer les données fiscales TFU")
-    @PostMapping("/generer")
-    public ResponseEntity<?> genererDonneesFiscale(@RequestBody ImpositionsTfu impositionsTfu) {
+    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
+    @PostMapping("/generer-batie")
+    public ResponseEntity<?> genererDonneesFiscaleBatie(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfu.getId());
+            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
 
             if(optionalImpositionsTfu.isEmpty()){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'imposition tfu n'est pas trouvée."),
+                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
                         HttpStatus.OK
                 );
             }
 
-            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.CREE)){
+            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.TFU_FNB_GENERE)){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "le statut actuel ne permet pas cette opération."),
+                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
                         HttpStatus.OK
                 );
             }
 
-            optionalImpositionsTfu.get().setStatusAvis(StatusAvis.GENERE);
+           if(userPrincipal==null){
                return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.genererDonneesFiscales(optionalImpositionsTfu.get()), "DonneesImpositionTfu trouvée avec succès."),
+                       new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
                        HttpStatus.OK
                );
+           }
+            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
+
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition des fonciers batis Générées avec succès."),
+                    HttpStatus.OK
+            );
+
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
+
+
+
+    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
+    @PostMapping("/generer-non-batie")
+    public ResponseEntity<?> genererDonneesImpositionNonBaties(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+        try {
+            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
+
+            if(optionalImpositionsTfu.isEmpty()){
+                return new ResponseEntity<>(
+                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
+                        HttpStatus.OK
+                );
+            }
+
+            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.GENERATION_AUTORISE)){
+                return new ResponseEntity<>(
+                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
+                        HttpStatus.OK
+                );
+            }
+
+            if(userPrincipal==null){
+                return new ResponseEntity<>(
+                        new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
+                        HttpStatus.OK
+                );
+            }
+            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleNonBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
+
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition pour les fonciers non batis Générées avec succès."),
+                    HttpStatus.OK
+            );
+
         } catch (HttpClientErrorException.MethodNotAllowed e) {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);

src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java

@@ -3,15 +3,20 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 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.rfu.metier.ImpositionsTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
 import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.security.CurrentUser;
 import io.gmss.fiscad.security.UserPrincipal;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import jakarta.ws.rs.NotAcceptableException;
+import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.PageRequest;
@@ -25,6 +30,7 @@ import org.springframework.web.client.HttpClientErrorException;
 
 
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = "api/impositions-tfu", produces = MediaType.APPLICATION_JSON_VALUE)
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Impositions TFU")
@@ -32,15 +38,29 @@ import org.springframework.web.client.HttpClientErrorException;
 public class ImpositionsTfuController {
 
     private final ImpositionsTfuService impositionsTfuService;
+    private final EnqueteService enqueteService;
     private static final Logger logger = LoggerFactory.getLogger(ImpositionsTfuController.class);
 
-    public ImpositionsTfuController(ImpositionsTfuService impositionsTfuService) {
-        this.impositionsTfuService = impositionsTfuService;
-    }
+
 
     @PostMapping("/create")
-    public ResponseEntity<?> createImpositionsTfu(@RequestBody @Valid @Validated ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    public ResponseEntity<?> createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
+            if(currentUser==null){
+                return new ResponseEntity<>(
+                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
+                        HttpStatus.OK
+                );
+            }
+            User user=currentUser.getUser();
+
+            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
+                return new ResponseEntity<>(
+                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
+                        HttpStatus.OK
+                );
+            }
+
             impositionsTfuPaylaodWeb = impositionsTfuService.createImpositionsTfu(impositionsTfuPaylaodWeb);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, impositionsTfuPaylaodWeb, "Unite de logement créé avec succès."),
@@ -62,6 +82,46 @@ public class ImpositionsTfuController {
         }
     }
 
+
+    @PutMapping("/cloturer-enquete")
+    public ResponseEntity<?> cloturer(@CurrentUser UserPrincipal userPrincipal, @RequestBody  ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb ) {
+        try {
+
+            if(userPrincipal==null){
+                return new ResponseEntity<>(
+                        new ApiResponse<>(true, null, "Accès non autorisé"),
+                        HttpStatus.NOT_ACCEPTABLE
+                );
+            }
+
+
+            User user= userPrincipal.getUser();
+            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
+                return new ResponseEntity<>(
+                        new ApiResponse<>(true,null, "Vous n'êtes pas autorisé à cloturer les enquetes du : "+user.getStructure().getNom()),
+                        HttpStatus.OK
+                );
+            }
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, impositionsTfuService.cloturerImpositionsTfu(impositionsTfuPaylaodWeb), "enquete cloturées avec succès."),
+                    HttpStatus.OK
+            );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
 //    @PutMapping("/update/{id}")
 //    public ResponseEntity<?> updateImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
 //        try {
@@ -85,12 +145,16 @@ public class ImpositionsTfuController {
 //        }
 //    }
 
+    @Operation(
+            summary = "Autoriser la génération des avis d'un centre",
+            description = "Permet d'autoriser la génération des avis d'un centre pour un exervice données"
+    )
 
-    @PutMapping("/valider/{id}")
-    public ResponseEntity<?> validerImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @PutMapping("/autoriser-generation-avis")
+    public ResponseEntity<?> autoriserImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.validerImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.autoriserGenerationImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -109,11 +173,11 @@ public class ImpositionsTfuController {
         }
     }
 
-    @PutMapping("/annuler/{id}")
-    public ResponseEntity<?> annulerImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @PutMapping("/rejeter")
+    public ResponseEntity<?> annulerImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.annulerImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.rejeterImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java

@@ -4,6 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuNonBatiService;
 import io.gmss.fiscad.paylaods.ApiResponse;
+import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -34,11 +35,11 @@ public class BaremRfuNonBatiController {
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody @Valid @Validated BaremRfuNonBati baremRfuNonBati) {
+    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
         try {
-            baremRfuNonBati = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBati);
+            baremRfuNonBatiPayloadWeb = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBatiPayloadWeb);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBati, "BaremRfuNonBati créé avec  succès."),
+                    new ApiResponse<>(true, baremRfuNonBatiPayloadWeb, "BaremRfuNonBati créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -58,10 +59,10 @@ public class BaremRfuNonBatiController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBati baremRfuNonBati) {
+    public ResponseEntity<?> updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.updateBaremRfuNonBati(id, baremRfuNonBati), "BaremRfuNonBati mis à jour avec succès."),
+                    new ApiResponse<>(true, baremRfuNonBatiService.updateBaremRfuNonBati(id, baremRfuNonBatiPayloadWeb), "BaremRfuNonBati mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -156,7 +157,31 @@ public class BaremRfuNonBatiController {
     public ResponseEntity<?> getBaremRfuNonBatiById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiById(id), "BaremRfuNonBati trouvée avec succès."),
+                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiById(id).orElse(null), "BaremRfuNonBati trouvée avec succès."),
+                    HttpStatus.OK
+            );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
+
+    @GetMapping("/by-commune-id/by-zone-id/{communeId}/{zoneId}")
+    public ResponseEntity<?> getBaremRfuNonBatiByCommineAndZoneId(@PathVariable Long communeId, Long zoneId) {
+        try {
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiByCommuneAndZoneId(communeId,zoneId).orElse(null), "BaremRfuNonBati trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java

@@ -29,6 +29,8 @@ public class Quartier extends BaseEntity implements Serializable {
     @ManyToOne
     private Arrondissement arrondissement;
 
+    private String longitude;
+    private String latitude;
 //    @JsonIgnore
 //    @OneToOne(mappedBy = "quartier")
 //    private Bloc bloc;

src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java

@@ -97,6 +97,7 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     @Enumerated(EnumType.STRING)
     private SourceDonnee sourceDonnees;
     private String observations;
+
     @Enumerated(EnumType.STRING)
     private StatutParcelle statutParcelle;
     private Long uploadId;
@@ -118,7 +119,7 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     private Quartier quartier ;
 
     @ColumnDefault("0")
-    private int  geomSrid;
+    private Integer  geomSrid;
     @JsonSerialize(using = GeometrySerializer.class)
     @JsonDeserialize(contentUsing = GeometryDeserializer.class)
     @Column(name = "geometry",columnDefinition = "geometry(Polygon,32631)")

src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java

@@ -8,6 +8,9 @@ import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
+import io.gmss.fiscad.entities.infocad.parametre.Structure;
+import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
+import io.gmss.fiscad.enums.NatureImpot;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -71,11 +74,17 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     private int superficieParc;
     private Long superficieAuSolBat;
     private Long superficieAuSolUlog;
-    private String batieOuiNon;
-    private String exhonereOuiNon;
-    private String batimentExhonereOuiNon;
-    private String uniteLogementExhonereOuiNon;
+    //private String batieOuiNon;
+    //private String exhonereOuiNon;
+    //private String batimentExhonereOuiNon;
+    //private String uniteLogementExhonereOuiNon;
+    private Boolean batie;
+    private Boolean exonere;
+    private Boolean batimentExonere;
+    private Boolean uniteLogementExonere;
     private Long valeurLocativeAdm;
+    private Long valeurLocativeAdm70Pour100;
+    private Long valeurLocativeAdmMetreCarre;
     private Long montantLoyerAnnuel;
     private Long tfuMetreCarre;
     private Long tfuMinimum;
@@ -88,14 +97,30 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
     private Long enqueteId;
-    private Long structureId;
+    //private Long structureId;
+    @JsonIgnore
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "structure_id")
+    private Structure structure ;
+
     private Long secteurId;
-    private Long zoneRfuId;
+
+    //private Long zoneRfuId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "zone_rfu_id")
+    private ZoneRfu zoneRfu ;
+
     @ColumnDefault("0")
-    private float tauxParcelleNonBati;
-    private Long valeurAdministrativeParcelleNonBati;
+    private Long valeurAdminParcelleNb;
+    private Float tauxTfu;
+    private Float montantTaxe;
+    private Long valeurAdminParcelleNbMetreCarre;
     @JsonIgnore
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "impositions_tfu_id", nullable = false)
-    private ImpositionsTfu impositionsTfu;
+    private ImpositionsTfu impositionsTfu ;
+    @Enumerated(EnumType.STRING)
+    private NatureImpot natureImpot;
+    private Long valeurBatiment;
+    private Long valeurParcelle;
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/ImpositionsTfu.java

@@ -55,7 +55,10 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     @Enumerated(EnumType.STRING)
     private StatusAvis statusAvis;
 
-    private Long nombreAvis;
+    private Integer nombreAvis;
+    private Integer nombreAvisFnb;
+    private Integer nombreAvisBatiment;
+    private Integer nombreAvisUniteLog;
 
     @Column(columnDefinition = "TEXT")
     private String motif;
@@ -65,7 +68,5 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     @JoinColumn(name = "impositions_tfu_id")
     private List<DonneesImpositionTfu> donneesImpositionTfus;
 
-    public  Long getNombreAvis(){
-        return donneesImpositionTfus==null?0l:donneesImpositionTfus.size();
-    }
+
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/BaremRfuNonBati.java

@@ -23,7 +23,9 @@ public class BaremRfuNonBati extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private Long valeurAdministrative;
-    private float taux;
+    private Long valeurAdministrativeMetreCarre;
+    private Boolean auMetreCarre;
+    private Float taux;
     @ManyToOne
     private Commune commune;
     @ManyToOne

src/main/java/io/gmss/fiscad/enums/NatureImpot.java

@@ -0,0 +1,6 @@
+package io.gmss.fiscad.enums;
+
+public enum NatureImpot {
+    TFU,
+    IRF
+}

src/main/java/io/gmss/fiscad/enums/ParametersType.java

@@ -12,5 +12,8 @@ public enum ParametersType {
     CORPS_RESET_PASSWORD,
     OBJET_CREATE_ACCOUNT,
     CORPS_CREATE_ACCOUNT,
-    TOKEN_IFU_EN_LIGNE ;
+    TOKEN_IFU_EN_LIGNE,
+    TAUX_TFU_HABITATION,
+    TAUX_TFU_PROFESSIONNELLE,
+    TAUX_DEFAUT_SUPERFICIE_AU_SOL;
 }

src/main/java/io/gmss/fiscad/enums/StatusAvis.java

@@ -1,8 +1,11 @@
 package io.gmss.fiscad.enums;
 
 public enum StatusAvis {
-    CREE,  //Equivaut à la cloture des enquêtes et des mise à jour + Creation d'une imposition
-    GENERE,
-    ANNULE,
-    VALIDE,
+    EN_COURS,
+    CLOTURE,
+    GENERATION_AUTORISE,
+    REJETE,
+    TFU_FNB_GENERE,
+    GENERE
+
 }

src/main/java/io/gmss/fiscad/enums/StatutEnquete.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.enums;
 
 public enum StatutEnquete {
     EN_COURS,
-    DECLARATION,
+  //  DECLARATION,
     FINALISE,
     REJETE,
     VALIDE,

src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java

@@ -349,7 +349,7 @@ public class EnqueteServiceImpl implements EnqueteService {
         Enquete enquete = optionalEnquete.get();
         enquete.setDateValidation(LocalDate.now());
         enquete.setStatutEnquete(StatutEnquete.VALIDE);
-        enquete.setSynchronise(false);
+        enquete.setSynchronise(true);
         return enqueteRepository.save(enquete);
     }
 
@@ -544,22 +544,22 @@ public class EnqueteServiceImpl implements EnqueteService {
 
     @Override
     @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByUserId(Long userId) {
+    public int cloturerEnqueteParcelleBatimentUniteLogementByUserIdAndExerciceId(Long userId,Long exerciceId) {
        Optional<User> optionalUser= userRepository.findById(userId);
        int nbreEnquete=0;
        if(optionalUser.isPresent() && optionalUser.get().getStructure()!=null){
            Long structureId=optionalUser.get().getStructure().getId();
-           nbreEnquete=cloturerEnqueteParcelleBatimentUniteLogementByStructureId(structureId);
+           nbreEnquete=cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(structureId,exerciceId);
        }
         return nbreEnquete;
     }
 
     @Override
     @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByStructureId(Long structureId) {
-        Integer nombreParcelleImpacte=enqueteRepository.clotureEnqueteParcelle(structureId);
-        Integer nombreBatiment=enqueteBatimentRepository.clotureEnqueteBatiment(structureId);
-        Integer nombreUniteLogement=enqueteUniteLogementRepository.clotureEnqueteUniteLogement(structureId);
+    public int cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(Long structureId,Long exerciceId) {
+        Integer nombreParcelleImpacte=enqueteRepository.clotureEnqueteParcelle(structureId,exerciceId);
+        Integer nombreBatiment=enqueteBatimentRepository.clotureEnqueteBatiment(structureId,exerciceId);
+        Integer nombreUniteLogement=enqueteUniteLogementRepository.clotureEnqueteUniteLogement(structureId,exerciceId);
         return nombreParcelleImpacte;
     }
 

src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java

@@ -4,9 +4,12 @@ import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu;
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
+import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
+import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
+import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.DonneesImpositionTfuResponse;
 import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
@@ -15,6 +18,7 @@ import io.gmss.fiscad.persistence.repositories.rfu.metier.DonneesImpositionTfuRe
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.ExerciceRepository;
+import io.gmss.fiscad.service.EntityFromPayLoadService;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -36,6 +40,7 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
     private final BaremRfuNonBatiRepository baremRfuNonBatiRepository;
     private final ExerciceRepository exerciceRepository;
     private final ArrondissementRepository arrondissementRepository;
+    private final EntityFromPayLoadService entityFromPayLoadService;
 
 
 
@@ -91,91 +96,43 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
 
     @Override
     @Transactional
-    public Long genererDonneesFiscales(ImpositionsTfu impositionsTfu) {
-        List<DonneesImpositionTfuResponse> donneesImpositionTfuResponses= donneesImpositionTfuRepository.findAllDonneesImpositionTfu(impositionsTfu.getCommune().getId(),impositionsTfu.getExercice().getAnnee());
-        Long n=0l;
-        for (DonneesImpositionTfuResponse donneesImpositionTfuResponse: donneesImpositionTfuResponses){
-            DonneesImpositionTfu donneesImpositionTfu=new DonneesImpositionTfu();
-            donneesImpositionTfu.setImpositionsTfu(impositionsTfu);
-            donneesImpositionTfu.setZoneRfuId(donneesImpositionTfuResponse.getZoneRfuId());
-            donneesImpositionTfu.setCodeQuartierVillage(donneesImpositionTfuResponse.getCodeQuartierVillage());
-            donneesImpositionTfu.setNomQuartierVillage(donneesImpositionTfuResponse.getNomQuartierVillage());
-            donneesImpositionTfu.setCodeArrondissement(donneesImpositionTfuResponse.getCodeArrondissement());
-            donneesImpositionTfu.setNomArrondissement(donneesImpositionTfuResponse.getNomArrondissement());
-            donneesImpositionTfu.setCodeCommune(donneesImpositionTfuResponse.getCodeCommune());
-            donneesImpositionTfu.setNomCommune(donneesImpositionTfuResponse.getNomCommune());
-            donneesImpositionTfu.setCodeDepartement(donneesImpositionTfuResponse.getCodeDepartement());
-            donneesImpositionTfu.setNomDepartement(donneesImpositionTfuResponse.getNomDepartement());
-            donneesImpositionTfu.setQ(donneesImpositionTfuResponse.getQ());
-            donneesImpositionTfu.setIlot(donneesImpositionTfuResponse.getIlot());
-            donneesImpositionTfu.setParcelle(donneesImpositionTfuResponse.getParcelle());
-            donneesImpositionTfu.setLatitude(donneesImpositionTfuResponse.getLatitude());
-            donneesImpositionTfu.setLongitude(donneesImpositionTfuResponse.getLongitude());
-            donneesImpositionTfu.setNup(donneesImpositionTfuResponse.getNup());
-            donneesImpositionTfu.setNupProvisoire(donneesImpositionTfuResponse.getNupProvisoire());
-            donneesImpositionTfu.setSuperficieParc(donneesImpositionTfuResponse.getSuperficieParc());
-            donneesImpositionTfu.setAdresseProp(donneesImpositionTfuResponse.getAdresseProp());
-            donneesImpositionTfu.setAnnee(donneesImpositionTfuResponse.getAnnee());
-            donneesImpositionTfu.setAdresseSc(donneesImpositionTfuResponse.getAdresseSc());
-            donneesImpositionTfu.setBatieOuiNon(donneesImpositionTfuResponse.getBatieOuiNon());
-            donneesImpositionTfu.setTfuMinimum(donneesImpositionTfuResponse.getTfuMinimum());
-            donneesImpositionTfu.setCategorieBat(donneesImpositionTfuResponse.getCategorieBat());
-            donneesImpositionTfu.setDateEnquete(donneesImpositionTfuResponse.getDateEnquete());
-            donneesImpositionTfu.setEmailProp(donneesImpositionTfuResponse.getEmailProp());
-            donneesImpositionTfu.setEmailSc(donneesImpositionTfuResponse.getEmailSc());
-            donneesImpositionTfu.setMontantLoyerAnnuel(donneesImpositionTfuResponse.getMontantLoyerAnnuel());
-            donneesImpositionTfu.setEnqueteId(donneesImpositionTfuResponse.getEnqueteId());
-            donneesImpositionTfu.setExhonereOuiNon(donneesImpositionTfuResponse.getExhonereOuiNon());
-            donneesImpositionTfu.setIfu(donneesImpositionTfuResponse.getIfu());
-            donneesImpositionTfu.setNombreBat(donneesImpositionTfuResponse.getNombreBat());
-            donneesImpositionTfu.setNombrePiscine(donneesImpositionTfuResponse.getNombrePiscine());
-            donneesImpositionTfu.setNombreUlog(donneesImpositionTfuResponse.getNombreUlog());
-            donneesImpositionTfu.setNomProp(donneesImpositionTfuResponse.getNomProp());
-            donneesImpositionTfu.setNomSc(donneesImpositionTfuResponse.getNomSc());
-            donneesImpositionTfu.setNpi(donneesImpositionTfuResponse.getNpi());
-            donneesImpositionTfu.setNumBatiment(donneesImpositionTfuResponse.getNumBatiment()==null?"":donneesImpositionTfuResponse.getNumBatiment());
-            donneesImpositionTfu.setNumUniteLogement(donneesImpositionTfuResponse.getNumUniteLogement()==null?"":donneesImpositionTfuResponse.getNumUniteLogement());
-            donneesImpositionTfu.setPrenomProp(donneesImpositionTfuResponse.getPrenomProp());
-            donneesImpositionTfu.setPrenomSc(donneesImpositionTfuResponse.getPrenomSc());
-            donneesImpositionTfu.setRaisonSociale(donneesImpositionTfuResponse.getRaisonSociale());
-            donneesImpositionTfu.setSecteurId(donneesImpositionTfuResponse.getSecteurId());
-            donneesImpositionTfu.setStandingBat(donneesImpositionTfuResponse.getStandingBat());
-            donneesImpositionTfu.setStructureId(donneesImpositionTfuResponse.getStructureId());
-            donneesImpositionTfu.setSuperficieAuSolBat(donneesImpositionTfuResponse.getSuperficieAuSolBat());
-            donneesImpositionTfu.setSuperficieAuSolUlog(donneesImpositionTfuResponse.getSuperficieAuSolUlog());
-            donneesImpositionTfu.setTelProp(donneesImpositionTfuResponse.getTelProp());
-            donneesImpositionTfu.setTelSc(donneesImpositionTfuResponse.getTelSc());
-            donneesImpositionTfu.setTfuMetreCarre(donneesImpositionTfuResponse.getTfuMetreCarre());
-            donneesImpositionTfu.setTitreFoncier(donneesImpositionTfuResponse.getTitreFoncier());
-            donneesImpositionTfu.setValeurLocativeAdm(donneesImpositionTfuResponse.getValeurLocativeAdm());
-            donneesImpositionTfu.setBatimentExhonereOuiNon(donneesImpositionTfuResponse.getBatimentExhonereOuiNon());
-            donneesImpositionTfu.setUniteLogementExhonereOuiNon(donneesImpositionTfuResponse.getUniteLogementExhonereOuiNon());
-            try {
-                Optional<BaremRfuNonBati> baremRfuNonBatiOptional=baremRfuNonBatiRepository.findAllByCommune_IdAndZoneRfu_Id(impositionsTfu.getCommune().getId(),donneesImpositionTfu.getZoneRfuId());
-                 if(baremRfuNonBatiOptional.isPresent()){
-                     donneesImpositionTfu.setValeurAdministrativeParcelleNonBati(baremRfuNonBatiOptional.get().getValeurAdministrative());
-                     donneesImpositionTfu.setTauxParcelleNonBati(baremRfuNonBatiOptional.get().getTaux());
-                 }
+    public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
+        Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId);
 
+        ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
+        impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE);
+
+        impositionsTfu.setNombreAvisFnb(nb);
 
-                donneesImpositionTfuRepository.save(donneesImpositionTfu);
-                n++;
-            }catch (DataIntegrityViolationException e) {
-                if (e.getCause() instanceof org.hibernate.exception.ConstraintViolationException constraintEx &&
-                        constraintEx.getSQLException().getSQLState().equals("23505")) {
-                    System.out.println("Doublon détecté (clé unique) !");
-                } else {
-                    throw e;
-                }
-            }
-        }
         impositionsTfuRepository.save(impositionsTfu);
-        return n;
+
+        return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
     }
 
     @Override
-    public List<DonneesImpositionTfu> getDonneesFiscalesByImposition(Long impositionsId) {
-        return donneesImpositionTfuRepository.findAllByImpositionsTfu_Id(impositionsId);
+    @Transactional
+    public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
+
+        Integer nbb= donneesImpositionTfuRepository.genererDonneesTfuBatie(impositionsTfuPaylaodWeb.getId(),userId);
+
+        Integer nbulo= donneesImpositionTfuRepository.genererDonneesTfuBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId);
+
+
+        ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
+        impositionsTfu.setStatusAvis(StatusAvis.GENERE);
+
+        impositionsTfu.setNombreAvis(nbb+nbulo+ (impositionsTfu.getNombreAvisFnb()==null?0:impositionsTfu.getNombreAvisFnb()));
+        impositionsTfu.setNombreAvisBatiment(nbb);
+        impositionsTfu.setNombreAvisUniteLog(nbulo);
+
+        impositionsTfuRepository.save(impositionsTfu);
+
+        return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
+    }
+
+    @Override
+    public List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImposition(Long impositionsId) {
+        return donneesImpositionTfuRepository.findAllByImpositionTfuId(impositionsId);
     }
 
     @Override
@@ -187,4 +144,24 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
             return null;
         }
     }
+
+    @Override
+    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdPageable(Long impositionsTfuId, Pageable pageable) {
+        return donneesImpositionTfuRepository.findAllByImpositionTfuIdPageable(impositionsTfuId,pageable);
+    }
+
+    @Override
+    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdNonBatiePageable(Long impositionsTfuId, Pageable pageable) {
+        return donneesImpositionTfuRepository.findAllByImpositionTfuIdNonBatiePageable(impositionsTfuId,pageable);
+    }
+
+    @Override
+    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(Long impositionsTfuId, Pageable pageable) {
+        return donneesImpositionTfuRepository.findAllByImpositionTfuIdBatieBatimentPageable(impositionsTfuId,pageable);
+    }
+
+    @Override
+    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
+        return donneesImpositionTfuRepository.findAllByImpositionTfuIdBatieUniteLogPageable(impositionsTfuId,pageable);
+    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/ImpositionsTfuServiceImpl.java

@@ -5,17 +5,21 @@ import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
+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.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
 import io.gmss.fiscad.service.EntityFromPayLoadService;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.NotAcceptableException;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 @AllArgsConstructor
@@ -25,37 +29,48 @@ public class ImpositionsTfuServiceImpl implements ImpositionsTfuService {
     private final ImpositionsTfuRepository impositionsTfuRepository;
     private final StructureService structureService;
     private final EntityFromPayLoadService entityFromPayLoadService;
+    private final EnqueteService enqueteService;
 
 
     /**
      * Permet de créer pour un centre la synthèse de l'imposition de l'année en prélude de la
-     * génération des avis d'imposition : 1- cloture de enquete et creation de imposition tfu
+     * génération des avis d'imposition
      * @param impositionsTfuPaylaodWeb
      * @return
      * @throws BadRequestException
      */
     @Override
+    @Transactional
     public ImpositionsTfuPaylaodWeb createImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
         if (impositionsTfuPaylaodWeb.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle unité de logement ayant un id non null.");
         }
-         List<ImpositionsTfu> impositionsTfus=impositionsTfuRepository.getImpositionsTfuByStructureAndExercice(impositionsTfuPaylaodWeb.getStructureId(),impositionsTfuPaylaodWeb.getExerciceId());
+        List<ImpositionsTfu> impositionsTfus=impositionsTfuRepository.getImpositionsTfuByStructureAndExercice(impositionsTfuPaylaodWeb.getStructureId(), impositionsTfuPaylaodWeb.getExerciceId());
         if (!impositionsTfus.isEmpty()) {
             throw new BadRequestException("Une Imposition non annulée existe déjà");
         }
+        List<StatusAvis> statusAvis= new ArrayList<>();
+        statusAvis.add(StatusAvis.EN_COURS);
+        statusAvis.add(StatusAvis.CLOTURE);
+        statusAvis.add(StatusAvis.GENERATION_AUTORISE);
+
+        Optional<ImpositionsTfu> optionalImpositionsTfu= impositionsTfuRepository.findDistinctByStructure_IdAndExercice_IdAndStatusAvisIn(impositionsTfuPaylaodWeb.getStructureId(),impositionsTfuPaylaodWeb.getExerciceId(),statusAvis);
+
+        if(optionalImpositionsTfu.isPresent()){
+            throw new BadRequestException("Une Imposition est déjà dans le workflow");
+        }
 
         ImpositionsTfu impositionsTfu=entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        impositionsTfu.setStatusAvis(StatusAvis.CREE);
-
-//TODO : cloture des enquetes
 
+        impositionsTfu.setStatusAvis(StatusAvis.EN_COURS);
 
         impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
+
         return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
     }
 
     @Override
-    public ImpositionsTfuPaylaodWeb annulerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
+    public ImpositionsTfuPaylaodWeb rejeterImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
         if (impositionsTfuPaylaodWeb.getId() == null) {
             throw new BadRequestException("Impossible d'annuler une imposition ayant un id null.");
         }
@@ -63,21 +78,55 @@ public class ImpositionsTfuServiceImpl implements ImpositionsTfuService {
             throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
         }
         ImpositionsTfu impositionsTfu= entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        impositionsTfu.setStatusAvis(StatusAvis.ANNULE);
+        if(!impositionsTfu.getStatusAvis().equals(StatusAvis.CLOTURE)){
+            throw new NotAcceptableException("L'état actuel :"+impositionsTfu.getStatusAvis()+"Ne permet pas de passer au l'état rejete");
+        }
+
+        impositionsTfu.setStatusAvis(StatusAvis.REJETE);
+        impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
+        return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
+    }
+
+
+    @Override
+    @Transactional
+    public ImpositionsTfuPaylaodWeb cloturerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
+        if (impositionsTfuPaylaodWeb.getId() == null) {
+            throw new BadRequestException("Impossible de cloturer une imposition ayant un id null.");
+        }
+        if (!impositionsTfuRepository.existsById(impositionsTfuPaylaodWeb.getId())) {
+            throw new NotFoundException("Impossible de trouver l'imposition spécifiée dans notre base de données.");
+        }
+
+        ImpositionsTfu impositionsTfu= entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
+
+        if(!impositionsTfu.getStatusAvis().equals(StatusAvis.EN_COURS) && !impositionsTfu.getStatusAvis().equals(StatusAvis.REJETE)){
+            throw new NotAcceptableException("L'état actuel :"+impositionsTfu.getStatusAvis()+"Ne permet pas de passer au l'état rejete");
+        }
+
+        impositionsTfu.setDateCloture(LocalDate.now());
+        enqueteService.cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(impositionsTfu.getStructure().getId(),impositionsTfu.getExercice().getId());
+        impositionsTfu.setStatusAvis(StatusAvis.CLOTURE);
         impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
         return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
     }
 
     @Override
-    public ImpositionsTfuPaylaodWeb validerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
+    public ImpositionsTfuPaylaodWeb autoriserGenerationImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException {
         if (impositionsTfuPaylaodWeb.getId() == null) {
             throw new BadRequestException("Impossible de valider une imposition ayant un id null.");
         }
         if (!impositionsTfuRepository.existsById(impositionsTfuPaylaodWeb.getId())) {
-            throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
+            throw new NotFoundException("Impossible de trouver l'imposition spécifiée dans notre base de données.");
         }
+
         ImpositionsTfu impositionsTfu= entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        impositionsTfu.setStatusAvis(StatusAvis.VALIDE);
+
+        if(!impositionsTfu.getStatusAvis().equals(StatusAvis.CLOTURE)){
+            throw new NotFoundException("L'état actuel : "+impositionsTfu.getStatusAvis()+ " ne permet pas de passer à l'état Autorisé");
+        }
+        impositionsTfu.setDateGeneration(LocalDate.now());
+        impositionsTfu.setStatusAvis(StatusAvis.GENERATION_AUTORISE);
         impositionsTfu =impositionsTfuRepository.save(impositionsTfu);
         return  impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
     }
@@ -97,6 +146,9 @@ public class ImpositionsTfuServiceImpl implements ImpositionsTfuService {
     public void deleteImpositionsTfu(Long id) throws NotFoundException {
         Optional<ImpositionsTfu> impositionsTfuOptional = impositionsTfuRepository.findById(id);
         if (impositionsTfuOptional.isPresent()) {
+            if(!impositionsTfuOptional.get().getStatusAvis().equals(StatusAvis.EN_COURS)){
+                throw new NotFoundException("L'état actuel : "+impositionsTfuOptional.get().getStatusAvis()+ " ne permet pas de supprimer");
+            }
             impositionsTfuRepository.deleteById(impositionsTfuOptional.get().getId());
         } else {
             throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans notre base de données.");
@@ -115,9 +167,9 @@ public class ImpositionsTfuServiceImpl implements ImpositionsTfuService {
 
 
     @Override
-    public Optional<ImpositionsTfu> getImpositionsTfuById(Long id) {
+    public Optional<ImpositionsTfuPaylaodWeb> getImpositionsTfuById(Long id) {
         if (impositionsTfuRepository.existsById(id)) {
-            return impositionsTfuRepository.findById(id);
+            return impositionsTfuRepository.findByIdToDto(id);
         } else {
             throw new NotFoundException("Impossible de trouver la nouvelle unité de logement spécifiée dans la base de données.");
         }
@@ -125,11 +177,12 @@ public class ImpositionsTfuServiceImpl implements ImpositionsTfuService {
 
     @Override
     public List<ImpositionsTfuPaylaodWeb> getImpositionsTfuByUserIdIds(Long userId) {
+        System.out.println(userId);
         List<Structure> structures = structureService.getListStructureUserId(userId);
         List<Long> structureIds = structures.stream()
                 .map(Structure::getId)
                 .toList();
-
+        System.out.println(structureIds.get(0));
         return impositionsTfuRepository.findByStructureIdsToDto(structureIds);
     }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/parametre/BaremRfuNonBatiServiceImpl.java

@@ -4,38 +4,42 @@ import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuNonBatiService;
+import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository;
+import io.gmss.fiscad.service.EntityFromPayLoadService;
+import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Optional;
-
+@AllArgsConstructor
 @Service
 public class BaremRfuNonBatiServiceImpl implements BaremRfuNonBatiService {
     private final BaremRfuNonBatiRepository baremRfuNonBatiRepository;
-
-    public BaremRfuNonBatiServiceImpl(BaremRfuNonBatiRepository baremRfuNonBatiRepository) {
-        this.baremRfuNonBatiRepository = baremRfuNonBatiRepository;
-    }
+    private final EntityFromPayLoadService entityFromPayLoadService;
 
     @Override
-    public BaremRfuNonBati createBaremRfuNonBati(BaremRfuNonBati baremRfuNonBati) throws BadRequestException {
-        if (baremRfuNonBati.getId() != null) {
+    public BaremRfuNonBatiPayloadWeb createBaremRfuNonBati(BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws BadRequestException {
+        if (baremRfuNonBatiPayloadWeb.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle campgne ayant un id non null.");
         }
-        return baremRfuNonBatiRepository.save(baremRfuNonBati);
+      BaremRfuNonBati baremRfuNonBati=  entityFromPayLoadService.getBaremRfuNonBatiFromPayLoadWeb(baremRfuNonBatiPayloadWeb);
+      baremRfuNonBati=baremRfuNonBatiRepository.save(baremRfuNonBati);
+      return baremRfuNonBatiRepository.findByIdToDto(baremRfuNonBati.getId()).orElse(null);
     }
     @Override
-    public BaremRfuNonBati updateBaremRfuNonBati(Long id, BaremRfuNonBati baremRfuNonBati) throws NotFoundException {
-        if (baremRfuNonBati.getId() == null) {
+    public BaremRfuNonBatiPayloadWeb updateBaremRfuNonBati(Long id, BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws NotFoundException {
+        if (baremRfuNonBatiPayloadWeb.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une nouvelle baremRfuNonBati ayant un id null.");
         }
-        if (!baremRfuNonBatiRepository.existsById(baremRfuNonBati.getId())) {
+        if (!baremRfuNonBatiRepository.existsById(baremRfuNonBatiPayloadWeb.getId())) {
             throw new NotFoundException("Impossible de trouver la baremRfuNonBati spécifiée dans notre base de données.");
         }
-        return baremRfuNonBatiRepository.save(baremRfuNonBati);
+        BaremRfuNonBati baremRfuNonBati=  entityFromPayLoadService.getBaremRfuNonBatiFromPayLoadWeb(baremRfuNonBatiPayloadWeb);
+        baremRfuNonBati=baremRfuNonBatiRepository.save(baremRfuNonBati);
+        return baremRfuNonBatiRepository.findByIdToDto(baremRfuNonBati.getId()).orElse(null);
     }
 
     @Override
@@ -48,20 +52,27 @@ public class BaremRfuNonBatiServiceImpl implements BaremRfuNonBatiService {
         }
     }
     @Override
-    public Page<BaremRfuNonBati> getBaremRfuNonBatiList(Pageable pageable) {
-        return baremRfuNonBatiRepository.findAll(pageable);
+    public Page<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList(Pageable pageable) {
+        return baremRfuNonBatiRepository.findAllPayloadToDtoPaged(pageable);
     }
 
     @Override
-    public List<BaremRfuNonBati> getBaremRfuNonBatiList() {
-        return baremRfuNonBatiRepository.findAll();
+    public List<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList() {
+        return baremRfuNonBatiRepository.findAllPayloadToDto();
     }
 
 
 
     @Override
-    public Optional<BaremRfuNonBati> getBaremRfuNonBatiById(Long id) {
-        return baremRfuNonBatiRepository.findById(id);
+    public Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiById(Long id) {
+        return baremRfuNonBatiRepository.findByIdToDto(id);
     }
+
+
+    @Override
+    public Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiByCommuneAndZoneId(Long communeId,Long zoneId) {
+        return baremRfuNonBatiRepository.findByCommuneAndZoneToDto(communeId,zoneId);
+    }
+
 }
 

src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java

@@ -58,6 +58,6 @@ public interface EnqueteService {
 
     public List<EnqueteNonSyncResponse> getEnqueteValideNonSynch(Long terminalId);
 
-    int cloturerEnqueteParcelleBatimentUniteLogementByStructureId(Long strucutreId);
-    int cloturerEnqueteParcelleBatimentUniteLogementByUserId(Long userId);
+    int cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(Long strucutreId,Long exerciceId);
+    int cloturerEnqueteParcelleBatimentUniteLogementByUserIdAndExerciceId(Long userId,Long exerciceId);
 }

src/main/java/io/gmss/fiscad/interfaces/rfu/metier/DonneesImpositionTfuService.java

@@ -4,6 +4,8 @@ import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu;
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
+import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -11,8 +13,6 @@ import java.util.List;
 import java.util.Optional;
 
 public interface DonneesImpositionTfuService {
-
-
     DonneesImpositionTfu createDonneesImpositionTfu(DonneesImpositionTfu donneesImpositionTfu) throws BadRequestException;
 
     DonneesImpositionTfu updateDonneesImpositionTfu(Long id, DonneesImpositionTfu donneesImpositionTfu) throws NotFoundException;
@@ -25,7 +25,17 @@ public interface DonneesImpositionTfuService {
 
     Optional<DonneesImpositionTfu> getDonneesImpositionTfuById(Long id);
 
-    Long genererDonneesFiscales(ImpositionsTfu impositionsTfu);
-    List<DonneesImpositionTfu> getDonneesFiscalesByImposition(Long  impositionsId);
+    ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb,Long userId);
+    ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb,Long userId);
+    List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImposition(Long  impositionsId);
     List<DonneesImpositionTfu> getDonneesFiscalesByImpositionArrondissement(Long  impositionsId,Long arrondissementId);
+    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdPageable(Long  impositionsTfuId, Pageable pageable);
+
+
+    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdNonBatiePageable(Long  impositionsTfuId, Pageable pageable);
+    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(Long  impositionsTfuId, Pageable pageable);
+    Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(Long  impositionsTfuId, Pageable pageable);
+
+
+
 }

src/main/java/io/gmss/fiscad/interfaces/rfu/metier/ImpositionsTfuService.java

@@ -13,8 +13,9 @@ import java.util.Optional;
 public interface ImpositionsTfuService {
 
     ImpositionsTfuPaylaodWeb createImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
-    ImpositionsTfuPaylaodWeb annulerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
-    ImpositionsTfuPaylaodWeb validerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
+    ImpositionsTfuPaylaodWeb rejeterImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
+    ImpositionsTfuPaylaodWeb cloturerImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
+    ImpositionsTfuPaylaodWeb autoriserGenerationImpositionsTfu(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws BadRequestException;
 
     ImpositionsTfuPaylaodWeb updateImpositionsTfu(Long id, ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) throws NotFoundException;
 
@@ -24,6 +25,6 @@ public interface ImpositionsTfuService {
 
     List<ImpositionsTfu> getImpositionsTfuList();
 
-    Optional<ImpositionsTfu> getImpositionsTfuById(Long id);
+    Optional<ImpositionsTfuPaylaodWeb> getImpositionsTfuById(Long id);
     List<ImpositionsTfuPaylaodWeb> getImpositionsTfuByUserIdIds(Long userId);
 }

src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/BaremRfuNonBatiService.java

@@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.parametre;
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
+import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
@@ -11,17 +12,18 @@ import java.util.Optional;
 
 public interface BaremRfuNonBatiService {
 
-    BaremRfuNonBati createBaremRfuNonBati(BaremRfuNonBati baremRfuNonBati) throws BadRequestException;
+    BaremRfuNonBatiPayloadWeb createBaremRfuNonBati(BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws BadRequestException;
 
-    BaremRfuNonBati updateBaremRfuNonBati(Long id, BaremRfuNonBati baremRfuNonBati) throws NotFoundException;
+    BaremRfuNonBatiPayloadWeb updateBaremRfuNonBati(Long id, BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) throws NotFoundException;
 
     void deleteBaremRfuNonBati(Long id) throws NotFoundException;
 
-    Page<BaremRfuNonBati> getBaremRfuNonBatiList(Pageable pageable);
+    Page<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList(Pageable pageable);
 
-    List<BaremRfuNonBati> getBaremRfuNonBatiList();
+    List<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiList();
 
 
-    Optional<BaremRfuNonBati> getBaremRfuNonBatiById(Long id);
+    Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiById(Long id);
+    Optional<BaremRfuNonBatiPayloadWeb> getBaremRfuNonBatiByCommuneAndZoneId(Long communeId,Long zoneId);
 }
 

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;
     }
 }

src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BaremRfuNonBatiPayloadWeb.java

@@ -15,19 +15,33 @@ public class BaremRfuNonBatiPayloadWeb {
     private Long communeId;
     private String communeCode;
     private String communeNom;
-    private Long zoneRfu;
+    private Long zoneRfuId;
     private String zoneRfuCode;
     private String zoneRfuNom;
+    private Long valeurAdministrativeMetreCarre;
+    private Boolean auMetreCarre;
 
-    public BaremRfuNonBatiPayloadWeb(Long id, Long valeurAdministrative, float taux, Long communeId, String communeCode, String communeNom, Long zoneRfu, String zoneRfuCode, String zoneRfuNom) {
+    public BaremRfuNonBatiPayloadWeb(Long id,
+                                     Long valeurAdministrative,
+                                     Float taux,
+                                     Long communeId,
+                                     String communeCode,
+                                     String communeNom,
+                                     Long zoneRfuId,
+                                     String zoneRfuCode,
+                                     String zoneRfuNom,
+                                     Long valeurAdministrativeMetreCarre,
+                                     Boolean auMetreCarre) {
         this.id = id;
         this.valeurAdministrative = valeurAdministrative;
         this.taux = taux;
         this.communeId = communeId;
         this.communeCode = communeCode;
         this.communeNom = communeNom;
-        this.zoneRfu = zoneRfu;
+        this.zoneRfuId = zoneRfuId;
         this.zoneRfuCode = zoneRfuCode;
         this.zoneRfuNom = zoneRfuNom;
+        this.valeurAdministrativeMetreCarre = valeurAdministrativeMetreCarre;
+        this.auMetreCarre = auMetreCarre;
     }
 }

src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DonneesImpositionPaylaodWeb.java

@@ -0,0 +1,201 @@
+package io.gmss.fiscad.paylaods.request.crudweb;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.gmss.fiscad.enums.NatureImpot;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDate;
+@NoArgsConstructor
+@Data
+public class DonneesImpositionPaylaodWeb {
+        private Long id;
+        private Long annee;
+        private String codeDepartement;
+        private String nomDepartement;
+        private String codeCommune;
+        private String nomCommune;
+        private String codeArrondissement;
+        private String nomArrondissement;
+        private String codeQuartierVillage;
+        private String nomQuartierVillage;
+        private String q;
+        private String ilot;
+        private String parcelle;
+        private String nup;
+        private String titreFoncier;
+        private String numBatiment;
+        private String numUniteLogement;
+        private String ifu;
+        private String npi;
+        private String telProp;
+        private String emailProp;
+        private String nomProp;
+        private String prenomProp;
+        private String raisonSociale;
+        private String adresseProp;
+        private String telRep;
+        private String emailRep;
+        private String nomRep;
+        private String prenomRep;
+        private String adresseRep;
+        private String longitude;
+        private String latitude;
+        private Integer superficieParc;
+        private Long superficieAuSolBat;
+        private Long superficieAuSolUlog;
+        private Boolean batie;
+        private Boolean exonere;
+        private Boolean batimentExonere;
+        private Boolean uniteLogementExonere;
+        private Long valeurLocativeAdm;
+        private Long valeurBatiment;
+        private Long valeurParcelle;
+        private Long montantLoyerAnnuel;
+        private Long tfuMetreCarre;
+        private Long tfuMinimum;
+        private String standingBat;
+        private String categorieBat;
+        private Long nombrePiscine;
+        private Long nombreUlog;
+        private Long nombreBat;
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        private LocalDate dateEnquete;
+        private Long serviceId;
+        private String serviceCode;
+        private Long zoneRfuId;
+        private String zoneRfuNom;
+        private Float tauxTfu;
+        private Long valeurAdminParcelleNb;
+        @Enumerated(EnumType.STRING)
+        private NatureImpot natureImpot;
+        private Long valeurLocativeAdmMetreCarre;
+        private Long valeurAdminParcelleNbMetreCarre;
+        private Float montantTaxe;
+
+    public DonneesImpositionPaylaodWeb(Long id,
+                                       Long annee,
+                                       String codeDepartement,
+                                       String nomDepartement,
+                                       String codeCommune,
+                                       String nomCommune,
+                                       String codeArrondissement,
+                                       String nomArrondissement,
+                                       String codeQuartierVillage,
+                                       String nomQuartierVillage,
+                                       String q, String ilot,
+                                       String parcelle,
+                                       String nup,
+                                       String titreFoncier,
+                                       String numBatiment,
+                                       String numUniteLogement,
+                                       String ifu,
+                                       String npi,
+                                       String telProp,
+                                       String emailProp,
+                                       String nomProp,
+                                       String prenomProp,
+                                       String raisonSociale,
+                                       String adresseProp,
+                                       String telRep,
+                                       String emailRep,
+                                       String nomRep,
+                                       String prenomRep,
+                                       String adresseRep,
+                                       String longitude,
+                                       String latitude,
+                                       Integer superficieParc,
+                                       Long superficieAuSolBat,
+                                       Long superficieAuSolUlog,
+                                        Boolean batie,
+                                         Boolean exonere,
+                                         Boolean batimentExonere,
+                                         Boolean uniteLogementExonere,
+                                       Long valeurLocativeAdm,
+                                       Long montantLoyerAnnuel,
+                                       Long tfuMetreCarre,
+                                       Long tfuMinimum,
+                                       String standingBat,
+                                       String categorieBat,
+                                       Long nombrePiscine,
+                                       Long nombreUlog,
+                                       Long nombreBat,
+                                       LocalDate dateEnquete,
+                                       Long serviceId,
+                                       Long zoneRfuId,
+                                       Long valeurAdministrativeParcelleNonBati,
+                                       NatureImpot natureImpot,
+                                       String serviceCode,
+                                       String zoneRfuNom,
+                                        Long valeurBatiment,
+                                         Long valeurParcelle,
+                                        Long valeurLocativeAdmMetreCarre,
+                                        Long valeurAdministrativeParcelleNonBatiAuMetreCarre,
+                                        Float montantTaxe
+                                        ) {
+        this.id = id;
+        this.annee = annee;
+        this.codeDepartement = codeDepartement;
+        this.nomDepartement = nomDepartement;
+        this.codeCommune = codeCommune;
+        this.nomCommune = nomCommune;
+        this.codeArrondissement = codeArrondissement;
+        this.nomArrondissement = nomArrondissement;
+        this.codeQuartierVillage = codeQuartierVillage;
+        this.nomQuartierVillage = nomQuartierVillage;
+        this.q = q;
+        this.ilot = ilot;
+        this.parcelle = parcelle;
+        this.nup = nup;
+        this.titreFoncier = titreFoncier;
+        this.numBatiment = numBatiment;
+        this.numUniteLogement = numUniteLogement;
+        this.ifu = ifu;
+        this.npi = npi;
+        this.telProp = telProp;
+        this.emailProp = emailProp;
+        this.nomProp = nomProp;
+        this.prenomProp = prenomProp;
+        this.raisonSociale = raisonSociale;
+        this.adresseProp = adresseProp;
+        this.telRep = telRep;
+        this.emailRep = emailRep;
+        this.nomRep = nomRep;
+        this.prenomRep = prenomRep;
+        this.adresseRep = adresseRep;
+        this.longitude = longitude;
+        this.latitude = latitude;
+        this.superficieParc = superficieParc;
+        this.superficieAuSolBat = superficieAuSolBat;
+        this.superficieAuSolUlog = superficieAuSolUlog;
+        this.batie = batie;
+        this.exonere = exonere;
+        this.batimentExonere = batimentExonere;
+        this.uniteLogementExonere = uniteLogementExonere;
+        this.valeurLocativeAdm = valeurLocativeAdm;
+        this.montantLoyerAnnuel = montantLoyerAnnuel;
+        this.tfuMetreCarre = tfuMetreCarre;
+        this.tfuMinimum = tfuMinimum;
+        this.standingBat = standingBat;
+        this.categorieBat = categorieBat;
+        this.nombrePiscine = nombrePiscine;
+        this.nombreUlog = nombreUlog;
+        this.nombreBat = nombreBat;
+        this.dateEnquete = dateEnquete;
+        this.serviceId = serviceId;
+        this.zoneRfuId = zoneRfuId;
+        this.valeurAdminParcelleNb = valeurAdministrativeParcelleNonBati;
+        this.natureImpot = natureImpot;
+        this.serviceCode = serviceCode;
+        this.zoneRfuNom = zoneRfuNom;
+        this.valeurBatiment = valeurBatiment;
+        this.valeurParcelle = valeurParcelle;
+        this.valeurLocativeAdmMetreCarre = valeurLocativeAdmMetreCarre;
+        this.valeurAdminParcelleNbMetreCarre = valeurAdministrativeParcelleNonBatiAuMetreCarre;
+        this.montantTaxe = montantTaxe;
+    }
+}

src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ImpositionsTfuPaylaodWeb.java

@@ -6,6 +6,7 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.decoupage.Commune;
 import io.gmss.fiscad.entities.infocad.parametre.Structure;
 import io.gmss.fiscad.entities.rfu.parametre.Exercice;
+import io.gmss.fiscad.enums.NatureImpot;
 import io.gmss.fiscad.enums.StatusAvis;
 import jakarta.persistence.*;
 import lombok.Data;
@@ -23,7 +24,10 @@ public class ImpositionsTfuPaylaodWeb {
     private String datePieceAdmin;
     @Enumerated(EnumType.STRING)
     private StatusAvis statusAvis;
-    private Long nombreAvis;
+    private Integer nombreAvis;
+    private Integer nombreAvisFnb;
+    private Integer nombreAvisBatiment;
+    private Integer nombreAvisUniteLog;
     @Column(columnDefinition = "TEXT")
     private String motif;
     private Long exerciceId;
@@ -33,8 +37,11 @@ public class ImpositionsTfuPaylaodWeb {
     private String communeNom;
     private Long structureId ;
     private String structureNom ;
-
-    public ImpositionsTfuPaylaodWeb(Long id, LocalDate dateGeneration, LocalDate dateCloture, String referencePieceAdmin, String datePieceAdmin, StatusAvis statusAvis, Long nombreAvis, String motif, Long exerciceId, Integer exerciceAnnee, Long communeId, String communeCode, String communeNom, Long structureId, String structureNom) {
+    public ImpositionsTfuPaylaodWeb(Long id, LocalDate dateGeneration, LocalDate dateCloture, String referencePieceAdmin, String datePieceAdmin, StatusAvis statusAvis, Integer nombreAvis, String motif, Long exerciceId, Integer exerciceAnnee, Long communeId, String communeCode, String communeNom, Long structureId, String structureNom,
+                                    Integer nombreAvisFnb,
+                                    Integer nombreAvisBatiment,
+                                    Integer nombreAvisUniteLog
+                                    ) {
         this.id = id;
         this.dateGeneration = dateGeneration;
         this.dateCloture = dateCloture;
@@ -50,5 +57,8 @@ public class ImpositionsTfuPaylaodWeb {
         this.communeNom = communeNom;
         this.structureId = structureId;
         this.structureNom = structureNom;
+        this.nombreAvisFnb = nombreAvisFnb;
+        this.nombreAvisBatiment = nombreAvisBatiment;
+        this.nombreAvisUniteLog = nombreAvisUniteLog;
     }
 }

src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcelleGeomPaylaodWeb.java

@@ -90,7 +90,7 @@ public class ParcelleGeomPaylaodWeb {
     private String quartierCode ;
     private String quartierNom ;
 
-    private int  geomSrid;
+    private Integer  geomSrid;
     @JsonSerialize(using = GeometrySerializer.class)
     @JsonDeserialize(contentUsing = GeometryDeserializer.class)
     //@Column(name = "geometry",columnDefinition = "geometry(Polygon,32631)")
@@ -100,7 +100,7 @@ public class ParcelleGeomPaylaodWeb {
 
     private Long parcelleId;
 
-    public ParcelleGeomPaylaodWeb(Long id, String nup, String nupProvisoire, String longitude, String latitude, String numeroRue, String numeroEntreePorte, String codeInstad, String numeroEtatLieux, String numeroTitreFoncier, LocalDate dateTitreFoncier, Boolean batie, String npi, String ifu, String nom, String prenom, String raisonSociale, String nomEtPrenoms, String telephone, String adresse, String nomRepresentant, String prenomRepresentant, String raisonSocialeRepresentant, String nomEtPrenomsRepresentant, String telephoneRepresentant, String adresseRepresentant, String q, String zone, String ilot, String p, String qLotissement, String ilotLotissement, String pLotissement, String pointsPolygone, Integer superficie, String dateCollecte, SourceDonnee sourceDonnees, String observations, StatutParcelle statutParcelle, Long departementId, String departementCode, String departementNom, Long communeId, String communeCode, String communeNom, Long arrondissementId, String arrondissementCode, String arrondissementNom, Long quartierId, String quartierCode, String quartierNom, int geomSrid, Polygon geometry, String geometryString, Long parcelleId) {
+    public ParcelleGeomPaylaodWeb(Long id, String nup, String nupProvisoire, String longitude, String latitude, String numeroRue, String numeroEntreePorte, String codeInstad, String numeroEtatLieux, String numeroTitreFoncier, LocalDate dateTitreFoncier, Boolean batie, String npi, String ifu, String nom, String prenom, String raisonSociale, String nomEtPrenoms, String telephone, String adresse, String nomRepresentant, String prenomRepresentant, String raisonSocialeRepresentant, String nomEtPrenomsRepresentant, String telephoneRepresentant, String adresseRepresentant, String q, String zone, String ilot, String p, String qLotissement, String ilotLotissement, String pLotissement, String pointsPolygone, Integer superficie, String dateCollecte, SourceDonnee sourceDonnees, String observations, StatutParcelle statutParcelle, Long departementId, String departementCode, String departementNom, Long communeId, String communeCode, String communeNom, Long arrondissementId, String arrondissementCode, String arrondissementNom, Long quartierId, String quartierCode, String quartierNom, Integer geomSrid, Polygon geometry, String geometryString, Long parcelleId) {
         this.id = id;
         this.nup = nup;
         this.nupProvisoire = nupProvisoire;

src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java

@@ -39,8 +39,9 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
             WHERE e.parcelle.id=p.id
             AND stru.id= :structureId
         )
+        AND e.exercice.id = :exerciceId
     """)
-    Integer clotureEnqueteParcelle(@Param("structureId") Long structureId);
+    Integer clotureEnqueteParcelle(@Param("structureId") Long structureId,@Param("exerciceId") Long exerciceId);
 
     @Query(value = "select distinct " +
             " e.id," +

src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/ParcelleGeomRepository.java

@@ -78,6 +78,40 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
             """,nativeQuery = true)
     void majCentroidParcelle();
 
+
+    @Modifying
+    @Transactional
+    @Query(value = """
+             update parcelle_geom pg
+              set parcelle_id = p.id,statut_parcelle='NON_AJOUR'
+              from parcelle p
+              where upper(p.q)=upper(pg.q)
+              and upper(p.i)=upper(pg.ilot)
+              and upper(p.p)=upper(pg.p)
+              and parcelle_is is null;
+            """,nativeQuery = true)
+    void majParcelleId();
+
+
+    @Modifying
+    @Transactional
+    @Query(value = """
+            UPDATE parcelle_geom p
+              SET batie = true
+              WHERE EXISTS (
+                      SELECT 1
+                      FROM Batiment b
+                      WHERE b.parcelle_id = p.parcelle_id
+              )
+              and p.parcelle_id is not null;
+            """,nativeQuery = true)
+    void majParcelleBatie();
+
+
+
+
+
+
     @Query("""
     SELECT new io.gmss.fiscad.paylaods.request.crudweb.ParcelleGeomPaylaodWeb(
         pg.id,
@@ -94,9 +128,9 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
         pg.batie,
         pg.npi,
         pg.ifu,
-        pg.nom,
-        pg.prenom,
-        pg.raisonSociale,
+        pers.nom,
+        pers.prenom,
+        pers.raisonSociale,
         pg.nomEtPrenoms,
         pg.telephone,
         pg.adresse,
@@ -134,9 +168,18 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
         pg.geomSrid,
         pg.geometry,
         pg.geometryString,
-        pg.parcelle.id
+        parc.id
     )
     FROM ParcelleGeom pg
+    LEFT JOIN pg.parcelle parc
+    LEFT JOIN Enquete e
+                ON e.parcelle = parc
+                AND e.dateEnquete = (
+                    SELECT MAX(e2.dateEnquete)
+                    FROM Enquete e2
+                    WHERE e2.parcelle = parc
+                )
+    LEFT JOIN e.personne pers
     LEFT JOIN pg.departement d
     LEFT JOIN pg.commune c
     LEFT JOIN pg.arrondissement a
@@ -162,9 +205,9 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
             pg.batie,
             pg.npi,
             pg.ifu,
-            pg.nom,
-            pg.prenom,
-            pg.raisonSociale,
+            pers.nom,
+            pers.prenom,
+            pers.raisonSociale,
             pg.nomEtPrenoms,
             pg.telephone,
             pg.adresse,
@@ -202,9 +245,18 @@ public interface ParcelleGeomRepository extends JpaRepository<ParcelleGeom, Long
             pg.geomSrid,
             pg.geometry,
             pg.geometryString,
-            pg.parcelle.id
+            parc.id
         )
         FROM ParcelleGeom pg
+        LEFT JOIN pg.parcelle parc
+        LEFT JOIN Enquete e
+                    ON e.parcelle = parc
+                    AND e.dateEnquete = (
+                        SELECT MAX(e2.dateEnquete)
+                        FROM Enquete e2
+                        WHERE e2.parcelle = parc
+                    )
+        LEFT JOIN e.personne pers
         LEFT JOIN pg.departement d
         LEFT JOIN pg.commune c
         LEFT JOIN pg.arrondissement a

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java

@@ -2,9 +2,13 @@ package io.gmss.fiscad.persistence.repositories.rfu.metier;
 
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu;
+import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.DonneesImpositionTfuResponse;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -119,9 +123,411 @@ public interface DonneesImpositionTfuRepository extends JpaRepository<DonneesImp
         """, nativeQuery = true)
     List<DonneesImpositionTfuResponse> findAllDonneesImpositionTfu(Long communeId, int annee);
 
-    List<DonneesImpositionTfu> findAllByImpositionsTfu_Id(Long impositionId);
     List<DonneesImpositionTfu> findAllByImpositionsTfu_IdAndCodeArrondissement(Long impositionId,String arrondissementCode);
 
 
+    @Query("""
+SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
+        d.id,
+        d.annee,
+        d.codeDepartement,
+        d.nomDepartement,
+        d.codeCommune,
+        d.nomCommune,
+        d.codeArrondissement,
+        d.nomArrondissement,
+        d.codeQuartierVillage,
+        d.nomQuartierVillage,
+        d.q,
+        d.ilot,
+        d.parcelle,
+        d.nup,
+        d.titreFoncier,
+        d.numBatiment,
+        d.numUniteLogement,
+        d.ifu,
+        d.npi,
+        d.telProp,
+        d.emailProp,
+        d.nomProp,
+        d.prenomProp,
+        d.raisonSociale,
+        d.adresseProp,
+        d.telSc,
+        d.emailSc,
+        d.nomSc,
+        d.prenomSc,
+        d.adresseSc,
+        d.longitude,
+        d.latitude,
+        d.superficieParc,
+        d.superficieAuSolBat,
+        d.superficieAuSolUlog,
+        d.batie,
+        d.exonere,
+        d.batimentExonere,
+        d.uniteLogementExonere,
+        d.valeurLocativeAdm,
+        d.montantLoyerAnnuel,
+        d.tfuMetreCarre,
+        d.tfuMinimum,
+        d.standingBat,
+        d.categorieBat,
+        d.nombrePiscine,
+        d.nombreUlog,
+        d.nombreBat,
+        d.dateEnquete,
+        s.id,
+        z.id,
+        d.valeurAdminParcelleNb,
+        d.natureImpot,
+        s.code,
+        z.nom,
+        d.valeurBatiment,
+        d.valeurParcelle,
+        d.valeurLocativeAdmMetreCarre,
+        d.valeurAdminParcelleNbMetreCarre,
+        d.montantTaxe
+        )
+        FROM DonneesImpositionTfu d
+        JOIN d.impositionsTfu itfu
+        LEFT join d.structure s 
+        LEFT join d.zoneRfu z
+        WHERE itfu.id = :impositionTfuId
+        order by d.nomProp,d.nomProp asc
+        """)
+    List<DonneesImpositionPaylaodWeb> findAllByImpositionTfuId(
+            Long impositionTfuId
+    );
+
+
+    @Query("""
+SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
+        d.id,
+        d.annee,
+        d.codeDepartement,
+        d.nomDepartement,
+        d.codeCommune,
+        d.nomCommune,
+        d.codeArrondissement,
+        d.nomArrondissement,
+        d.codeQuartierVillage,
+        d.nomQuartierVillage,
+        d.q,
+        d.ilot,
+        d.parcelle,
+        d.nup,
+        d.titreFoncier,
+        d.numBatiment,
+        d.numUniteLogement,
+        d.ifu,
+        d.npi,
+        d.telProp,
+        d.emailProp,
+        d.nomProp,
+        d.prenomProp,
+        d.raisonSociale,
+        d.adresseProp,
+        d.telSc,
+        d.emailSc,
+        d.nomSc,
+        d.prenomSc,
+        d.adresseSc,
+        d.longitude,
+        d.latitude,
+        d.superficieParc,
+        d.superficieAuSolBat,
+        d.superficieAuSolUlog,
+        d.batie,
+        d.exonere,
+        d.batimentExonere,
+        d.uniteLogementExonere,
+        d.valeurLocativeAdm,
+        d.montantLoyerAnnuel,
+        d.tfuMetreCarre,
+        d.tfuMinimum,
+        d.standingBat,
+        d.categorieBat,
+        d.nombrePiscine,
+        d.nombreUlog,
+        d.nombreBat,
+        d.dateEnquete,
+        s.id,
+        z.id,
+        d.valeurAdminParcelleNb,
+        d.natureImpot,
+        s.code,
+        z.nom,
+        d.valeurBatiment,
+        d.valeurParcelle,
+        d.valeurLocativeAdmMetreCarre,
+        d.valeurAdminParcelleNbMetreCarre,
+        d.montantTaxe
+        )
+        FROM DonneesImpositionTfu d
+        JOIN d.impositionsTfu itfu
+        LEFT join d.structure s 
+        LEFT join d.zoneRfu z
+        WHERE itfu.id = :impositionTfuId
+        order by d.nomProp,d.nomProp asc
+        """)
+    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdPageable(
+            Long impositionTfuId,
+            Pageable pageable
+    );
+
+
+    @Query("""
+SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
+        d.id,
+        d.annee,
+        d.codeDepartement,
+        d.nomDepartement,
+        d.codeCommune,
+        d.nomCommune,
+        d.codeArrondissement,
+        d.nomArrondissement,
+        d.codeQuartierVillage,
+        d.nomQuartierVillage,
+        d.q,
+        d.ilot,
+        d.parcelle,
+        d.nup,
+        d.titreFoncier,
+        d.numBatiment,
+        d.numUniteLogement,
+        d.ifu,
+        d.npi,
+        d.telProp,
+        d.emailProp,
+        d.nomProp,
+        d.prenomProp,
+        d.raisonSociale,
+        d.adresseProp,
+        d.telSc,
+        d.emailSc,
+        d.nomSc,
+        d.prenomSc,
+        d.adresseSc,
+        d.longitude,
+        d.latitude,
+        d.superficieParc,
+        d.superficieAuSolBat,
+        d.superficieAuSolUlog,
+        d.batie,
+        d.exonere,
+        d.batimentExonere,
+        d.uniteLogementExonere,
+        d.valeurLocativeAdm,
+        d.montantLoyerAnnuel,
+        d.tfuMetreCarre,
+        d.tfuMinimum,
+        d.standingBat,
+        d.categorieBat,
+        d.nombrePiscine,
+        d.nombreUlog,
+        d.nombreBat,
+        d.dateEnquete,
+        s.id,
+        z.id,
+        d.valeurAdminParcelleNb,
+        d.natureImpot,
+        s.code,
+        z.nom,
+        d.valeurBatiment,
+        d.valeurParcelle,
+        d.valeurLocativeAdmMetreCarre,
+        d.valeurAdminParcelleNbMetreCarre,
+        d.montantTaxe
+        )
+        FROM DonneesImpositionTfu d
+        JOIN d.impositionsTfu itfu
+        LEFT join d.structure s 
+        LEFT join d.zoneRfu z
+        WHERE itfu.id = :impositionTfuId
+        and d.batie is true
+        and d.numUniteLogement is null
+        order by d.nomProp,d.nomProp asc
+        """)
+    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieBatimentPageable(
+            Long impositionTfuId,
+            Pageable pageable
+    );
+
+    @Query("""
+SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
+        d.id,
+        d.annee,
+        d.codeDepartement,
+        d.nomDepartement,
+        d.codeCommune,
+        d.nomCommune,
+        d.codeArrondissement,
+        d.nomArrondissement,
+        d.codeQuartierVillage,
+        d.nomQuartierVillage,
+        d.q,
+        d.ilot,
+        d.parcelle,
+        d.nup,
+        d.titreFoncier,
+        d.numBatiment,
+        d.numUniteLogement,
+        d.ifu,
+        d.npi,
+        d.telProp,
+        d.emailProp,
+        d.nomProp,
+        d.prenomProp,
+        d.raisonSociale,
+        d.adresseProp,
+        d.telSc,
+        d.emailSc,
+        d.nomSc,
+        d.prenomSc,
+        d.adresseSc,
+        d.longitude,
+        d.latitude,
+        d.superficieParc,
+        d.superficieAuSolBat,
+        d.superficieAuSolUlog,
+        d.batie,
+        d.exonere,
+        d.batimentExonere,
+        d.uniteLogementExonere,
+        d.valeurLocativeAdm,
+        d.montantLoyerAnnuel,
+        d.tfuMetreCarre,
+        d.tfuMinimum,
+        d.standingBat,
+        d.categorieBat,
+        d.nombrePiscine,
+        d.nombreUlog,
+        d.nombreBat,
+        d.dateEnquete,
+        s.id,
+        z.id,
+        d.valeurAdminParcelleNb,
+        d.natureImpot,
+        s.code,
+        z.nom,
+        d.valeurBatiment,
+        d.valeurParcelle,
+        d.valeurLocativeAdmMetreCarre,
+        d.valeurAdminParcelleNbMetreCarre,
+        d.montantTaxe
+        )
+        FROM DonneesImpositionTfu d
+        JOIN d.impositionsTfu itfu
+        LEFT join d.structure s 
+        LEFT join d.zoneRfu z
+        WHERE itfu.id = :impositionTfuId
+        and d.batie is true
+        and d.numUniteLogement is not null
+        order by d.nomProp,d.nomProp asc
+        """)
+    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieUniteLogPageable(
+            Long impositionTfuId,
+            Pageable pageable
+    );
+
+
+    @Query("""
+SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
+        d.id,
+        d.annee,
+        d.codeDepartement,
+        d.nomDepartement,
+        d.codeCommune,
+        d.nomCommune,
+        d.codeArrondissement,
+        d.nomArrondissement,
+        d.codeQuartierVillage,
+        d.nomQuartierVillage,
+        d.q,
+        d.ilot,
+        d.parcelle,
+        d.nup,
+        d.titreFoncier,
+        d.numBatiment,
+        d.numUniteLogement,
+        d.ifu,
+        d.npi,
+        d.telProp,
+        d.emailProp,
+        d.nomProp,
+        d.prenomProp,
+        d.raisonSociale,
+        d.adresseProp,
+        d.telSc,
+        d.emailSc,
+        d.nomSc,
+        d.prenomSc,
+        d.adresseSc,
+        d.longitude,
+        d.latitude,
+        d.superficieParc,
+        d.superficieAuSolBat,
+        d.superficieAuSolUlog,
+        d.batie,
+        d.exonere,
+        d.batimentExonere,
+        d.uniteLogementExonere,
+        d.valeurLocativeAdm,
+        d.montantLoyerAnnuel,
+        d.tfuMetreCarre,
+        d.tfuMinimum,
+        d.standingBat,
+        d.categorieBat,
+        d.nombrePiscine,
+        d.nombreUlog,
+        d.nombreBat,
+        d.dateEnquete,
+        s.id,
+        z.id,
+        d.valeurAdminParcelleNb,
+        d.natureImpot,
+        s.code,
+        z.nom,
+        d.valeurBatiment,
+        d.valeurParcelle,
+        d.valeurLocativeAdmMetreCarre,
+        d.valeurAdminParcelleNbMetreCarre,
+        d.montantTaxe
+        )
+        FROM DonneesImpositionTfu d
+        JOIN d.impositionsTfu itfu
+        LEFT join d.structure s 
+        LEFT join d.zoneRfu z
+        WHERE itfu.id = :impositionTfuId
+        and d.batie is false
+        order by d.nomProp,d.nomProp asc
+        """)
+    Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdNonBatiePageable(
+            Long impositionTfuId,
+            Pageable pageable
+    );
+
+    @Query(value = "SELECT generer_donnees_imposition_tfu_batie(:structureId, :impositionId)", nativeQuery = true)
+    Integer genererDonneesTfuBatie(
+            @Param("structureId") Long structureId,
+            @Param("impositionId") Long impositionId
+    );
+
+
+    @Query(value = "SELECT generer_donnees_imposition_tfu_batie_unite_logement(:structureId, :impositionId)", nativeQuery = true)
+    Integer genererDonneesTfuBatieUniteLogement(
+            @Param("structureId") Long structureId,
+            @Param("impositionId") Long impositionId
+    );
+
+
+    @Query(value = "SELECT generer_donnees_imposition_tfu_non_batie(:structureId, :impositionId)", nativeQuery = true)
+    Integer genererDonneesTfuNonBatie(
+            @Param("structureId") Long structureId,
+            @Param("impositionId") Long impositionId
+    );
+
+
 
 }

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java

@@ -35,8 +35,9 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
             WHERE eb.batiment.parcelle.id=p.id
             AND stru.id= :structureId
         )
+        AND eb.exercice.id = :exerciceId
     """)
-    Integer clotureEnqueteBatiment(@Param("structureId") Long structureId);
+    Integer clotureEnqueteBatiment(@Param("structureId") Long structureId,@Param("exerciceId") Long exerciceId);
 
 
     @Query(

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteUniteLogementRepository.java

@@ -34,8 +34,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
             WHERE eul.uniteLogement.batiment.parcelle.id=p.id
             AND stru.id= :structureId
         )
+        AND eul.exercice.id = :exerciceId
     """)
-    Integer clotureEnqueteUniteLogement(@Param("structureId") Long structureId);
+    Integer clotureEnqueteUniteLogement(@Param("structureId") Long structureId,@Param("exerciceId") Long exerciceId);
     @Query(nativeQuery = true,
             value = "select eul.id as idBackend, " +
                     "eul.terminal_id as terminalId, " +

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/ImpositionsTfuRepository.java

@@ -1,6 +1,7 @@
 package io.gmss.fiscad.persistence.repositories.rfu.metier;
 
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
+import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -15,6 +16,9 @@ import java.util.Optional;
 public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu, Long> {
 
     Optional<ImpositionsTfu> findAllByCommune_IdAndExercice_Id(Long communeId,Long ExerciceId);
+
+    Optional<ImpositionsTfu> findDistinctByStructure_IdAndExercice_IdAndStatusAvisIn(Long structureId, Long exerciceId, List<StatusAvis> statusAvis);
+
     @Query(value = "select i.* " +
             " from impositions_tfu i " +
             " inner join commune c on c.id=i.commune_id" +
@@ -51,7 +55,10 @@ public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu,
                 c.code,
                 c.nom,
                 s.id,
-                s.nom
+                s.nom,
+                i.nombreAvisFnb,
+                i.nombreAvisBatiment,
+                i.nombreAvisUniteLog
             )
             FROM ImpositionsTfu i
             LEFT JOIN i.exercice e
@@ -76,7 +83,10 @@ public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu,
                 c.code,
                 c.nom,
                 s.id,
-                s.nom
+                s.nom,
+                i.nombreAvisFnb,
+                i.nombreAvisBatiment,
+                i.nombreAvisUniteLog
             )
             FROM ImpositionsTfu i
             LEFT JOIN i.exercice e
@@ -103,7 +113,10 @@ public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu,
                     c.code,
                     c.nom,
                     s.id,
-                    s.nom
+                    s.nom,
+                i.nombreAvisFnb,
+                i.nombreAvisBatiment,
+                i.nombreAvisUniteLog
                 )
                 FROM ImpositionsTfu i
                 LEFT JOIN i.exercice e
@@ -137,13 +150,16 @@ public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu,
                 c.code,
                 c.nom,
                 s.id,
-                s.nom
+                s.nom,
+                i.nombreAvisFnb,
+                i.nombreAvisBatiment,
+                i.nombreAvisUniteLog
             )
             FROM ImpositionsTfu i
             LEFT JOIN i.exercice e
             LEFT JOIN i.commune c
             LEFT JOIN i.structure s
-            WHERE s.id in(:structureIds)
+            WHERE s.id in (:structureIds)
             """)
     List<ImpositionsTfuPaylaodWeb> findByStructureIdsToDto(@Param("structureIds") List<Long> structureIds);
 
@@ -165,7 +181,10 @@ public interface ImpositionsTfuRepository extends JpaRepository<ImpositionsTfu,
                 c.code,
                 c.nom,
                 s.id,
-                s.nom
+                s.nom,
+                i.nombreAvisFnb,
+                i.nombreAvisBatiment,
+                i.nombreAvisUniteLog
             )
             FROM ImpositionsTfu i
             LEFT JOIN i.exercice e

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuNonBatiRepository.java

@@ -2,11 +2,146 @@ package io.gmss.fiscad.persistence.repositories.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
+import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface BaremRfuNonBatiRepository extends JpaRepository<BaremRfuNonBati, Long> {
 Optional<BaremRfuNonBati> findAllByCommune_IdAndZoneRfu_Id(Long communeId,Long zoneRfuId);
+
+    @Query(
+            value = """
+            SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
+                b.id,
+                b.valeurAdministrative,
+                b.taux,
+                c.id,
+                c.code,
+                c.nom,
+                z.id,
+                z.code,
+                z.nom,
+                b.valeurAdministrativeMetreCarre,
+                b.auMetreCarre
+            )
+            FROM BaremRfuNonBati b
+            LEFT JOIN b.commune c
+            LEFT JOIN b.zoneRfu z
+            """,
+                        countQuery = """
+            SELECT COUNT(b)
+            FROM BaremRfuNonBati b
+            """
+                )
+    Page<BaremRfuNonBatiPayloadWeb> findAllPayloadToDtoPaged(Pageable pageable);
+
+    @Query(
+            """
+            SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
+                b.id,
+                b.valeurAdministrative,
+                b.taux,
+                c.id,
+                c.code,
+                c.nom,
+                z.id,
+                z.code,
+                z.nom,
+                b.valeurAdministrativeMetreCarre,
+                b.auMetreCarre
+            )
+            FROM BaremRfuNonBati b
+            LEFT JOIN b.commune c
+            LEFT JOIN b.zoneRfu z
+            """
+    )
+    List<BaremRfuNonBatiPayloadWeb> findAllPayloadToDto();
+
+
+    @Query(
+                    """
+                    SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
+                        b.id,
+                        b.valeurAdministrative,
+                        b.taux,
+                        c.id,
+                        c.code,
+                        c.nom,
+                        z.id,
+                        z.code,
+                        z.nom,
+                b.valeurAdministrativeMetreCarre,
+                b.auMetreCarre
+                    )
+                    FROM BaremRfuNonBati b
+                    LEFT JOIN b.commune c
+                    LEFT JOIN b.zoneRfu z
+                    WHERE c.id = :communeId
+                    """
+                )
+    List<BaremRfuNonBatiPayloadWeb> findByCommuneToDto(
+            @Param("communeId") Long communeId
+    );
+
+
+    @Query(
+            """
+            SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
+                b.id,
+                b.valeurAdministrative,
+                b.taux,
+                c.id,
+                c.code,
+                c.nom,
+                z.id,
+                z.code,
+                z.nom,
+                b.valeurAdministrativeMetreCarre,
+                b.auMetreCarre
+            )
+            FROM BaremRfuNonBati b
+            LEFT JOIN b.commune c
+            LEFT JOIN b.zoneRfu z
+            WHERE b.id = :BaremNonBatiId
+            """
+    )
+    Optional<BaremRfuNonBatiPayloadWeb> findByIdToDto(
+            @Param("BaremNonBatiId") Long BaremNonBatiId
+    );
+
+
+
+    @Query(
+            value = """
+                SELECT new io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb(
+                    b.id,
+                    b.valeurAdministrative,
+                    b.taux,
+                    c.id,
+                    c.code,
+                    c.nom,
+                    z.id,
+                    z.code,
+                    z.nom,
+                b.valeurAdministrativeMetreCarre,
+                b.auMetreCarre
+                )
+                FROM BaremRfuNonBati b
+                LEFT JOIN b.commune c
+                LEFT JOIN b.zoneRfu z
+                WHERE (:communeId IS NULL OR c.id = :communeId)
+                AND (:zoneId IS NULL OR z.id = :zoneId)
+                """
+                    )
+    Optional<BaremRfuNonBatiPayloadWeb> findByCommuneAndZoneToDto(
+            @Param("communeId") Long communeId,
+            @Param("zoneId") Long zoneId
+    );
 }
 

src/main/java/io/gmss/fiscad/persistence/repositories/rfu/parametre/BaremRfuRepository.java

@@ -27,12 +27,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             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<BaremRfuBatiPayloadWeb> findAllPayloadPaged(Pageable pageable);
 
@@ -50,12 +54,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             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<BaremRfuBatiPayloadWeb> findAllPayload();
 
@@ -73,12 +81,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             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<BaremRfuBatiPayloadWeb> findByArrondissementId(
@@ -99,12 +111,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             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<BaremRfuBatiPayloadWeb> findByBaremRfuBatieId(
@@ -125,12 +141,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             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<BaremRfuBatiPayloadWeb> findByArrondissementIdPaged(
@@ -152,12 +172,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             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<BaremRfuBati, Long> {
             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<BaremRfuBatiPayloadWeb> findByCategorieBatiment(
@@ -207,12 +235,16 @@ public interface BaremRfuRepository extends JpaRepository<BaremRfuBati, Long> {
             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
     """)

src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java

@@ -24,6 +24,7 @@ import io.gmss.fiscad.persistence.repositories.infocad.metier.PieceRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.*;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.*;
+import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.CaracteristiqueRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.ExerciceRepository;
@@ -74,6 +75,7 @@ public class EntityFromPayLoadService {
     private final EnqueteActiviteRepository enqueteActiviteRepository;
     private final ExerciceRepository exerciceRepository ;
     private final BaremRfuRepository baremRfuRepository ;
+    private final BaremRfuNonBatiRepository baremRfuNonBatiRepository ;
     private final ImpositionsTfuRepository impositionsTfuRepository ;
 
 
@@ -666,11 +668,11 @@ public class EntityFromPayLoadService {
         eul.setRepresentantNpi(enqueteUniteLogementPayloadWeb.getRepresentantNpi());
         eul.setNombrePiscine(enqueteUniteLogementPayloadWeb.getNombrePiscine());
        // eul.setStatutEnquete(StatutEnquete.EN_COURS);
-        if(!enqueteUniteLogementPayloadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
+        //if(!enqueteUniteLogementPayloadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
             eul.setStatutEnquete(StatutEnquete.EN_COURS);
-        }else{
-            eul.setStatutEnquete(enqueteUniteLogementPayloadWeb.getStatutEnquete());
-        }
+//        }else{
+//            eul.setStatutEnquete(enqueteUniteLogementPayloadWeb.getStatutEnquete());
+//        }
 
         return eul;
     }
@@ -760,11 +762,11 @@ public class EntityFromPayLoadService {
         enqueteBatiment.setRepresentantNpi(enqueteBatimentPayloadWeb.getRepresentantNpi());
         enqueteBatiment.setNombrePiscine(enqueteBatimentPayloadWeb.getNombrePiscine());
         //enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS);
-        if(!enqueteBatimentPayloadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
+        //if(!enqueteBatimentPayloadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
             enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS);
-        }else{
-            enqueteBatiment.setStatutEnquete(enqueteBatimentPayloadWeb.getStatutEnquete());
-        }
+//        }else{
+//            enqueteBatiment.setStatutEnquete(enqueteBatimentPayloadWeb.getStatutEnquete());
+//        }
         return enqueteBatiment;
     }
 
@@ -823,11 +825,11 @@ public class EntityFromPayLoadService {
         enquete.setDateEnquete(LocalDate.now());
         enquete.setLitige(enquetePayLoadWeb.getLitige());
 
-        if(!enquetePayLoadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
+       // if(!enquetePayLoadWeb.getStatutEnquete().equals(StatutEnquete.DECLARATION)){
             enquete.setStatutEnquete(StatutEnquete.EN_COURS);
-        }else{
-            enquete.setStatutEnquete(enquetePayLoadWeb.getStatutEnquete());
-        }
+//        }else{
+//            enquete.setStatutEnquete(enquetePayLoadWeb.getStatutEnquete());
+//        }
         enquete.setObservationParticuliere(enquetePayLoadWeb.getObservation());
         enquete.setAutreAdresse(enquetePayLoadWeb.getAutreAdresse());
         enquete.setAutreNumeroTitreFoncier(enquetePayLoadWeb.getAutreNumeroTitreFoncier());
@@ -927,4 +929,35 @@ public class EntityFromPayLoadService {
 
         return impositionsTfu;
     }
+
+
+
+    public BaremRfuNonBati getBaremRfuNonBatiFromPayLoadWeb(BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb){
+        BaremRfuNonBati baremRfuNonBati = new BaremRfuNonBati();
+        if (baremRfuNonBatiPayloadWeb.getId()!=null)
+            baremRfuNonBati=baremRfuNonBatiRepository.findById(baremRfuNonBatiPayloadWeb.getId()).orElse(new BaremRfuNonBati());
+
+        // ======================
+        // Relations (sans hit DB)
+        // ======================
+
+        if (baremRfuNonBatiPayloadWeb.getZoneRfuId() != null) {
+            ZoneRfu zoneRfu = new ZoneRfu();
+            zoneRfu.setId(baremRfuNonBatiPayloadWeb.getZoneRfuId());
+            baremRfuNonBati.setZoneRfu(zoneRfu);
+        }
+
+        if (baremRfuNonBatiPayloadWeb.getCommuneId() != null) {
+            Commune commune = new Commune();
+            commune.setId(baremRfuNonBatiPayloadWeb.getCommuneId());
+            baremRfuNonBati.setCommune(commune);
+        }
+
+        baremRfuNonBati.setTaux(baremRfuNonBatiPayloadWeb.getTaux());
+        baremRfuNonBati.setAuMetreCarre(baremRfuNonBatiPayloadWeb.getAuMetreCarre());
+        baremRfuNonBati.setValeurAdministrative(baremRfuNonBatiPayloadWeb.getValeurAdministrative());
+        baremRfuNonBati.setValeurAdministrativeMetreCarre(baremRfuNonBatiPayloadWeb.getValeurAdministrativeMetreCarre());
+
+        return baremRfuNonBati;
+    }
 }

src/main/resources/application.properties

@@ -1,6 +1,7 @@
 spring.profiles.active=${SPRING_PROFILES_ACTIVE}
 #spring.profiles.active=abomey
 #spring.profiles.active=test
+#test
 spring.jpa.properties.hibernate.id.new_generator_mappings=false
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
 spring.jpa.open-in-view=false