Gestion parcelle geom
Some checks failed
CI - Build & Test (develop) / build-and-test (pull_request) Failing after 31s
Some checks failed
CI - Build & Test (develop) / build-and-test (pull_request) Failing after 31s
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 ;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,7 +62,10 @@ public interface BatimentRepository extends JpaRepository<Batiment, Long> {
|
||||
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<Batiment, Long> {
|
||||
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<Batiment, Long> {
|
||||
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<Batiment, Long> {
|
||||
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<Batiment, Long> {
|
||||
eb.valeurBatimentReel,
|
||||
eb.montantMensuelLocation,
|
||||
us.id,
|
||||
us.nom
|
||||
us.nom ,
|
||||
eb.montantLocatifAnnuelEstime,
|
||||
eb.valeurBatimentCalcule,
|
||||
eb.nbreUniteLogement
|
||||
)
|
||||
FROM Batiment b
|
||||
JOIN b.parcelle p
|
||||
|
||||
@@ -64,7 +64,9 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
|
||||
eul.valeurUniteLogementReel,
|
||||
eul.nombrePiscine,
|
||||
us.id,
|
||||
us.nom
|
||||
us.nom ,
|
||||
eul.montantLocatifAnnuelEstime,
|
||||
eul.valeurUniteLogementCalcule
|
||||
)
|
||||
FROM UniteLogement ul
|
||||
JOIN ul.batiment b
|
||||
@@ -111,7 +113,9 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
|
||||
eul.valeurUniteLogementReel,
|
||||
eul.nombrePiscine ,
|
||||
us.id,
|
||||
us.nom
|
||||
us.nom,
|
||||
eul.montantLocatifAnnuelEstime ,
|
||||
eul.valeurUniteLogementCalcule
|
||||
)
|
||||
FROM UniteLogement ul
|
||||
JOIN ul.batiment b
|
||||
@@ -159,7 +163,9 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
|
||||
eul.valeurUniteLogementReel,
|
||||
eul.nombrePiscine,
|
||||
us.id,
|
||||
us.nom
|
||||
us.nom ,
|
||||
eul.montantLocatifAnnuelEstime ,
|
||||
eul.valeurUniteLogementCalcule
|
||||
)
|
||||
FROM UniteLogement ul
|
||||
JOIN ul.batiment b
|
||||
@@ -212,7 +218,9 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
|
||||
eul.valeurUniteLogementReel,
|
||||
eul.nombrePiscine ,
|
||||
us.id,
|
||||
us.nom
|
||||
us.nom,
|
||||
eul.montantLocatifAnnuelEstime ,
|
||||
eul.valeurUniteLogementCalcule
|
||||
)
|
||||
FROM UniteLogement ul
|
||||
JOIN ul.batiment b
|
||||
@@ -262,7 +270,9 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
|
||||
eul.valeurUniteLogementReel,
|
||||
eul.nombrePiscine ,
|
||||
us.id,
|
||||
us.nom
|
||||
us.nom ,
|
||||
eul.montantLocatifAnnuelEstime ,
|
||||
eul.valeurUniteLogementCalcule
|
||||
)
|
||||
FROM UniteLogement ul
|
||||
JOIN ul.batiment b
|
||||
@@ -318,7 +328,9 @@ public interface UniteLogementRepository extends JpaRepository<UniteLogement, Lo
|
||||
eul.valeurUniteLogementReel,
|
||||
eul.nombrePiscine ,
|
||||
us.id,
|
||||
us.nom
|
||||
us.nom,
|
||||
eul.montantLocatifAnnuelEstime,
|
||||
eul.valeurUniteLogementCalcule
|
||||
)
|
||||
FROM UniteLogement ul
|
||||
JOIN ul.batiment b
|
||||
|
||||
Reference in New Issue
Block a user