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

Merge pull request 'develop' (#116) from develop into main
All checks were successful
CD - Deploy on main / deploy (push) Successful in 51s
Details

Browse Source 
Reviewed-on: #116
This commit was merged in pull request #116.
This commit is contained in:
AKAKPO Aurince
2026-02-19 12:01:26 +00:00
parent 2b4adc0db2 122dfcbead
commit f7e3c118e2
28 changed files with 270 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java
View File

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

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

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

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

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

2
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ArrondissementPaylaodWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/AvoirFonctionPaylaodWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java
View File

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

2
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CommunePaylaodWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DepartementPaylaodWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java
View File

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

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

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

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

@@ -4,10 +4,11 @@ import io.gmss.fiscad.enums.StatutEnquete;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
import java.util.List;
@NoArgsConstructor
@Data
public class EnquetePayLoadWeb {
private Long id;
@@ -59,9 +60,17 @@ public class EnquetePayLoadWeb {
private Integer exerviceAnnee;
private Long modeAcquisitionId;
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,
Long modeAcquisitionId,String modeAcquisitionLibelle) {
Long modeAcquisitionId,String modeAcquisitionLibelle,
String representantNom,
String representantPrenom,
String representantTel,
String representantNpi) {
this.id = id;
this.dateEnquete = dateEnquete;
this.dateFinalisation = dateFinalisation;
@@ -106,5 +115,9 @@ public class EnquetePayLoadWeb {
this.exerviceAnnee = exerviceAnnee;
this.modeAcquisitionId = modeAcquisitionId;
this.modeAcquisitionLibelle = modeAcquisitionLibelle;
this.representantNom = representantNom;
this.representantTel = representantTel;
this.representantPrenom = representantPrenom;
this.representantNpi = representantNpi;
}
}

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

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/FonctionPaylaodWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ProfilePaylaodWeb.java
View File

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

2
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/QuartierPaylaodWeb.java
View File

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

3
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurDecoupagePaylaodWeb.java
View File

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

2
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SecteurPaylaodWeb.java
View File

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

2
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/SectionPaylaodWeb.java
View File

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

2
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/StructurePaylaodWeb.java
View File

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

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

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

4
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java
View File

@@ -3,7 +3,7 @@ package io.gmss.fiscad.paylaods.request.crudweb;
import jakarta.persistence.Transient;
import lombok.Data;
import lombok.NoArgsConstructor;
@NoArgsConstructor
@Data
public class UploadPayLoadWeb {
private Long id;
@@ -30,8 +30,6 @@ public class UploadPayLoadWeb {
private long size;
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,
String fileName,String originalFileName) {

160
src/main/java/io/gmss/fiscad/persistence/repositories/infocad/metier/EnqueteRepository.java
View File

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

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

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

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

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

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

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