develop #116

Merged
judaur2005 merged 4 commits from develop into main 2026-02-19 12:01:27 +00:00
28 changed files with 270 additions and 100 deletions
Showing only changes of commit 122dfcbead - Show all commits

View File

@@ -197,6 +197,11 @@ public class Enquete extends BaseEntity implements Serializable {
@JsonFormat(pattern = "dd-MM-yyyy") @JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateFinExcemption; private LocalDate dateFinExcemption;
private String representantNom;
private String representantPrenom;
private String representantTel;
private String representantNpi;
// //
// @JsonIgnore // @JsonIgnore
// @OneToMany(mappedBy = "enquete") // @OneToMany(mappedBy = "enquete")

View File

@@ -96,6 +96,11 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
private Long batimentExternalKey; private Long batimentExternalKey;
private Long nbreEtage; private Long nbreEtage;
private String representantNom;
private String representantPrenom;
private String representantTel;
private String representantNpi;
// @JsonIgnore // @JsonIgnore
// @ManyToOne(fetch = FetchType.LAZY) // @ManyToOne(fetch = FetchType.LAZY)
// @JsonBackReference // @JsonBackReference

View File

@@ -64,16 +64,22 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
@JsonFormat(pattern = "dd-MM-yyyy") @JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateFinExemption; private LocalDate dateFinExemption;
@JsonFormat(pattern = "dd-MM-yyyy") @JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateEnquete; private LocalDate dateEnquete;
private String observation; private String observation;
private Long uniteLogementExternalKey; private Long uniteLogementExternalKey;
private String representantNom;
private String representantPrenom;
private String representantTel;
private String representantNpi;
@ManyToOne @ManyToOne
private Exercice exercice; private Exercice exercice;
// @JsonIgnore // @JsonIgnore
// @ManyToOne(fetch = FetchType.LAZY) // @ManyToOne(fetch = FetchType.LAZY)
// @JsonBackReference // @JsonBackReference

View File

@@ -1,7 +1,9 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
public class ArrondissementPaylaodWeb { public class ArrondissementPaylaodWeb {
private Long id; private Long id;

View File

@@ -7,9 +7,10 @@ import io.gmss.fiscad.enums.Titre;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class AvoirFonctionPaylaodWeb { public class AvoirFonctionPaylaodWeb {
private Long id; private Long id;

View File

@@ -1,9 +1,10 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class CaracteristiqueBatimentPayloadWeb { public class CaracteristiqueBatimentPayloadWeb {
private Long id; private Long id;

View File

@@ -1,9 +1,10 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class CaracteristiqueParcellePayloadWeb { public class CaracteristiqueParcellePayloadWeb {
private Long id; private Long id;

View File

@@ -1,9 +1,10 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class CaracteristiqueUniteLogementPayloadWeb { public class CaracteristiqueUniteLogementPayloadWeb {
private Long id; private Long id;

View File

@@ -1,7 +1,9 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
public class CommunePaylaodWeb { public class CommunePaylaodWeb {
private Long id; private Long id;

View File

@@ -1,9 +1,10 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class DepartementPaylaodWeb { public class DepartementPaylaodWeb {
private Long id; private Long id;

View File

@@ -1,10 +1,11 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@NoArgsConstructor
@Data @Data
public class EnqueteActivitePayLoadWeb { public class EnqueteActivitePayLoadWeb {
private Long id; private Long id;

View File

@@ -7,10 +7,11 @@ import io.gmss.fiscad.enums.StatutEnquete;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@NoArgsConstructor
@Data @Data
public class EnqueteBatimentPayloadWeb { public class EnqueteBatimentPayloadWeb {
private Long id; private Long id;
@@ -55,11 +56,19 @@ public class EnqueteBatimentPayloadWeb {
private StatutEnquete statutEnquete; private StatutEnquete statutEnquete;
private Long exerciceId; private Long exerciceId;
private Integer exerciceAnnee; private Integer exerciceAnnee;
private String representantNom;
private String representantPrenom;
private String representantTel;
private String representantNpi;
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, 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, StatutEnquete statutEnquete,
Long exerciceId, Long exerciceId,
Integer exerciceAnnee) { Integer exerciceAnnee,
String representantNom,
String representantPrenom,
String representantTel,
String representantNpi) {
this.id = id; this.id = id;
this.observation = observation; this.observation = observation;
this.autreMenuisierie = autreMenuisierie; this.autreMenuisierie = autreMenuisierie;
@@ -96,5 +105,9 @@ public class EnqueteBatimentPayloadWeb {
this.statutEnquete = statutEnquete; this.statutEnquete = statutEnquete;
this.exerciceId = exerciceId; this.exerciceId = exerciceId;
this.exerciceAnnee = exerciceAnnee; this.exerciceAnnee = exerciceAnnee;
this.representantNom = representantNom;
this.representantPrenom = representantPrenom;
this.representantTel = representantTel;
this.representantNpi = representantNpi;
} }
} }

View File

@@ -4,10 +4,11 @@ import io.gmss.fiscad.enums.StatutEnquete;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@NoArgsConstructor
@Data @Data
public class EnquetePayLoadWeb { public class EnquetePayLoadWeb {
private Long id; private Long id;
@@ -59,9 +60,17 @@ public class EnquetePayLoadWeb {
private Integer exerviceAnnee; private Integer exerviceAnnee;
private Long modeAcquisitionId; private Long modeAcquisitionId;
private String modeAcquisitionLibelle; private String modeAcquisitionLibelle;
private String representantNom;
private String representantPrenom;
private String representantTel;
private String representantNpi;
public EnquetePayLoadWeb(Long id, LocalDate dateEnquete, LocalDate dateFinalisation, Boolean litige, StatutEnquete statutEnquete, String descriptionMotifRejet, String observation, String numeroTitreFoncier, LocalDate dateTitreFoncier, String numEntreeParcelle, String numRue, String nomRue, Float precision, Integer nbreCoProprietaire, Integer nbreIndivisiaire, String autreAdresse, Float superficie, Integer nbreBatiment, Integer nbrePiscine, LocalDate dateDebutExemption, LocalDate dateFinExemption, String autreNumeroTitreFoncier, Long montantMensuelleLocation, Long montantAnnuelleLocation, Long valeurParcelleEstime, Long valeurParcelleReel, Long zoneRfuId, String zoneRfuNom, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom,Long parcelleId, String parcelleNup, String parcelleQ, String parcelleI, String parcelleP, Long exerviceId, Integer exerviceAnnee, public EnquetePayLoadWeb(Long id, LocalDate dateEnquete, LocalDate dateFinalisation, Boolean litige, StatutEnquete statutEnquete, String descriptionMotifRejet, String observation, String numeroTitreFoncier, LocalDate dateTitreFoncier, String numEntreeParcelle, String numRue, String nomRue, Float precision, Integer nbreCoProprietaire, Integer nbreIndivisiaire, String autreAdresse, Float superficie, Integer nbreBatiment, Integer nbrePiscine, LocalDate dateDebutExemption, LocalDate dateFinExemption, String autreNumeroTitreFoncier, Long montantMensuelleLocation, Long montantAnnuelleLocation, Long valeurParcelleEstime, Long valeurParcelleReel, Long zoneRfuId, String zoneRfuNom, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Long enqueteurId, String enqueteurNom, String enqueteurPrenom,Long parcelleId, String parcelleNup, String parcelleQ, String parcelleI, String parcelleP, Long exerviceId, Integer exerviceAnnee,
Long modeAcquisitionId,String modeAcquisitionLibelle) { Long modeAcquisitionId,String modeAcquisitionLibelle,
String representantNom,
String representantPrenom,
String representantTel,
String representantNpi) {
this.id = id; this.id = id;
this.dateEnquete = dateEnquete; this.dateEnquete = dateEnquete;
this.dateFinalisation = dateFinalisation; this.dateFinalisation = dateFinalisation;
@@ -106,5 +115,9 @@ public class EnquetePayLoadWeb {
this.exerviceAnnee = exerviceAnnee; this.exerviceAnnee = exerviceAnnee;
this.modeAcquisitionId = modeAcquisitionId; this.modeAcquisitionId = modeAcquisitionId;
this.modeAcquisitionLibelle = modeAcquisitionLibelle; this.modeAcquisitionLibelle = modeAcquisitionLibelle;
this.representantNom = representantNom;
this.representantTel = representantTel;
this.representantPrenom = representantPrenom;
this.representantNpi = representantNpi;
} }
} }

View File

@@ -4,10 +4,11 @@ import io.gmss.fiscad.enums.StatutEnquete;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@NoArgsConstructor
@Data @Data
public class EnqueteUniteLogementPayloadWeb { public class EnqueteUniteLogementPayloadWeb {
private Long id; private Long id;
@@ -44,9 +45,18 @@ public class EnqueteUniteLogementPayloadWeb {
private Integer exerciceAnnee; private Integer exerciceAnnee;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private StatutEnquete statutEnquete; private StatutEnquete statutEnquete;
private String representantNom;
private String representantPrenom;
private String representantTel;
private String representantNpi;
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, 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) { StatutEnquete statutEnquete,
String representantNom,
String representantPrenom,
String representantTel,
String representantNpi
) {
this.id = id; this.id = id;
this.observation = observation; this.observation = observation;
this.nbrePiece = nbrePiece; this.nbrePiece = nbrePiece;
@@ -80,5 +90,9 @@ public class EnqueteUniteLogementPayloadWeb {
this.exerciceId = exerciceId; this.exerciceId = exerciceId;
this.exerciceAnnee = exerciceAnnee; this.exerciceAnnee = exerciceAnnee;
this.statutEnquete = statutEnquete; this.statutEnquete = statutEnquete;
this.representantNom = representantNom;
this.representantPrenom = representantPrenom;
this.representantTel = representantTel;
this.representantNpi = representantNpi;
} }
} }

View File

@@ -9,10 +9,11 @@ import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class FonctionPaylaodWeb { public class FonctionPaylaodWeb {
private Long id; private Long id;

View File

@@ -1,10 +1,11 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.List; import java.util.List;
@NoArgsConstructor
@Data @Data
public class PiecePayLoadWeb { public class PiecePayLoadWeb {
private Long id; private Long id;

View File

@@ -8,10 +8,11 @@ import io.gmss.fiscad.enums.Titre;
import io.gmss.fiscad.enums.UserProfile; import io.gmss.fiscad.enums.UserProfile;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Set; import java.util.Set;
@NoArgsConstructor
@Data @Data
public class ProfilePaylaodWeb { public class ProfilePaylaodWeb {
private Long id; private Long id;

View File

@@ -1,7 +1,9 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
public class QuartierPaylaodWeb { public class QuartierPaylaodWeb {
private Long id; private Long id;

View File

@@ -12,9 +12,10 @@ import jakarta.persistence.GenerationType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class SecteurDecoupagePaylaodWeb { public class SecteurDecoupagePaylaodWeb {
private Long id; private Long id;

View File

@@ -4,7 +4,9 @@ import io.gmss.fiscad.enums.UserProfile;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
public class SecteurPaylaodWeb { public class SecteurPaylaodWeb {
private Long id; private Long id;

View File

@@ -4,7 +4,9 @@ import io.gmss.fiscad.enums.UserProfile;
import jakarta.persistence.EnumType; import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated; import jakarta.persistence.Enumerated;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
public class SectionPaylaodWeb { public class SectionPaylaodWeb {
private Long id; private Long id;

View File

@@ -4,7 +4,9 @@ import io.gmss.fiscad.entities.decoupage.Commune;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
public class StructurePaylaodWeb { public class StructurePaylaodWeb {
private Long id; private Long id;

View File

@@ -1,9 +1,10 @@
package io.gmss.fiscad.paylaods.request.crudweb; package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate; import java.time.LocalDate;
@NoArgsConstructor
@Data @Data
public class UniteLogementPaylaodWeb { public class UniteLogementPaylaodWeb {
private Long id; private Long id;

View File

@@ -3,7 +3,7 @@ package io.gmss.fiscad.paylaods.request.crudweb;
import jakarta.persistence.Transient; import jakarta.persistence.Transient;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data @Data
public class UploadPayLoadWeb { public class UploadPayLoadWeb {
private Long id; private Long id;
@@ -30,8 +30,6 @@ public class UploadPayLoadWeb {
private long size; private long size;
private String mimeType; private String mimeType;
public UploadPayLoadWeb() {
}
public UploadPayLoadWeb(Long id, Long pieceId, String name, String filePath, Long enqueteBatimentId, Long personneId, Long enqueteUniteLogementId, Long declarationNcId, String reference, String description, String rename, public UploadPayLoadWeb(Long id, Long pieceId, String name, String filePath, Long enqueteBatimentId, Long personneId, Long enqueteUniteLogementId, Long declarationNcId, String reference, String description, String rename,
String fileName,String originalFileName) { String fileName,String originalFileName) {

View File

@@ -278,7 +278,11 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
ex.id, ex.id,
ex.annee, ex.annee,
ma.id, ma.id,
ma.libelle ma.libelle,
e.representantNom,
e.representantPrenom,
e.representantTel,
e.representantNpi
) )
FROM Enquete e FROM Enquete e
LEFT JOIN e.zoneRfu zr LEFT JOIN e.zoneRfu zr
@@ -335,7 +339,11 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
ex.id, ex.id,
ex.annee, ex.annee,
ma.id, ma.id,
ma.libelle ma.libelle,
e.representantNom,
e.representantPrenom,
e.representantTel,
e.representantNpi
) )
FROM Enquete e FROM Enquete e
LEFT JOIN e.zoneRfu zr LEFT JOIN e.zoneRfu zr
@@ -350,66 +358,70 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
@Query( @Query(
value = """ value = """
SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb( SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb(
e.id, e.id,
e.dateEnquete, e.dateEnquete,
e.dateFinalisation, e.dateFinalisation,
e.litige, e.litige,
e.statutEnquete, e.statutEnquete,
e.descriptionMotifRejet, e.descriptionMotifRejet,
e.observationParticuliere, e.observationParticuliere,
pa.numeroTitreFoncier, pa.numeroTitreFoncier,
pa.dateTitreFoncier, pa.dateTitreFoncier,
e.numEntreeParcelle, e.numEntreeParcelle,
e.numRue, e.numRue,
e.nomRue, e.nomRue,
e.precision, e.precision,
e.nbreCoProprietaire, e.nbreCoProprietaire,
e.nbreIndivisiaire, e.nbreIndivisiaire,
e.autreAdresse, e.autreAdresse,
e.superficie, e.superficie,
e.nbreBatiment, e.nbreBatiment,
e.nbrePiscine, e.nbrePiscine,
e.dateDebutExemption, e.dateDebutExemption,
e.dateFinExemption, e.dateFinExemption,
pa.autreNumeroTitreFoncier, pa.autreNumeroTitreFoncier,
e.montantMensuelleLocation, e.montantMensuelleLocation,
e.montantAnnuelleLocation, e.montantAnnuelleLocation,
e.valeurParcelleEstime, e.valeurParcelleEstime,
e.valeurParcelleReel, e.valeurParcelleReel,
zr.id, zr.id,
zr.nom, zr.nom,
p.id, p.id,
p.nom, p.nom,
p.prenom, p.prenom,
p.raisonSociale, p.raisonSociale,
u.id, u.id,
u.nom, u.nom,
u.prenom, u.prenom,
pa.id, pa.id,
pa.nup, pa.nup,
pa.q, pa.q,
pa.i, pa.i,
pa.p, pa.p,
ex.id, ex.id,
ex.annee, ex.annee,
ma.id, ma.id,
ma.libelle ma.libelle,
) e.representantNom,
FROM Enquete e e.representantPrenom,
LEFT JOIN e.zoneRfu zr e.representantTel,
LEFT JOIN e.personne p e.representantNpi
LEFT JOIN e.user u )
LEFT JOIN e.parcelle pa FROM Enquete e
LEFT JOIN e.exercice ex LEFT JOIN e.zoneRfu zr
LEFT JOIN e.modeAcquisition ma LEFT JOIN e.personne p
""", LEFT JOIN e.user u
countQuery = """ LEFT JOIN e.parcelle pa
SELECT COUNT(e) LEFT JOIN e.exercice ex
FROM Enquete e LEFT JOIN e.modeAcquisition ma
""" """,
) countQuery = """
Page<EnquetePayLoadWeb> findAllEnquetesToDtoPageable(Pageable pageable); SELECT COUNT(e)
FROM Enquete e
"""
)
Page<EnquetePayLoadWeb> findAllEnquetesToDtoPageable(Pageable pageable);
@Query(""" @Query("""
SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb( SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb(
@@ -456,7 +468,11 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
ex.id, ex.id,
ex.annee, ex.annee,
ma.id, ma.id,
ma.libelle ma.libelle,
e.representantNom,
e.representantPrenom,
e.representantTel,
e.representantNpi
) )
FROM Enquete e FROM Enquete e
LEFT JOIN e.zoneRfu zr LEFT JOIN e.zoneRfu zr
@@ -518,7 +534,11 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
ex.id, ex.id,
ex.annee, ex.annee,
ma.id, ma.id,
ma.libelle ma.libelle,
e.representantNom,
e.representantPrenom,
e.representantTel,
e.representantNpi
) )
FROM Enquete e FROM Enquete e
LEFT JOIN e.zoneRfu zr LEFT JOIN e.zoneRfu zr
@@ -586,7 +606,11 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
ex.id, ex.id,
ex.annee, ex.annee,
ma.id, ma.id,
ma.libelle ma.libelle,
e.representantNom,
e.representantPrenom,
e.representantTel,
e.representantNpi
) )
FROM Enquete e FROM Enquete e
LEFT JOIN e.zoneRfu zr LEFT JOIN e.zoneRfu zr
@@ -647,7 +671,11 @@ public interface EnqueteRepository extends JpaRepository<Enquete, Long> {
ex.id, ex.id,
ex.annee, ex.annee,
ma.id, ma.id,
ma.libelle ma.libelle,
e.representantNom,
e.representantPrenom,
e.representantTel,
e.representantNpi
) )
FROM Enquete e FROM Enquete e
LEFT JOIN e.zoneRfu zr LEFT JOIN e.zoneRfu zr

View File

@@ -96,7 +96,11 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
u.prenom, u.prenom,
eb.statutEnquete, eb.statutEnquete,
ex.id, ex.id,
ex.annee ex.annee,
eb.representantNom,
eb.representantPrenom,
eb.representantTel,
eb.representantNpi
) )
FROM EnqueteBatiment eb FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b LEFT JOIN eb.batiment b
@@ -147,7 +151,11 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
u.prenom, u.prenom,
eb.statutEnquete, eb.statutEnquete,
ex.id, ex.id,
ex.annee ex.annee,
eb.representantNom,
eb.representantPrenom,
eb.representantTel,
eb.representantNpi
) )
FROM EnqueteBatiment eb FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b LEFT JOIN eb.batiment b
@@ -198,7 +206,11 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
u.prenom, u.prenom,
eb.statutEnquete, eb.statutEnquete,
ex.id, ex.id,
ex.annee ex.annee,
eb.representantNom,
eb.representantPrenom,
eb.representantTel,
eb.representantNpi
) )
FROM EnqueteBatiment eb FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b LEFT JOIN eb.batiment b
@@ -255,7 +267,11 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
u.prenom, u.prenom,
eb.statutEnquete, eb.statutEnquete,
ex.id, ex.id,
ex.annee ex.annee,
eb.representantNom,
eb.representantPrenom,
eb.representantTel,
eb.representantNpi
) )
FROM EnqueteBatiment eb FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b LEFT JOIN eb.batiment b
@@ -309,7 +325,11 @@ public interface EnqueteBatimentRepository extends JpaRepository<EnqueteBatiment
u.prenom, u.prenom,
eb.statutEnquete, eb.statutEnquete,
ex.id, ex.id,
ex.annee ex.annee,
eb.representantNom,
eb.representantPrenom,
eb.representantTel,
eb.representantNpi
) )
FROM EnqueteBatiment eb FROM EnqueteBatiment eb
LEFT JOIN eb.batiment b LEFT JOIN eb.batiment b

View File

@@ -89,7 +89,12 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
ex.id, ex.id,
ex.annee, ex.annee,
eul.statutEnquete eul.statutEnquete,
eul.representantNom,
eul.representantPrenom,
eul.representantTel,
eul.representantNpi
) )
FROM EnqueteUniteLogement eul FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul LEFT JOIN eul.uniteLogement ul
@@ -99,7 +104,7 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
WHERE eul.id = :enqueteUniteLogementId WHERE eul.id = :enqueteUniteLogementId
""") """)
Optional<EnqueteUniteLogementPayloadWeb> findEnqueteUniteLogementToDto(@Param("enqueteUniteLogementId") Long enqueteUniteLogementId); Optional<EnqueteUniteLogementPayloadWeb> findEnqueteUniteLogementToDto(@Param("enqueteUniteLogementId") Long enqueteUniteLogementId);
// void deleteAllByEnquete_id(Long id) ; // void deleteAllByEnquete_id(Long id) ;
@Query(""" @Query("""
SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb( SELECT new io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb(
eul.id, eul.id,
@@ -138,7 +143,11 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
ex.id, ex.id,
ex.annee, ex.annee,
eul.statutEnquete eul.statutEnquete,
eul.representantNom,
eul.representantPrenom,
eul.representantTel,
eul.representantNpi
) )
FROM EnqueteUniteLogement eul FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul LEFT JOIN eul.uniteLogement ul
@@ -188,7 +197,11 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
ex.id, ex.id,
ex.annee, ex.annee,
eul.statutEnquete eul.statutEnquete,
eul.representantNom,
eul.representantPrenom,
eul.representantTel,
eul.representantNpi
) )
FROM EnqueteUniteLogement eul FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul LEFT JOIN eul.uniteLogement ul
@@ -244,7 +257,11 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
ex.id, ex.id,
ex.annee, ex.annee,
eul.statutEnquete eul.statutEnquete,
eul.representantNom,
eul.representantPrenom,
eul.representantTel,
eul.representantNpi
) )
FROM EnqueteUniteLogement eul FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul LEFT JOIN eul.uniteLogement ul
@@ -296,7 +313,11 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
ex.id, ex.id,
ex.annee, ex.annee,
eul.statutEnquete eul.statutEnquete,
eul.representantNom,
eul.representantPrenom,
eul.representantTel,
eul.representantNpi
) )
FROM EnqueteUniteLogement eul FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul LEFT JOIN eul.uniteLogement ul
@@ -354,7 +375,11 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
ex.id, ex.id,
ex.annee, ex.annee,
eul.statutEnquete eul.statutEnquete,
eul.representantNom,
eul.representantPrenom,
eul.representantTel,
eul.representantNpi
) )
FROM EnqueteUniteLogement eul FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul LEFT JOIN eul.uniteLogement ul
@@ -406,7 +431,11 @@ public interface EnqueteUniteLogementRepository extends JpaRepository<EnqueteUni
ex.id, ex.id,
ex.annee, ex.annee,
eul.statutEnquete eul.statutEnquete,
eul.representantNom,
eul.representantPrenom,
eul.representantTel,
eul.representantNpi
) )
FROM EnqueteUniteLogement eul FROM EnqueteUniteLogement eul
LEFT JOIN eul.uniteLogement ul LEFT JOIN eul.uniteLogement ul

View File

@@ -269,6 +269,8 @@ public class EntityFromPayLoadService {
batiment.setId(batimentPaylaodWeb.getId()); batiment.setId(batimentPaylaodWeb.getId());
batiment.setCode(batimentPaylaodWeb.getCode()); batiment.setCode(batimentPaylaodWeb.getCode());
batiment.setNub(batimentPaylaodWeb.getNub()); batiment.setNub(batimentPaylaodWeb.getNub());
batiment.setSuperficieAuSol(batimentPaylaodWeb.getSuperficieSol());
batiment.setSuperficieLouee(batimentPaylaodWeb.getSuperficieLouee());
batiment.setDateConstruction(batimentPaylaodWeb.getDateConstruction()); batiment.setDateConstruction(batimentPaylaodWeb.getDateConstruction());
return batiment ; return batiment ;
@@ -370,6 +372,8 @@ public class EntityFromPayLoadService {
uniteLogement.setId(uniteLogementPaylaodWeb.getId()); uniteLogement.setId(uniteLogementPaylaodWeb.getId());
uniteLogement.setCode(uniteLogementPaylaodWeb.getCode()); uniteLogement.setCode(uniteLogementPaylaodWeb.getCode());
uniteLogement.setNul(uniteLogementPaylaodWeb.getNul()); uniteLogement.setNul(uniteLogementPaylaodWeb.getNul());
uniteLogement.setSuperficieAuSol(uniteLogementPaylaodWeb.getSuperficieSol());
uniteLogement.setSuperficieLouee(uniteLogementPaylaodWeb.getSuperficieLouee());
uniteLogement.setDateConstruction(uniteLogementPaylaodWeb.getDateConstruction()); uniteLogement.setDateConstruction(uniteLogementPaylaodWeb.getDateConstruction());
uniteLogement.setNumeroEtage(uniteLogementPaylaodWeb.getNumeroEtage()); uniteLogement.setNumeroEtage(uniteLogementPaylaodWeb.getNumeroEtage());
return uniteLogement ; return uniteLogement ;
@@ -631,6 +635,10 @@ public class EntityFromPayLoadService {
eul.setNumCompteurSoneb(enqueteUniteLogementPayloadWeb.getNumCompteurSoneb()); eul.setNumCompteurSoneb(enqueteUniteLogementPayloadWeb.getNumCompteurSoneb());
eul.setDateDebutExemption(enqueteUniteLogementPayloadWeb.getDateDebutExemption()); eul.setDateDebutExemption(enqueteUniteLogementPayloadWeb.getDateDebutExemption());
eul.setDateFinExemption(enqueteUniteLogementPayloadWeb.getDateFinExemption()); eul.setDateFinExemption(enqueteUniteLogementPayloadWeb.getDateFinExemption());
eul.setRepresentantNom(enqueteUniteLogementPayloadWeb.getRepresentantNom());
eul.setRepresentantPrenom(enqueteUniteLogementPayloadWeb.getRepresentantPrenom());
eul.setRepresentantTel(enqueteUniteLogementPayloadWeb.getRepresentantTel());
eul.setRepresentantNpi(enqueteUniteLogementPayloadWeb.getRepresentantNpi());
eul.setStatutEnquete(StatutEnquete.EN_COURS); eul.setStatutEnquete(StatutEnquete.EN_COURS);
return eul; return eul;
@@ -703,6 +711,10 @@ public class EntityFromPayLoadService {
enqueteBatiment.setAutreCaracteristiquePhysique(enqueteBatimentPayloadWeb.getAutreCaracteristiquePhysique()); enqueteBatiment.setAutreCaracteristiquePhysique(enqueteBatimentPayloadWeb.getAutreCaracteristiquePhysique());
enqueteBatiment.setNbreEtage(enqueteBatimentPayloadWeb.getNbreEtage()); enqueteBatiment.setNbreEtage(enqueteBatimentPayloadWeb.getNbreEtage());
enqueteBatiment.setRepresentantNom(enqueteBatimentPayloadWeb.getRepresentantNom());
enqueteBatiment.setRepresentantPrenom(enqueteBatimentPayloadWeb.getRepresentantPrenom());
enqueteBatiment.setRepresentantTel(enqueteBatimentPayloadWeb.getRepresentantTel());
enqueteBatiment.setRepresentantNpi(enqueteBatimentPayloadWeb.getRepresentantNpi());
enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS); enqueteBatiment.setStatutEnquete(StatutEnquete.EN_COURS);
return enqueteBatiment; return enqueteBatiment;
} }
@@ -780,6 +792,10 @@ public class EntityFromPayLoadService {
enquete.setMontantAnnuelleLocation(enquetePayLoadWeb.getMontantAnnuelleLocation()); enquete.setMontantAnnuelleLocation(enquetePayLoadWeb.getMontantAnnuelleLocation());
enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime()); enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime());
enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel()); enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel());
enquete.setRepresentantNpi(enquetePayLoadWeb.getRepresentantNpi());
enquete.setRepresentantNom(enquetePayLoadWeb.getRepresentantNom());
enquete.setRepresentantPrenom(enquetePayLoadWeb.getRepresentantPrenom());
enquete.setRepresentantTel(enquetePayLoadWeb.getRepresentantTel());
enquete.setSynchronise(true); enquete.setSynchronise(true);
return enquete; return enquete;