judaur2005/fiscad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #130

Merged
judaur2005 merged 3 commits from develop into main 2026-02-22 13:56:31 +00:00
Conversation 0 Commits 3 Files Changed 17 +207 -46
16 changed files with 207 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 933c209f67 - Show all commits

1
src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java
View File

@@ -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")

9
src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java
View File

@@ -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

2
src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java
View File

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

6
src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java
View File

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

6
src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java
View File

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

20
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java
View File

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

10
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java
View File

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

17
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java
View File

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

20
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java
View File

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

4
src/main/java/io/gmss/fiscad/paylaods/request/synchronisation/EnqueteUniteLogementPayload.java
View File

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

41
src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/BatimentRepository.java
View File

@@ -33,6 +33,7 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
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<Batiment, Long> {
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<Batiment, Long> {
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<Batiment, Long> {
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<Batiment, Long> {
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<Batiment, Long> {
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

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

@@ -103,7 +103,9 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
eb.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eb.nombrePiscine,
eb.montantLocatifAnnuelCalcule
)
FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b
@@ -162,7 +164,9 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
eb.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eb.nombrePiscine,
eb.montantLocatifAnnuelCalcule
)
FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b
@@ -221,7 +225,9 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
eb.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eb.nombrePiscine,
eb.montantLocatifAnnuelCalcule
)
FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b
@@ -286,7 +292,9 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
eb.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eb.nombrePiscine,
eb.montantLocatifAnnuelCalcule
)
FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b
@@ -348,7 +356,9 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
eb.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eb.nombrePiscine,
eb.montantLocatifAnnuelCalcule
)
FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b

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

@@ -60,7 +60,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.nbreMenage,
eul.enLocation,
eul.nbreMoisLocation,
eul.montantMensuelLoyer,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
@@ -96,8 +96,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.nombrePiscine,
eul.montantLocatifAnnuelCalcule
)
FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul
@@ -118,7 +119,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.nbreMenage,
eul.enLocation,
eul.nbreMoisLocation,
eul.montantMensuelLoyer,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
@@ -154,7 +155,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.nombrePiscine,
eul.montantLocatifAnnuelCalcule
)
FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul
@@ -176,7 +179,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.nbreMenage,
eul.enLocation,
eul.nbreMoisLocation,
eul.montantMensuelLoyer,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
@@ -212,7 +215,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.nombrePiscine,
eul.montantLocatifAnnuelCalcule
)
FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul
@@ -240,7 +245,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.nbreMenage,
eul.enLocation,
eul.nbreMoisLocation,
eul.montantMensuelLoyer,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
@@ -276,7 +281,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.nombrePiscine,
eul.montantLocatifAnnuelCalcule
)
FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul
@@ -300,7 +307,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.nbreMenage,
eul.enLocation,
eul.nbreMoisLocation,
eul.montantMensuelLoyer,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
@@ -336,7 +343,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.nombrePiscine,
eul.montantLocatifAnnuelCalcule
)
FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul
@@ -366,7 +375,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.nbreMenage,
eul.enLocation,
eul.nbreMoisLocation,
eul.montantMensuelLoyer,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
@@ -402,7 +411,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.nombrePiscine,
eul.montantLocatifAnnuelCalcule
)
FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul
@@ -426,7 +437,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.nbreMenage,
eul.enLocation,
eul.nbreMoisLocation,
eul.montantMensuelLoyer,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
@@ -462,7 +473,9 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
eul.representantNpi,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.nombrePiscine,
eul.montantLocatifAnnuelCalcule
)
FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul

48
src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/UniteLogementRepository.java
View File

@@ -56,7 +56,13 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
eul.id,
cb.id,
cb.code,
cb.standing
cb.standing ,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.montantLocatifAnnuelCalcule,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
eul.nombrePiscine
)
FROM UniteLogement ul
JOIN ul.batiment b
@@ -94,7 +100,13 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
eul.id,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.montantLocatifAnnuelCalcule,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
eul.nombrePiscine
)
FROM UniteLogement ul
JOIN ul.batiment b
@@ -133,7 +145,13 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
eul.id,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.montantLocatifAnnuelCalcule,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
eul.nombrePiscine
)
FROM UniteLogement ul
JOIN ul.batiment b
@@ -177,7 +195,13 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
eul.id,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.montantLocatifAnnuelCalcule,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
eul.nombrePiscine
)
FROM UniteLogement ul
JOIN ul.batiment b
@@ -218,7 +242,13 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
eul.id,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.montantLocatifAnnuelCalcule,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
eul.nombrePiscine
)
FROM UniteLogement ul
JOIN ul.batiment b
@@ -265,7 +295,13 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
eul.id,
cb.id,
cb.code,
cb.standing
cb.standing,
eul.montantMensuelLocation,
eul.montantLocatifAnnuelDeclare,
eul.montantLocatifAnnuelCalcule,
eul.valeurUniteLogementEstime,
eul.valeurUniteLogementReel,
eul.nombrePiscine
)
FROM UniteLogement ul
JOIN ul.batiment b

4
src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java
View File

@@ -640,7 +640,7 @@ public class EntityFromPayLoadService {
eul.setNbreMenage(enqueteUniteLogementPayloadWeb.getNbreMenage());
eul.setEnLocation(enqueteUniteLogementPayloadWeb.getEnLocation());
eul.setNbreMoisLocation(enqueteUniteLogementPayloadWeb.getNbreMoisLocation());
eul.setMontantMensuelLoyer(enqueteUniteLogementPayloadWeb.getMontantMensuelLoyer());
eul.setMontantMensuelLocation(enqueteUniteLogementPayloadWeb.getMontantMensuelLocation());
eul.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayloadWeb.getMontantLocatifAnnuelDeclare());
eul.setValeurUniteLogementEstime(enqueteUniteLogementPayloadWeb.getValeurUniteLogementEstime());
eul.setValeurUniteLogementReel(enqueteUniteLogementPayloadWeb.getValeurUniteLogementReel());
@@ -657,6 +657,7 @@ public class EntityFromPayLoadService {
eul.setRepresentantPrenom(enqueteUniteLogementPayloadWeb.getRepresentantPrenom());
eul.setRepresentantTel(enqueteUniteLogementPayloadWeb.getRepresentantTel());
eul.setRepresentantNpi(enqueteUniteLogementPayloadWeb.getRepresentantNpi());
eul.setNombrePiscine(enqueteUniteLogementPayloadWeb.getNombrePiscine());
eul.setStatutEnquete(StatutEnquete.EN_COURS);
return eul;
@@ -739,6 +740,7 @@ public class EntityFromPayLoadService {
enqueteBatiment.setRepresentantPrenom(enqueteBatimentPayloadWeb.getRepresentantPrenom());
enqueteBatiment.setRepresentantTel(enqueteBatimentPayloadWeb.getRepresentantTel());
enqueteBatiment.setRepresentantNpi(enqueteBatimentPayloadWeb.getRepresentantNpi());
enqueteBatiment.setNombrePiscine(enqueteBatimentPayloadWeb.getNombrePiscine());
enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS);
return enqueteBatiment;
}

2
src/main/java/io/gmss/fiscad/service/worker/EnqueteUniteLogementAsyncWorker.java
View File

@@ -125,7 +125,7 @@ public class EnqueteUniteLogementAsyncWorker {
enqueteUniteLogement.setNbreHabitant(enqueteUniteLogementPayload.getNbreHabitant());
enqueteUniteLogement.setNbreMenage(enqueteUniteLogementPayload.getNbreMenage());
enqueteUniteLogement.setEnLocation(enqueteUniteLogementPayload.isEnLocation());
enqueteUniteLogement.setMontantMensuelLoyer(enqueteUniteLogementPayload.getMontantMensuelLoyer());
enqueteUniteLogement.setMontantMensuelLocation(enqueteUniteLogementPayload.getMontantMensuelLocation());
enqueteUniteLogement.setNbreMoisLocation(enqueteUniteLogementPayload.getNbreMoisEnLocation());
enqueteUniteLogement.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayload.getMontantLocatifAnnuelDeclare());
enqueteUniteLogement.setSuperficieLouee(enqueteUniteLogementPayload.getSurfaceLouee());