From dc28d88763e16257dc0a945b2f4423c06fb3a078 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Sun, 1 Mar 2026 18:29:12 +0100 Subject: [PATCH] Gestion parcelle geom --- .../fiscad/entities/rfu/metier/Batiment.java | 5 +++- .../entities/rfu/metier/UniteLogement.java | 2 ++ .../request/crudweb/BatimentPaylaodWeb.java | 13 +++++++++- .../crudweb/UniteLogementPaylaodWeb.java | 8 +++++- .../rfu/metier/BatimentRepository.java | 25 +++++++++++++++---- .../rfu/metier/UniteLogementRepository.java | 24 +++++++++++++----- 6 files changed, 63 insertions(+), 14 deletions(-) diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java index f591ac9..5ff3657 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java @@ -43,10 +43,13 @@ public class Batiment extends BaseEntity implements Serializable { private Integer nombrePiscine; private Long montantLocatifAnnuelDeclare; private Long montantLocatifAnnuelCalcule; + private Long montantLocatifAnnuelEstime; private Long valeurBatimentEstime; private Long valeurBatimentReel; + private Long valeurBatimentCalcule; private Long montantMensuelLocation; - + private Integer nbreUniteLogement; + private Integer idToitRfu; @JsonIgnore @ManyToOne diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java index 2ffb75b..a2c5537 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java @@ -52,6 +52,7 @@ public class UniteLogement extends BaseEntity implements Serializable { private Long montantLocatifAnnuelCalcule; private Long valeurUniteLogementEstime; private Long valeurUniteLogementReel; + private Long valeurUniteLogementCalcule; private Integer nombrePiscine; @JsonIgnore @ManyToOne @@ -67,4 +68,5 @@ public class UniteLogement extends BaseEntity implements Serializable { @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateFinExemption; + private Integer idToitRfu; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java index a357b0b..35324c5 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java @@ -29,11 +29,14 @@ public class BatimentPaylaodWeb { private Integer nombrePiscine; private Long montantLocatifAnnuelDeclare; private Long montantLocatifAnnuelCalcule; + private Long montantLocatifAnnuelEstime; private Long valeurBatimentEstime; private Long valeurBatimentReel; + private Long valeurBatimentCalcule; private Long montantMensuelLocation; private Long usageId; private String usageNom; + private Integer nbreUniteLogement; public BatimentPaylaodWeb(Long id, String nub, @@ -61,7 +64,11 @@ public class BatimentPaylaodWeb { Long valeurBatimentReel, Long montantMensuelLocation, Long usageId, - String usageNom) { + String usageNom, + Long montantLocatifAnnuelEstime, + Long valeurBatimentCalcule, + Integer nbreUniteLogement + ) { this.id = id; this.nub = nub; this.code = code; @@ -89,5 +96,9 @@ public class BatimentPaylaodWeb { this.montantMensuelLocation = montantMensuelLocation ; this.usageId = usageId ; this.usageNom = usageNom ; + this.montantLocatifAnnuelEstime = montantLocatifAnnuelEstime ; + this.valeurBatimentCalcule = valeurBatimentCalcule ; + this.nbreUniteLogement = nbreUniteLogement ; + } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java index 1258fbd..1bf0b91 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java @@ -28,8 +28,10 @@ public class UniteLogementPaylaodWeb { private Long montantMensuelLocation; private Long montantLocatifAnnuelDeclare; private Long montantLocatifAnnuelCalcule; + private Long montantLocatifAnnuelEstime; private Long valeurUniteLogementEstime; private Long valeurUniteLogementReel; + private Long valeurUniteLogementCalcule; private Integer nombrePiscine; private Long usageId; private String usageNom; @@ -45,7 +47,9 @@ public class UniteLogementPaylaodWeb { Long valeurUniteLogementReel, Integer nombrePiscine, Long usageId, - String usageNom + String usageNom, + Long montantLocatifAnnuelEstime, + Long valeurUniteLogementCalcule ) { this.id = id; this.nul = nul; @@ -73,5 +77,7 @@ public class UniteLogementPaylaodWeb { this.nombrePiscine = nombrePiscine; this.usageId = usageId ; this.usageNom = usageNom ; + this.montantLocatifAnnuelEstime = montantLocatifAnnuelEstime ; + this.valeurUniteLogementCalcule = valeurUniteLogementCalcule ; } } diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java index 8de9d12..2997b56 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java @@ -62,7 +62,10 @@ public interface BatimentRepository extends JpaRepository { eb.valeurBatimentReel, eb.montantMensuelLocation, us.id, - us.nom + us.nom, + eb.montantLocatifAnnuelEstime, + eb.valeurBatimentCalcule, + eb.nbreUniteLogement ) FROM Batiment b JOIN b.parcelle p @@ -108,7 +111,10 @@ public interface BatimentRepository extends JpaRepository { eb.valeurBatimentReel, eb.montantMensuelLocation, us.id, - us.nom + us.nom, + eb.montantLocatifAnnuelEstime, + eb.valeurBatimentCalcule, + eb.nbreUniteLogement ) FROM Batiment b JOIN b.parcelle p @@ -155,7 +161,10 @@ public interface BatimentRepository extends JpaRepository { eb.valeurBatimentReel, eb.montantMensuelLocation , us.id, - us.nom + us.nom, + eb.montantLocatifAnnuelEstime, + eb.valeurBatimentCalcule, + eb.nbreUniteLogement ) FROM Batiment b JOIN b.parcelle p @@ -207,7 +216,10 @@ public interface BatimentRepository extends JpaRepository { eb.valeurBatimentReel, eb.montantMensuelLocation , us.id, - us.nom + us.nom, + eb.montantLocatifAnnuelEstime, + eb.valeurBatimentCalcule, + eb.nbreUniteLogement ) FROM Batiment b JOIN b.parcelle p @@ -258,7 +270,10 @@ public interface BatimentRepository extends JpaRepository { eb.valeurBatimentReel, eb.montantMensuelLocation, us.id, - us.nom + us.nom , + eb.montantLocatifAnnuelEstime, + eb.valeurBatimentCalcule, + eb.nbreUniteLogement ) FROM Batiment b JOIN b.parcelle p diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java index 36e7242..5837185 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java @@ -64,7 +64,9 @@ public interface UniteLogementRepository extends JpaRepository