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