From dc59006e99a8de95bf929f3b19e3b6c4651f9ac9 Mon Sep 17 00:00:00 2001 From: Aurince AKAKPO Date: Sun, 22 Feb 2026 11:50:39 +0100 Subject: [PATCH 1/2] =?UTF-8?q?prise=20en=20charge=20des=20donn=C3=A9es=20?= =?UTF-8?q?entrant=20dans=20la=20liquidation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fiscad/entities/rfu/metier/Batiment.java | 5 ++ .../entities/rfu/metier/EnqueteBatiment.java | 3 ++ .../rfu/metier/EnqueteUniteLogement.java | 4 +- .../entities/rfu/metier/UniteLogement.java | 3 ++ .../rfu/parametre/CategorieBatiment.java | 1 + .../request/crudweb/BatimentPaylaodWeb.java | 27 ++++++++++- .../crudweb/EnqueteBatimentPayloadWeb.java | 11 ++++- .../EnqueteUniteLogementPayloadWeb.java | 11 ++++- .../crudweb/UniteLogementPaylaodWeb.java | 11 ++++- .../rfu/metier/BatimentRepository.java | 30 ++++++++++-- .../rfu/metier/EnqueteBatimentRepository.java | 30 ++++++++++-- .../EnqueteUniteLogementRepository.java | 48 +++++++++++++++---- .../rfu/metier/UniteLogementRepository.java | 36 +++++++++++--- .../service/EntityFromPayLoadService.java | 24 ++++++++++ 14 files changed, 212 insertions(+), 32 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 991b0bf..3fe763a 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 @@ -7,6 +7,7 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer; import io.gmss.fiscad.entities.BaseEntity; import io.gmss.fiscad.entities.infocad.metier.Parcelle; import io.gmss.fiscad.entities.infocad.metier.Tpe; +import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; @@ -41,6 +42,10 @@ public class Batiment extends BaseEntity implements Serializable { @ManyToOne private Parcelle parcelle; + + @ManyToOne + private CategorieBatiment categorieBatiment ; + @JsonIgnore @ManyToOne private Tpe terminal; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java index 7c6b532..d7a7e17 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java @@ -12,6 +12,7 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.infocad.metier.Upload; import io.gmss.fiscad.entities.infocad.parametre.Personne; import io.gmss.fiscad.entities.rfu.parametre.Caracteristique; +import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment; import io.gmss.fiscad.entities.rfu.parametre.Exercice; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.StatutEnquete; @@ -126,4 +127,6 @@ public class EnqueteBatiment extends BaseEntity implements Serializable { @Enumerated(EnumType.STRING) @JsonIgnore private StatutEnquete statutEnquete; + @ManyToOne + private CategorieBatiment categorieBatiment ; } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java index 216e25e..56ebb0d 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java @@ -11,6 +11,7 @@ import io.gmss.fiscad.entities.infocad.metier.Enquete; import io.gmss.fiscad.entities.infocad.metier.Tpe; import io.gmss.fiscad.entities.infocad.metier.Upload; import io.gmss.fiscad.entities.infocad.parametre.Personne; +import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment; import io.gmss.fiscad.entities.rfu.parametre.Exercice; import io.gmss.fiscad.entities.user.User; import io.gmss.fiscad.enums.StatutEnquete; @@ -114,5 +115,6 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable { @JsonIgnore @Enumerated(EnumType.STRING) private StatutEnquete statutEnquete; - + @ManyToOne + private CategorieBatiment categorieBatiment ; } 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 13449b1..2d0f6bf 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 @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.gmss.fiscad.deserializer.LocalDateDeserializer; import io.gmss.fiscad.entities.BaseEntity; import io.gmss.fiscad.entities.infocad.metier.Tpe; +import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; @@ -48,4 +49,6 @@ public class UniteLogement extends BaseEntity implements Serializable { private Tpe terminal; private Long enqueteId; private Long mobileDataId; + @ManyToOne + private CategorieBatiment categorieBatiment ; } diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/CategorieBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/CategorieBatiment.java index 68c6c8f..e6f993f 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/parametre/CategorieBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/parametre/CategorieBatiment.java @@ -23,4 +23,5 @@ public class CategorieBatiment extends BaseEntity implements Serializable { @Column(unique = true) private String code; private String nom; + private String standing; } 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 3777ca0..8df7518 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 @@ -23,8 +23,28 @@ public class BatimentPaylaodWeb { private Float superficieAuSol; private Float superficieLouee; private Long enqueteBatiementCourantId; - - public BatimentPaylaodWeb(Long id, String nub, String code, LocalDate dateConstruction, Long parcelleId, String parcelleNup, String parcelleQ, String parcelleI, String parcelleP, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Float superficieAuSol, Float superficieLouee,Long enqueteBatiementCourantId) { + private Long categorieBatimentId; + private String categorieBatimentCode; + private String categorieBatimentStanding; + public BatimentPaylaodWeb(Long id, + String nub, + String code, + LocalDate dateConstruction, + Long parcelleId, + String parcelleNup, + String parcelleQ, + String parcelleI, + String parcelleP, + Long personneId, + String personneNom, + String personnePrenom, + String personneRaisonSociale, + Float superficieAuSol, + Float superficieLouee, + Long enqueteBatiementCourantId, + Long categorieBatimentId, + String categorieBatimentCode, + String categorieBatimentStanding) { this.id = id; this.nub = nub; this.code = code; @@ -41,5 +61,8 @@ public class BatimentPaylaodWeb { this.superficieAuSol = superficieAuSol ; this.superficieLouee = superficieLouee ; this.enqueteBatiementCourantId = enqueteBatiementCourantId ; + this.categorieBatimentId = categorieBatimentId ; + this.categorieBatimentCode = categorieBatimentCode ; + this.categorieBatimentStanding = categorieBatimentStanding ; } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java index 8b3c883..793e9cf 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java @@ -60,6 +60,9 @@ public class EnqueteBatimentPayloadWeb { private String representantPrenom; private String representantTel; private String representantNpi; + private Long categorieBatimentId; + private String categorieBatimentCode; + private String categorieBatimentStanding; public EnqueteBatimentPayloadWeb(Long id, String observation, String autreMenuisierie, String autreMur, boolean sbee, String numCompteurSbee, boolean soneb, String numCompteurSoneb, int nbreLotUnite, int nbreUniteLocation, Float superficieLouee, Float superficieAuSol, LocalDate dateEnquete, int nbreMenage, int nbreHabitant, Long montantMensuelLocation, Long montantLocatifAnnuelDeclare, Long nbreEtage, Long valeurBatimentEstime, Long valeurBatimentReel, int nbreMoisLocation, String autreCaracteristiquePhysique, LocalDate dateDebutExcemption, LocalDate dateFinExcemption, Long batimentId, String batimentNub, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom, StatutEnquete statutEnquete, @@ -68,7 +71,10 @@ public class EnqueteBatimentPayloadWeb { String representantNom, String representantPrenom, String representantTel, - String representantNpi) { + String representantNpi, + Long categorieBatimentId, + String categorieBatimentCode, + String categorieBatimentStanding) { this.id = id; this.observation = observation; this.autreMenuisierie = autreMenuisierie; @@ -109,5 +115,8 @@ public class EnqueteBatimentPayloadWeb { this.representantPrenom = representantPrenom; this.representantTel = representantTel; this.representantNpi = representantNpi; + this.categorieBatimentId = categorieBatimentId; + this.categorieBatimentCode = categorieBatimentCode; + this.categorieBatimentStanding = categorieBatimentStanding; } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java index 01177da..88c99ba 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java @@ -49,13 +49,19 @@ public class EnqueteUniteLogementPayloadWeb { private String representantPrenom; private String representantTel; private String representantNpi; + private Long categorieBatimentId; + private String categorieBatimentCode; + private String categorieBatimentStanding; public EnqueteUniteLogementPayloadWeb(Long id, String observation, Integer nbrePiece, Integer nbreHabitant, Integer nbreMenage, Boolean enLocation, Integer nbreMoisLocation, Float montantMensuelLoyer, Float montantLocatifAnnuelDeclare, Long valeurUniteLogementEstime, Long valeurUniteLogementReel, Float superficieLouee, Float superficieAuSol, LocalDate dateEnquete, Boolean sbee, Boolean soneb, String numCompteurSbee, String numCompteurSoneb, LocalDate dateDebutExemption, LocalDate dateFinExemption, Long uniteLogementId, String uniteLogementNumeroEtage, String uniteLogementNul, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom, Long exerciceId, Integer exerciceAnnee, StatutEnquete statutEnquete, String representantNom, String representantPrenom, String representantTel, - String representantNpi + String representantNpi, + Long categorieBatimentId, + String categorieBatimentCode, + String categorieBatimentStanding ) { this.id = id; this.observation = observation; @@ -94,5 +100,8 @@ public class EnqueteUniteLogementPayloadWeb { this.representantPrenom = representantPrenom; this.representantTel = representantTel; this.representantNpi = representantNpi; + this.categorieBatimentId = categorieBatimentId; + this.categorieBatimentCode = categorieBatimentCode; + this.categorieBatimentStanding = categorieBatimentStanding; } } 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 9202d0d..889ed16 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 @@ -22,8 +22,14 @@ public class UniteLogementPaylaodWeb { private String personnePrenom; private String personneRaisonSociale; private Long enqueteUniteLogementCourantId; + private Long categorieBatimentId; + private String categorieBatimentCode; + private String categorieBatimentStanding; - public UniteLogementPaylaodWeb(Long id, String nul, String numeroEtage, String code, Long batimentId, Float superficieAuSol, Float superficieLouee, String batimentNub, String observation, LocalDate dateConstruction, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale,Long enqueteUniteLogementCourantId) { + public UniteLogementPaylaodWeb(Long id, String nul, String numeroEtage, String code, Long batimentId, Float superficieAuSol, Float superficieLouee, String batimentNub, String observation, LocalDate dateConstruction, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale,Long enqueteUniteLogementCourantId, + Long categorieBatimentId, + String categorieBatimentCode, + String categorieBatimentStanding) { this.id = id; this.nul = nul; this.numeroEtage = numeroEtage; @@ -39,5 +45,8 @@ public class UniteLogementPaylaodWeb { this.personnePrenom = personnePrenom; this.personneRaisonSociale = personneRaisonSociale; this.enqueteUniteLogementCourantId = enqueteUniteLogementCourantId; + this.categorieBatimentId = categorieBatimentId; + this.categorieBatimentCode = categorieBatimentCode; + this.categorieBatimentStanding = categorieBatimentStanding; } } 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 7220cd3..123e67c 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 @@ -50,10 +50,14 @@ public interface BatimentRepository extends JpaRepository { per.raisonSociale, eb.superficieAuSol, eb.superficieLouee, - eb.id + eb.id, + cb.id, + cb.code, + cb.standing ) FROM Batiment b JOIN b.parcelle p + LEFT JOIN b.categorieBatiment cb LEFT JOIN EnqueteBatiment eb ON eb.batiment = b AND eb.dateEnquete = ( @@ -83,10 +87,14 @@ public interface BatimentRepository extends JpaRepository { per.raisonSociale, eb.superficieAuSol, eb.superficieLouee, - eb.id + eb.id, + cb.id, + cb.code, + cb.standing ) FROM Batiment b JOIN b.parcelle p + LEFT JOIN b.categorieBatiment cb LEFT JOIN EnqueteBatiment eb ON eb.batiment = b AND eb.dateEnquete = ( @@ -117,10 +125,14 @@ public interface BatimentRepository extends JpaRepository { per.raisonSociale, eb.superficieAuSol, eb.superficieLouee, - eb.id + eb.id, + cb.id, + cb.code, + cb.standing ) FROM Batiment b JOIN b.parcelle p + LEFT JOIN b.categorieBatiment cb LEFT JOIN EnqueteBatiment eb ON eb.batiment = b AND eb.dateEnquete = ( @@ -156,10 +168,14 @@ public interface BatimentRepository extends JpaRepository { per.raisonSociale, eb.superficieAuSol, eb.superficieLouee, - eb.id + eb.id, + cb.id, + cb.code, + cb.standing ) FROM Batiment b JOIN b.parcelle p + LEFT JOIN b.categorieBatiment cb LEFT JOIN EnqueteBatiment eb ON eb.batiment = b AND eb.dateEnquete = ( @@ -194,10 +210,14 @@ public interface BatimentRepository extends JpaRepository { per.raisonSociale, eb.superficieAuSol, eb.superficieLouee, - eb.id + eb.id, + cb.id, + cb.code, + cb.standing ) FROM Batiment b JOIN b.parcelle p + LEFT JOIN b.categorieBatiment cb LEFT JOIN EnqueteBatiment eb ON eb.batiment = b AND eb.dateEnquete = ( diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java index e1fa5b5..39d1f3e 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java @@ -100,13 +100,17 @@ public interface EnqueteBatimentRepository extends JpaRepository findEnqueteBatimentByIdToDto(@Param("enqueteBatimentId") Long enqueteBatimentId); @@ -155,13 +159,17 @@ public interface EnqueteBatimentRepository extends JpaRepository findAllEnqueteBatimentToDto(); @@ -210,13 +218,17 @@ public interface EnqueteBatimentRepository extends JpaRepository findAllByBatimentToDto( @@ -329,13 +345,17 @@ public interface EnqueteBatimentRepository extends JpaRepository findEnqueteUniteLogementToDto(@Param("enqueteUniteLogementId") Long enqueteUniteLogementId); @@ -147,13 +151,17 @@ public interface EnqueteUniteLogementRepository extends JpaRepository findAllEnqueteUniteLogementToDto(); @@ -201,13 +209,17 @@ public interface EnqueteUniteLogementRepository extends JpaRepository findAllByUniteLogementToDto( @@ -317,13 +333,17 @@ public interface EnqueteUniteLogementRepository extends JpaRepository findAllByExerciceToDto( @@ -432,16 +456,20 @@ public interface EnqueteUniteLogementRepository extends JpaRepository Date: Sun, 22 Feb 2026 14:52:47 +0100 Subject: [PATCH 2/2] =?UTF-8?q?prise=20en=20charge=20des=20donn=C3=A9es=20?= =?UTF-8?q?entrant=20dans=20la=20liquidation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/infocad/metier/Parcelle.java | 1 + .../fiscad/entities/rfu/metier/Batiment.java | 9 ++++ .../entities/rfu/metier/EnqueteBatiment.java | 2 + .../rfu/metier/EnqueteUniteLogement.java | 6 ++- .../entities/rfu/metier/UniteLogement.java | 6 +++ .../request/crudweb/BatimentPaylaodWeb.java | 20 +++++++- .../crudweb/EnqueteBatimentPayloadWeb.java | 10 +++- .../EnqueteUniteLogementPayloadWeb.java | 17 ++++--- .../crudweb/UniteLogementPaylaodWeb.java | 20 +++++++- .../EnqueteUniteLogementPayload.java | 4 +- .../rfu/metier/BatimentRepository.java | 41 ++++++++++++++-- .../rfu/metier/EnqueteBatimentRepository.java | 20 ++++++-- .../EnqueteUniteLogementRepository.java | 43 +++++++++++------ .../rfu/metier/UniteLogementRepository.java | 48 ++++++++++++++++--- .../service/EntityFromPayLoadService.java | 4 +- .../EnqueteUniteLogementAsyncWorker.java | 2 +- 16 files changed, 207 insertions(+), 46 deletions(-) diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java index 5341884..fb1f558 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java @@ -69,6 +69,7 @@ public class Parcelle extends BaseEntity implements Serializable { private Rue rue ; private String numeroRue ; private Boolean batie; + private Integer nombrePiscine; // private String ncProprietaire ; // @JsonIgnore // @OneToMany(mappedBy = "parcelle") 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 3fe763a..6dfa473 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 @@ -13,6 +13,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.Internal; import org.hibernate.annotations.Where; import java.io.Serializable; @@ -37,6 +38,14 @@ public class Batiment extends BaseEntity implements Serializable { private Long idDerniereEnquete; private Float superficieLouee; private Float superficieAuSol; + private Integer nombreEtage; + private Integer nombrePiscine; + private Long montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelCalcule; + private Long valeurBatimentEstime; + private Long valeurBatimentReel; + private Long montantMensuelLocation; + @JsonIgnore @ManyToOne diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java index d7a7e17..24fc3ca 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java @@ -60,8 +60,10 @@ public class EnqueteBatiment extends BaseEntity implements Serializable { private Integer nbreHabitant; private Long montantMensuelLocation; private Long montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelCalcule; private Long valeurBatimentEstime; private Long valeurBatimentReel; + private Integer nombrePiscine; private Integer nbreMoisLocation; private String autreCaracteristiquePhysique; private String observation; diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java index 56ebb0d..d91dc93 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java @@ -48,11 +48,13 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable { private Integer nbreHabitant; private Integer nbreMenage; private Boolean enLocation; - private Float montantMensuelLoyer; + private Long montantMensuelLocation; private Integer nbreMoisLocation; - private Float montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelCalcule; private Long valeurUniteLogementEstime; private Long valeurUniteLogementReel; + private Integer nombrePiscine; private Float superficieLouee; private Float superficieAuSol; private Boolean sbee; 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 2d0f6bf..6ec0cce 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 @@ -44,6 +44,12 @@ public class UniteLogement extends BaseEntity implements Serializable { private Long idDerniereEnquete; private Float SuperficieLouee; private Float SuperficieAuSol; + private Long montantMensuelLocation; + private Long montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelCalcule; + private Long valeurUniteLogementEstime; + private Long valeurUniteLogementReel; + private Integer nombrePiscine; @JsonIgnore @ManyToOne private Tpe terminal; 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 8df7518..9c8705e 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 @@ -26,6 +26,12 @@ public class BatimentPaylaodWeb { private Long categorieBatimentId; private String categorieBatimentCode; private String categorieBatimentStanding; + private Integer nombrePiscine; + private Long montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelCalcule; + private Long valeurBatimentEstime; + private Long valeurBatimentReel; + private Long montantMensuelLocation; public BatimentPaylaodWeb(Long id, String nub, String code, @@ -44,7 +50,13 @@ public class BatimentPaylaodWeb { Long enqueteBatiementCourantId, Long categorieBatimentId, String categorieBatimentCode, - String categorieBatimentStanding) { + String categorieBatimentStanding, + Integer nombrePiscine, + Long montantLocatifAnnuelDeclare, + Long montantLocatifAnnuelCalcule, + Long valeurBatimentEstime, + Long valeurBatimentReel, + Long montantMensuelLocation) { this.id = id; this.nub = nub; this.code = code; @@ -64,5 +76,11 @@ public class BatimentPaylaodWeb { this.categorieBatimentId = categorieBatimentId ; this.categorieBatimentCode = categorieBatimentCode ; this.categorieBatimentStanding = categorieBatimentStanding ; + this.nombrePiscine = nombrePiscine ; + this.montantLocatifAnnuelDeclare = montantLocatifAnnuelDeclare ; + this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule ; + this.valeurBatimentEstime = valeurBatimentEstime ; + this.valeurBatimentReel = valeurBatimentReel ; + this.montantMensuelLocation = montantMensuelLocation ; } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java index 793e9cf..54cdb6b 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java @@ -63,6 +63,8 @@ public class EnqueteBatimentPayloadWeb { private Long categorieBatimentId; private String categorieBatimentCode; private String categorieBatimentStanding; + private Integer nombrePiscine; + private Long montantLocatifAnnuelCalcule; public EnqueteBatimentPayloadWeb(Long id, String observation, String autreMenuisierie, String autreMur, boolean sbee, String numCompteurSbee, boolean soneb, String numCompteurSoneb, int nbreLotUnite, int nbreUniteLocation, Float superficieLouee, Float superficieAuSol, LocalDate dateEnquete, int nbreMenage, int nbreHabitant, Long montantMensuelLocation, Long montantLocatifAnnuelDeclare, Long nbreEtage, Long valeurBatimentEstime, Long valeurBatimentReel, int nbreMoisLocation, String autreCaracteristiquePhysique, LocalDate dateDebutExcemption, LocalDate dateFinExcemption, Long batimentId, String batimentNub, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom, StatutEnquete statutEnquete, @@ -74,7 +76,10 @@ public class EnqueteBatimentPayloadWeb { String representantNpi, Long categorieBatimentId, String categorieBatimentCode, - String categorieBatimentStanding) { + String categorieBatimentStanding, + Integer nombrePiscine, + Long montantLocatifAnnuelCalcule + ) { this.id = id; this.observation = observation; this.autreMenuisierie = autreMenuisierie; @@ -118,5 +123,8 @@ public class EnqueteBatimentPayloadWeb { this.categorieBatimentId = categorieBatimentId; this.categorieBatimentCode = categorieBatimentCode; this.categorieBatimentStanding = categorieBatimentStanding; + this.nombrePiscine = nombrePiscine; + this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule; + } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java index 88c99ba..8a30fbf 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java @@ -18,8 +18,8 @@ public class EnqueteUniteLogementPayloadWeb { private Integer nbreMenage; private Boolean enLocation; private Integer nbreMoisLocation; - private Float montantMensuelLoyer; - private Float montantLocatifAnnuelDeclare; + private Long montantMensuelLocation; + private Long montantLocatifAnnuelDeclare; private Long valeurUniteLogementEstime; private Long valeurUniteLogementReel; private Float superficieLouee; @@ -52,8 +52,9 @@ public class EnqueteUniteLogementPayloadWeb { private Long categorieBatimentId; private String categorieBatimentCode; private String categorieBatimentStanding; - - public EnqueteUniteLogementPayloadWeb(Long id, String observation, Integer nbrePiece, Integer nbreHabitant, Integer nbreMenage, Boolean enLocation, Integer nbreMoisLocation, Float montantMensuelLoyer, Float montantLocatifAnnuelDeclare, Long valeurUniteLogementEstime, Long valeurUniteLogementReel, Float superficieLouee, Float superficieAuSol, LocalDate dateEnquete, Boolean sbee, Boolean soneb, String numCompteurSbee, String numCompteurSoneb, LocalDate dateDebutExemption, LocalDate dateFinExemption, Long uniteLogementId, String uniteLogementNumeroEtage, String uniteLogementNul, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom, Long exerciceId, Integer exerciceAnnee, + private Long montantLocatifAnnuelCalcule; + private Integer nombrePiscine; + public EnqueteUniteLogementPayloadWeb(Long id, String observation, Integer nbrePiece, Integer nbreHabitant, Integer nbreMenage, Boolean enLocation, Integer nbreMoisLocation, Long montantMensuelLocation, Long montantLocatifAnnuelDeclare, Long valeurUniteLogementEstime, Long valeurUniteLogementReel, Float superficieLouee, Float superficieAuSol, LocalDate dateEnquete, Boolean sbee, Boolean soneb, String numCompteurSbee, String numCompteurSoneb, LocalDate dateDebutExemption, LocalDate dateFinExemption, Long uniteLogementId, String uniteLogementNumeroEtage, String uniteLogementNul, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom, Long exerciceId, Integer exerciceAnnee, StatutEnquete statutEnquete, String representantNom, String representantPrenom, @@ -61,7 +62,9 @@ public class EnqueteUniteLogementPayloadWeb { String representantNpi, Long categorieBatimentId, String categorieBatimentCode, - String categorieBatimentStanding + String categorieBatimentStanding, + Integer nombrePiscine, + Long montantLocatifAnnuelCalcule ) { this.id = id; this.observation = observation; @@ -70,7 +73,7 @@ public class EnqueteUniteLogementPayloadWeb { this.nbreMenage = nbreMenage; this.enLocation = enLocation; this.nbreMoisLocation = nbreMoisLocation; - this.montantMensuelLoyer = montantMensuelLoyer; + this.montantMensuelLocation = montantMensuelLocation; this.montantLocatifAnnuelDeclare = montantLocatifAnnuelDeclare; this.valeurUniteLogementEstime = valeurUniteLogementEstime; this.valeurUniteLogementReel = valeurUniteLogementReel; @@ -103,5 +106,7 @@ public class EnqueteUniteLogementPayloadWeb { this.categorieBatimentId = categorieBatimentId; this.categorieBatimentCode = categorieBatimentCode; this.categorieBatimentStanding = categorieBatimentStanding; + this.nombrePiscine = nombrePiscine; + this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule; } } 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 889ed16..bf2e018 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 @@ -25,11 +25,23 @@ public class UniteLogementPaylaodWeb { private Long categorieBatimentId; private String categorieBatimentCode; private String categorieBatimentStanding; + private Long montantMensuelLocation; + private Long montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelCalcule; + private Long valeurUniteLogementEstime; + private Long valeurUniteLogementReel; + private Integer nombrePiscine; public UniteLogementPaylaodWeb(Long id, String nul, String numeroEtage, String code, Long batimentId, Float superficieAuSol, Float superficieLouee, String batimentNub, String observation, LocalDate dateConstruction, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale,Long enqueteUniteLogementCourantId, Long categorieBatimentId, String categorieBatimentCode, - String categorieBatimentStanding) { + String categorieBatimentStanding, + Long montantMensuelLocation, + Long montantLocatifAnnuelDeclare, + Long montantLocatifAnnuelCalcule, + Long valeurUniteLogementEstime, + Long valeurUniteLogementReel, + Integer nombrePiscine) { this.id = id; this.nul = nul; this.numeroEtage = numeroEtage; @@ -48,5 +60,11 @@ public class UniteLogementPaylaodWeb { this.categorieBatimentId = categorieBatimentId; this.categorieBatimentCode = categorieBatimentCode; this.categorieBatimentStanding = categorieBatimentStanding; + this.montantMensuelLocation = montantMensuelLocation; + this.montantLocatifAnnuelDeclare = montantLocatifAnnuelDeclare; + this.montantLocatifAnnuelCalcule = montantLocatifAnnuelCalcule; + this.valeurUniteLogementEstime = valeurUniteLogementEstime; + this.valeurUniteLogementReel = valeurUniteLogementReel; + this.nombrePiscine = nombrePiscine; } } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java index c53b802..5592c8f 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java @@ -17,9 +17,9 @@ public class EnqueteUniteLogementPayload { private int nbreHabitant; private int nbreMenage; private boolean enLocation; - private float montantMensuelLoyer; + private Long montantMensuelLocation; private int nbreMoisEnLocation; - private float montantLocatifAnnuelDeclare; + private Long montantLocatifAnnuelDeclare; private float surfaceLouee; private boolean sbee; private boolean soneb; 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 123e67c..3ae1609 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 @@ -33,6 +33,7 @@ public interface BatimentRepository extends JpaRepository { Long countByParcelle_Quartier_CodeLike(String codeQuartier); + @Query(""" SELECT new io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb( b.id, @@ -53,7 +54,13 @@ public interface BatimentRepository extends JpaRepository { eb.id, cb.id, cb.code, - cb.standing + cb.standing, + eb.nombrePiscine, + eb.montantLocatifAnnuelDeclare, + eb.montantLocatifAnnuelCalcule, + eb.valeurBatimentEstime, + eb.valeurBatimentReel, + eb.montantMensuelLocation ) FROM Batiment b JOIN b.parcelle p @@ -90,7 +97,13 @@ public interface BatimentRepository extends JpaRepository { eb.id, cb.id, cb.code, - cb.standing + cb.standing, + eb.nombrePiscine, + eb.montantLocatifAnnuelDeclare, + eb.montantLocatifAnnuelCalcule, + eb.valeurBatimentEstime, + eb.valeurBatimentReel, + eb.montantMensuelLocation ) FROM Batiment b JOIN b.parcelle p @@ -128,7 +141,13 @@ public interface BatimentRepository extends JpaRepository { eb.id, cb.id, cb.code, - cb.standing + cb.standing , + eb.nombrePiscine, + eb.montantLocatifAnnuelDeclare, + eb.montantLocatifAnnuelCalcule, + eb.valeurBatimentEstime, + eb.valeurBatimentReel, + eb.montantMensuelLocation ) FROM Batiment b JOIN b.parcelle p @@ -171,7 +190,13 @@ public interface BatimentRepository extends JpaRepository { eb.id, cb.id, cb.code, - cb.standing + cb.standing, + eb.nombrePiscine, + eb.montantLocatifAnnuelDeclare, + eb.montantLocatifAnnuelCalcule, + eb.valeurBatimentEstime, + eb.valeurBatimentReel, + eb.montantMensuelLocation ) FROM Batiment b JOIN b.parcelle p @@ -213,7 +238,13 @@ public interface BatimentRepository extends JpaRepository { eb.id, cb.id, cb.code, - cb.standing + cb.standing, + eb.nombrePiscine, + eb.montantLocatifAnnuelDeclare, + eb.montantLocatifAnnuelCalcule, + eb.valeurBatimentEstime, + eb.valeurBatimentReel, + eb.montantMensuelLocation ) FROM Batiment b JOIN b.parcelle p diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java index 39d1f3e..87c7898 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/EnqueteBatimentRepository.java @@ -103,7 +103,9 @@ public interface EnqueteBatimentRepository extends JpaRepository