From 0be6c9a095ff7f139f210ff6c862431133439740 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Fri, 24 Jul 2026 17:15:40 +0100 Subject: [PATCH 1/2] reajustement secteur decoupage perimetre --- .../customrepository/ParcelleRepositoryCustomImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/gmss/fiscad/persistence/customrepository/ParcelleRepositoryCustomImpl.java b/src/main/java/io/gmss/fiscad/persistence/customrepository/ParcelleRepositoryCustomImpl.java index b7b0897..258a2bf 100644 --- a/src/main/java/io/gmss/fiscad/persistence/customrepository/ParcelleRepositoryCustomImpl.java +++ b/src/main/java/io/gmss/fiscad/persistence/customrepository/ParcelleRepositoryCustomImpl.java @@ -43,7 +43,7 @@ public class ParcelleRepositoryCustomImpl implements ParcelleRepositoryCustom { FROM enquete e ORDER BY e.parcelle_id, e.date_enquete DESC ) - SELECT + SELECT distinct p.id as id, p.q as q, p.i as i, -- 2.49.1 From 4b5e83f2449a91e7beb681dbca78231a87c24504 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Mon, 27 Jul 2026 14:16:35 +0100 Subject: [PATCH 2/2] reajustement secteur decoupage perimetre --- .../infocad/metier/EnqueteController.java | 2 +- .../java/io/gmss/fiscad/enums/StatusAvis.java | 3 ++- src/main/java/io/gmss/fiscad/enums/UserRole.java | 10 ++++++---- .../rfu/metier/BatimentServiceImpl.java | 8 +++++++- .../metier/DonneesImpositionTfuServiceImpl.java | 6 +++++- .../export_donnee_imposition_vers_sigibe.sql | 5 +++-- .../generer_donnees_imposition_tfu_batie.sql | 8 ++++---- ..._donnees_imposition_tfu_batie_une_parcelle.sql | 15 +++++++++------ ...tion_tfu_batie_unite_logement_une_parcelle.sql | 8 +++++--- .../generer_donnees_imposition_tfu_non_batie.sql | 6 +++--- ...nees_imposition_tfu_non_batie_une_parcelle.sql | 9 +++++---- ...ntegrer_detail_avis_dans_table_eavisdetail.sql | 3 +++ .../fiscad/service/EntityFromPayLoadService.java | 1 + .../java/io/gmss/fiscad/service/MailService.java | 2 +- src/main/resources/application-test.properties | 14 +++++++------- 15 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java index 9a2e483..fa0dc85 100644 --- a/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java +++ b/src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java @@ -101,7 +101,7 @@ public class EnqueteController { } @PutMapping("/validation") - @PreAuthorize("hasAuthority('UPDATE_ENQUETE')") + @PreAuthorize("hasAuthority('UPDATE_ENQUETE') And hasAuthority('VALIDATE_ENQUETE') ") public ResponseEntity validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) { try { return new ResponseEntity<>( diff --git a/src/main/java/io/gmss/fiscad/enums/StatusAvis.java b/src/main/java/io/gmss/fiscad/enums/StatusAvis.java index e2b17c4..45e1214 100755 --- a/src/main/java/io/gmss/fiscad/enums/StatusAvis.java +++ b/src/main/java/io/gmss/fiscad/enums/StatusAvis.java @@ -8,6 +8,7 @@ public enum StatusAvis { REJETE, TFU_FNB_GENERE, - GENERE + GENERE, + APPROVAL } diff --git a/src/main/java/io/gmss/fiscad/enums/UserRole.java b/src/main/java/io/gmss/fiscad/enums/UserRole.java index 9e3aa73..4c8e8ca 100644 --- a/src/main/java/io/gmss/fiscad/enums/UserRole.java +++ b/src/main/java/io/gmss/fiscad/enums/UserRole.java @@ -1,6 +1,8 @@ package io.gmss.fiscad.enums; public enum UserRole { + VALIDE_ENQUETE, + APPROVAL_AVIS, CREATE_ARRONDISSEMENT, READ_ARRONDISSEMENT, UPDATE_ARRONDISSEMENT, @@ -189,10 +191,10 @@ public enum UserRole { READ_UNITELOGEMENT, UPDATE_UNITELOGEMENT, DELETE_UNITELOGEMENT, - CREATE_BAREMRFUBATI, - READ_BAREMRFUBATI, - UPDATE_BAREMRFUBATI, - DELETE_BAREMRFUBATI, + CREATE_BAREMRFU, + READ_BAREMRFU, + UPDATE_BAREMRFU, + DELETE_BAREMRFU, CREATE_BAREMRFUNONBATI, READ_BAREMRFUNONBATI, UPDATE_BAREMRFUNONBATI, diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java index 8b3f7ac..9593f70 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java @@ -48,7 +48,13 @@ public class BatimentServiceImpl implements BatimentService { } Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb); batiment= batimentRepository.save(batiment); - System.out.println(batiment.getId()); + + Optional optionalParcelle=parcelleRepository.findById(batimentPaylaodWeb.getParcelleId()); + if(optionalParcelle.isPresent()){ + System.out.println(optionalParcelle.get().getP()); + optionalParcelle.get().setBatie(true); + parcelleRepository.save(optionalParcelle.get()); + } return batimentRepository.findBatimentAvecOccupantCourantToDto(batiment.getId()).orElse(null); } diff --git a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java index e95eca1..69d20c9 100644 --- a/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java +++ b/src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java @@ -112,8 +112,11 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ @Override @Transactional public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatieUneParcelle(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId,Long parcelleId) { +// System.out.println("User : " +userId); +// System.out.println("Parcelle : " +parcelleId); +// System.out.println("Imposition : " +impositionsTfuPaylaodWeb.getId()); Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId,parcelleId); - +// System.out.println(nb); ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb); impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE); @@ -175,6 +178,7 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb); + impositionsTfu.setStatusAvis(StatusAvis.GENERE); impositionsTfu.setNombreAvis(nbb+nbulo+ (impositionsTfu.getNombreAvisFnb()==null?0:impositionsTfu.getNombreAvisFnb())); diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql index 7cd8849..8b04489 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql @@ -188,10 +188,11 @@ FROM impositions_tfu imp AND cca.parcelle_id = dimp.parcelle_id LEFT JOIN structure st ON st.id = cca.structure_id - INNER JOIN eavis on eavis.r_avis = concat(c.code,'-',dimp.ifu,'-',exo.annee) + INNER JOIN eavis on eavis.r_avis = concat(c.code,'-',dimp.ifu,'-',exo.annee) where dimp.personne_id is not null order by exo.annee,dimp.parcelle_id,dimp.nature_impot, dimp.montant_taxe-coalesce(dimp.acompte,0)-coalesce(dimp.retenu_irf,0) desc ; - -- and dimp.ifu='208558'; + + --------------------------------------------------- diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie.sql index c438772..870c3ed 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie.sql @@ -162,11 +162,11 @@ BEGIN p.latitude, TRUE, -- exonere parcelle - (v_today BETWEEN ep.date_debut_exemption - AND COALESCE(ep.date_fin_exemption, v_today)), + coalesce((v_today BETWEEN ep.date_debut_exemption + AND COALESCE(ep.date_fin_exemption, v_today)),false), -- exonere batiment - (v_today BETWEEN eb.date_debut_excemption - AND COALESCE(eb.date_fin_excemption, v_today)), + coalesce((v_today BETWEEN eb.date_debut_excemption + AND COALESCE(eb.date_fin_excemption, v_today)),false), cb.standing, cb.nom, eb.nombre_piscine, diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_une_parcelle.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_une_parcelle.sql index 3a1679f..2ed2bbd 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_une_parcelle.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_une_parcelle.sql @@ -163,11 +163,11 @@ BEGIN p.latitude, TRUE, -- exonere parcelle - (v_today BETWEEN ep.date_debut_exemption - AND COALESCE(ep.date_fin_exemption, v_today)), + coalesce((v_today BETWEEN ep.date_debut_exemption + AND COALESCE(ep.date_fin_exemption, v_today)),false), -- exonere batiment - (v_today BETWEEN eb.date_debut_excemption - AND COALESCE(eb.date_fin_excemption, v_today)), + coalesce((v_today BETWEEN eb.date_debut_excemption + AND COALESCE(eb.date_fin_excemption, v_today)),false), cb.standing, cb.nom, eb.nombre_piscine, @@ -470,9 +470,12 @@ BEGIN AND st.id = v_structure_id AND p.id = p_parcelle_id AND NOT EXISTS(select 1 from donnees_imposition_tfu dimptfu - where dimptfu.batiment_id=b.id + where + -- dimptfu.batiment_id=b.id + dimptfu.parcelle_id=p_parcelle_id and dimptfu.annee=v_annee - and dimptfu.nature_impot='FB'); + --and dimptfu.nature_impot='FB' + ); -- ON CONFLICT DO NOTHING; diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_unite_logement_une_parcelle.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_unite_logement_une_parcelle.sql index 701b92b..a5ca48d 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_unite_logement_une_parcelle.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_batie_unite_logement_une_parcelle.sql @@ -453,9 +453,11 @@ BEGIN AND p.id = p_parcelle_id AND NOT exists(select 1 from donnees_imposition_tfu dimptfu where dimptfu.annee=v_annee - and dimptfu.batiment_id=b.id - and dimptfu.unite_logement_id=ul.id - and dimptfu.nature_impot='FB') + and dimptfu.parcelle_id=p_parcelle_id + --and dimptfu.batiment_id=b.id + --and dimptfu.unite_logement_id=ul.id + --and dimptfu.nature_impot='FB' + ) ON CONFLICT DO NOTHING; GET DIAGNOSTICS v_rows_inserted = ROW_COUNT; diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie.sql index 12095c3..1dcb64a 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie.sql @@ -99,10 +99,10 @@ BEGIN p.longitude, p.latitude, false, - ( + coalesce(( CURRENT_DATE >= ep.date_debut_exemption AND CURRENT_DATE <= COALESCE(ep.date_fin_exemption, CURRENT_DATE) - ), + ),false), ep.date_enquete, st.id, ep.zone_rfu_id, @@ -189,7 +189,7 @@ BEGIN epa.id_impot_nature, epa.id_exercice )tac on tac.ifu=pers.ifu and tac.r_quartier=q.code and tac.qip_ilot=p.i and tac.qip_parcelle=p.p - WHERE p.batie = false + WHERE (p.batie = false or p.batie is null) AND st.id = v_structure_id ON CONFLICT DO NOTHING; diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie_une_parcelle.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie_une_parcelle.sql index a97b53b..a2d50df 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie_une_parcelle.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/generer_donnees_imposition_tfu_non_batie_une_parcelle.sql @@ -100,10 +100,10 @@ BEGIN p.longitude, p.latitude, false, - ( + coalesce(( CURRENT_DATE >= ep.date_debut_exemption AND CURRENT_DATE <= COALESCE(ep.date_fin_exemption, CURRENT_DATE) - ), + ),false), ep.date_enquete, st.id, ep.zone_rfu_id, @@ -190,11 +190,12 @@ BEGIN epa.id_impot_nature, epa.id_exercice )tac on tac.ifu=pers.ifu and tac.r_quartier=q.code and tac.qip_ilot=p.i and tac.qip_parcelle=p.p - WHERE p.batie = false + WHERE (p.batie = false or batie is null) AND st.id = v_structure_id AND p.id=p_parcelle_id AND NOT EXISTS( select 1 from donnees_imposition_tfu dimptfu - where dimptfu.nature_impot='FNB' + where true + --dimptfu.nature_impot='FNB' and dimptfu.parcelle_id=p_parcelle_id and dimptfu.annee=v_annee) diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_detail_avis_dans_table_eavisdetail.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_detail_avis_dans_table_eavisdetail.sql index 90175bc..73bc8b1 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_detail_avis_dans_table_eavisdetail.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/integrer_detail_avis_dans_table_eavisdetail.sql @@ -71,3 +71,6 @@ BEGIN ); END; $$; + + +call integrer_eavis_detail(); diff --git a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java index 5fad602..74d2237 100644 --- a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java +++ b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java @@ -1032,6 +1032,7 @@ public class EntityFromPayLoadService { parcelle.setAutreNumeroTitreFoncier(parcellePayLoadWeb.getNumTitreFoncier()); parcelle.setObservation(parcellePayLoadWeb.getObservation()); parcelle.setSuperficie(parcellePayLoadWeb.getSuperficie()); + parcelle.setBatie(false); return parcelle; } diff --git a/src/main/java/io/gmss/fiscad/service/MailService.java b/src/main/java/io/gmss/fiscad/service/MailService.java index 491e968..2a5c5a0 100755 --- a/src/main/java/io/gmss/fiscad/service/MailService.java +++ b/src/main/java/io/gmss/fiscad/service/MailService.java @@ -465,7 +465,7 @@ public class MailService { null, null, null, - "[SIGIBE] Validation de votre demande d'immatriculation fiscale", + "[SIGIBE] Changement de votre mot de passe", applicantName, eServicesNumber, passwordCreationLink, diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 80747d9..794620f 100755 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -2,16 +2,16 @@ server.port=8282 io.gmss.fiscad.profile=test # LOCAL ENV TEST -spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi -spring.datasource.username=infocad_user +#spring.datasource.url=jdbc:postgresql://localhost:5432/fiscad_dgi +#spring.datasource.username=infocad_user +@spring.datasource.password=W5fwD({9*q53 + + +spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db +spring.datasource.username=fiscad_user spring.datasource.password=W5fwD({9*q53 -#spring.datasource.url=jdbc:postgresql://193.181.208.4:5432/fiscad_db -#spring.datasource.username=fiscad_user -#spring.datasource.password=W5fwD({9*q53 - - app.default-user.username=fiscad_admin app.default-user.password=1234567890 -- 2.49.1