develop #269

Merged
judaur2005 merged 2 commits from develop into main 2026-07-24 16:03:27 +00:00
3 changed files with 4 additions and 3 deletions
Showing only changes of commit 68eaf00e23 - Show all commits

View File

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

View File

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

View File

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