diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java index 991484e..d8e52d7 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java @@ -167,11 +167,11 @@ public class CaracteristiqueBatimentController { } } - @GetMapping("/by-enquete-batiment-id/{batimentId}") - public ResponseEntity getCaracteristiqueBatimentByBatimentId(@PathVariable Long enquteBatimentId) { + @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}") + public ResponseEntity getCaracteristiqueBatimentByBatimentId(@PathVariable Long enqueteBatimentId) { try { return new ResponseEntity<>( - new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatiment(enquteBatimentId), "Caracteristique du batiment trouvée avec succès."), + new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatiment(enqueteBatimentId), "Caracteristique du batiment trouvée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { @@ -190,12 +190,12 @@ public class CaracteristiqueBatimentController { } } - @GetMapping("/page/by-enquete-batiment-id/{batimentId}") - public ResponseEntity getCaracteristiqueBatimentByEnqueteBatimentIdPaged(@PathVariable Long enquteBatimentId,@RequestParam int pageNo, @RequestParam int pageSize) { + @GetMapping("/page/by-enquete-batiment-id/{enqueteBatimentId}") + public ResponseEntity getCaracteristiqueBatimentByEnqueteBatimentIdPaged(@PathVariable Long enqueteBatimentId,@RequestParam int pageNo, @RequestParam int pageSize) { try { Pageable pageable = PageRequest.of(pageNo, pageSize); return new ResponseEntity<>( - new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatimentPageable(enquteBatimentId,pageable), "Caracteristique du batiment trouvée avec succès."), + new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatimentPageable(enqueteBatimentId,pageable), "Caracteristique du batiment trouvée avec succès."), HttpStatus.OK ); } catch (HttpClientErrorException.MethodNotAllowed e) { diff --git a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java index fcaa2b9..cd72882 100644 --- a/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java +++ b/src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java @@ -199,7 +199,7 @@ public class CaracteristiqueUniteLogementController { } } - @GetMapping("/page//by-enquete-ulo-id/{enqueteUloId}") + @GetMapping("/page/by-enquete-ulo-id/{enqueteUloId}") public ResponseEntity getAllCaracteristiqueUniteLogementByEulPaged(@PathVariable Long enqueteUloId,@RequestParam int pageNo, @RequestParam int pageSize) { try { Pageable pageable = PageRequest.of(pageNo, pageSize); diff --git a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java index 1c352ba..5341884 100644 --- a/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java +++ b/src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java @@ -68,6 +68,7 @@ public class Parcelle extends BaseEntity implements Serializable { @ManyToOne private Rue rue ; private String numeroRue ; + private Boolean batie; // private String ncProprietaire ; // @JsonIgnore // @OneToMany(mappedBy = "parcelle") diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java index 19b8665..3777ca0 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java @@ -20,11 +20,11 @@ public class BatimentPaylaodWeb { private String personneNom; private String personnePrenom; private String personneRaisonSociale; - private Float superficieSol; + private Float superficieAuSol; private Float superficieLouee; private Long enqueteBatiementCourantId; - public BatimentPaylaodWeb(Long id, String nub, String code, LocalDate dateConstruction, Long parcelleId, String parcelleNup, String parcelleQ, String parcelleI, String parcelleP, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Float superficieSol, Float superficieLouee,Long enqueteBatiementCourantId) { + public BatimentPaylaodWeb(Long id, String nub, String code, LocalDate dateConstruction, Long parcelleId, String parcelleNup, String parcelleQ, String parcelleI, String parcelleP, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale, Float superficieAuSol, Float superficieLouee,Long enqueteBatiementCourantId) { this.id = id; this.nub = nub; this.code = code; @@ -38,7 +38,7 @@ public class BatimentPaylaodWeb { this.personneNom = personneNom; this.personnePrenom = personnePrenom; this.personneRaisonSociale = personneRaisonSociale; - this.superficieSol = superficieSol ; + this.superficieAuSol = superficieAuSol ; this.superficieLouee = superficieLouee ; this.enqueteBatiementCourantId = enqueteBatiementCourantId ; } diff --git a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java index 81cda0a..9202d0d 100644 --- a/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java +++ b/src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java @@ -12,7 +12,7 @@ public class UniteLogementPaylaodWeb { private String numeroEtage; private String code; private Long batimentId; - private Float superficieSol; + private Float superficieAuSol; private Float superficieLouee; private String batimentNub; private String observation; @@ -23,13 +23,13 @@ public class UniteLogementPaylaodWeb { private String personneRaisonSociale; private Long enqueteUniteLogementCourantId; - public UniteLogementPaylaodWeb(Long id, String nul, String numeroEtage, String code, Long batimentId, Float superficieSol, Float superficieLouee, String batimentNub, String observation, LocalDate dateConstruction, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale,Long enqueteUniteLogementCourantId) { + public UniteLogementPaylaodWeb(Long id, String nul, String numeroEtage, String code, Long batimentId, Float superficieAuSol, Float superficieLouee, String batimentNub, String observation, LocalDate dateConstruction, Long personneId, String personneNom, String personnePrenom, String personneRaisonSociale,Long enqueteUniteLogementCourantId) { this.id = id; this.nul = nul; this.numeroEtage = numeroEtage; this.code = code; this.batimentId = batimentId; - this.superficieSol = superficieSol; + this.superficieAuSol = superficieAuSol; this.superficieLouee = superficieLouee; this.batimentNub = batimentNub; this.observation = observation; diff --git a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java index 270b480..2ac1c63 100644 --- a/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java +++ b/src/main/java/io/gmss/fiscad/service/EntityFromPayLoadService.java @@ -269,7 +269,7 @@ public class EntityFromPayLoadService { batiment.setId(batimentPaylaodWeb.getId()); batiment.setCode(batimentPaylaodWeb.getCode()); batiment.setNub(batimentPaylaodWeb.getNub()); - batiment.setSuperficieAuSol(batimentPaylaodWeb.getSuperficieSol()); + batiment.setSuperficieAuSol(batimentPaylaodWeb.getSuperficieAuSol()); batiment.setSuperficieLouee(batimentPaylaodWeb.getSuperficieLouee()); batiment.setDateConstruction(batimentPaylaodWeb.getDateConstruction()); @@ -372,7 +372,7 @@ public class EntityFromPayLoadService { uniteLogement.setId(uniteLogementPaylaodWeb.getId()); uniteLogement.setCode(uniteLogementPaylaodWeb.getCode()); uniteLogement.setNul(uniteLogementPaylaodWeb.getNul()); - uniteLogement.setSuperficieAuSol(uniteLogementPaylaodWeb.getSuperficieSol()); + uniteLogement.setSuperficieAuSol(uniteLogementPaylaodWeb.getSuperficieAuSol()); uniteLogement.setSuperficieLouee(uniteLogementPaylaodWeb.getSuperficieLouee()); uniteLogement.setDateConstruction(uniteLogementPaylaodWeb.getDateConstruction()); uniteLogement.setNumeroEtage(uniteLogementPaylaodWeb.getNumeroEtage());