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

develop #269

Merged
judaur2005 merged 2 commits from develop into main 2026-07-24 16:03:27 +00:00
Conversation 0 Commits 2 Files Changed 3 +4 -3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,14 +106,14 @@ public class Enquete extends BaseEntity implements Serializable {
// @JsonIgnore // @JsonIgnore
@ManyToOne @ManyToOne
@JoinColumn(name = "proprietaire_id") @JoinColumn(name = "personne_id")
private Personne personne ; private Personne personne ;
@JsonIgnore @JsonIgnore
@ManyToOne @ManyToOne
private ZoneRfu zoneRfu; private ZoneRfu zoneRfu;
private String autreNumeroTitreFoncier; private String autreNumeroTitreFoncier;
private Long personneId; //private Long personneId;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
private StatutEnquete statutEnquete; private StatutEnquete statutEnquete;
@JsonFormat(pattern = "dd-MM-yyyy") @JsonFormat(pattern = "dd-MM-yyyy")

1
src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java
View File

@@ -163,6 +163,7 @@ public class EnqueteServiceImpl implements EnqueteService {
Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb); Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
////enregistrement de l'enquete ////enregistrement de l'enquete
System.out.println(enquete);
enquete=enqueteRepository.save(enquete); enquete=enqueteRepository.save(enquete);
if(enquete.getEdeclarationPropriete()!=null) { if(enquete.getEdeclarationPropriete()!=null) {

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

@@ -194,7 +194,7 @@ public class EnqueteAsyncWorker {
enquete.setNbrePiscine(enquetePayLoad.getNbrePiscine()); enquete.setNbrePiscine(enquetePayLoad.getNbrePiscine());
enquete.setDateDebutExcemption(enquetePayLoad.getDateDebutExcemption()); enquete.setDateDebutExcemption(enquetePayLoad.getDateDebutExcemption());
enquete.setDateFinExcemption(enquetePayLoad.getDateFinExcemption()); enquete.setDateFinExcemption(enquetePayLoad.getDateFinExcemption());
enquete.setPersonneId(enquetePayLoad.getPersonneId()); //enquete.setPersonneId(enquetePayLoad.getPersonneId());
enquete.setAutreNumeroTitreFoncier(enquete.getAutreNumeroTitreFoncier()); enquete.setAutreNumeroTitreFoncier(enquete.getAutreNumeroTitreFoncier());
return enquete; return enquete;
} }