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

develop #299

Merged
judaur2005 merged 2 commits from develop into main 2026-08-03 08:16:11 +00:00
Conversation 0 Commits 2 Files Changed 3 +9 -8
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1805ea92e1 - Show all commits

4
src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java
View File

@@ -267,7 +267,6 @@ public class PersonneServiceImpl implements PersonneService {
} }
if(request.getNpi()!=null && !request.getNpi().equals("")){ if(request.getNpi()!=null && !request.getNpi().equals("")){
List<PersonnePayLoadWeb> personnePayLoadWebs = personneRepository.findAllPersonneByNpiToDto(request.getNpi()); List<PersonnePayLoadWeb> personnePayLoadWebs = personneRepository.findAllPersonneByNpiToDto(request.getNpi());
if(!personnePayLoadWebs.isEmpty()) if(!personnePayLoadWebs.isEmpty())
return personnePayLoadWebs; return personnePayLoadWebs;
@@ -277,13 +276,14 @@ public class PersonneServiceImpl implements PersonneService {
result = recherchePersonneLocal(request); result = recherchePersonneLocal(request);
if (result != null && !result.isEmpty()) { if (result != null && ! result.isEmpty()) {
return result; return result;
} }
// Conversion date en String format yyyy-MM-dd // Conversion date en String format yyyy-MM-dd
String dateNaissance = Optional.ofNullable(request.getDateNaissance()) String dateNaissance = Optional.ofNullable(request.getDateNaissance())
.map(d -> d.format(DateTimeFormatter.ISO_LOCAL_DATE)) .map(d -> d.format(DateTimeFormatter.ISO_LOCAL_DATE))
.orElse(null); .orElse(null);
// Construction du body IFU // Construction du body IFU
IfuEnLigneRechercheBody ifuRequest = new IfuEnLigneRechercheBody(); IfuEnLigneRechercheBody ifuRequest = new IfuEnLigneRechercheBody();
ifuRequest.setNom(request.getNom()); ifuRequest.setNom(request.getNom());

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

@@ -36,6 +36,7 @@ public class EnquetePayLoadWeb {
private Long zoneRfuId; private Long zoneRfuId;
private String zoneRfuNom; private String zoneRfuNom;
private Long personneId; private Long personneId;
private String personneIfu;
private String personneNom; private String personneNom;
private String personnePrenom; private String personnePrenom;
private String personneRaisonSociale; private String personneRaisonSociale;

12
src/main/java/io/gmss/fiscad/persistence/customrepository/ParcelleRepositoryCustomImpl.java
View File

@@ -73,12 +73,12 @@ public class ParcelleRepositoryCustomImpl implements ParcelleRepositoryCustom {
r.numero as rueNumero, r.numero as rueNumero,
r.nom as rueNom, r.nom as rueNom,
pers.id as personneId, pers.id as proprietaireId,
pers.ifu as ifu, pers.ifu as proprietaireIfu,
pers.npi as npi, pers.npi as proprietaireNpi,
pers.nom as nom, pers.nom as proprietaireNom,
pers.prenom as prenom, pers.prenom as proprietairePrenom,
pers.raison_sociale as raisonSociale, pers.raison_sociale as proprietaireRaisonSociale,
de.id as enqueteCouranteId de.id as enqueteCouranteId