diff --git a/src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java b/src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java index 1a3906a..7951f7d 100644 --- a/src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java +++ b/src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java @@ -94,7 +94,7 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable { private Long nombrePiscine; private Long nombreUlog; private Long nombreBat; - @Column(nullable = true, columnDefinition = "boolean default true") + //@Column(nullable = true, columnDefinition = "boolean default true") private Boolean homologable ; @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) diff --git a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java index 99350b4..b49e6b6 100755 --- a/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java +++ b/src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java @@ -667,7 +667,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb( LEFT join d.structure s LEFT join d.zoneRfu z WHERE itfu.id = :impositionTfuId - and (d.homologable is true or d.homologable is null) + and d.homologable is null order by d.nomProp,d.nomProp asc """) Page findAllByImpositionTfuIdHomologablePageable( @@ -682,7 +682,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb( UPDATE DonneesImpositionTfu d SET d.homologable = true WHERE d.impositionsTfu.id = :impositionsTfuId - AND (d.homologable IS NULL OR d.homologable = true) + AND d.homologable IS NULL """) int homologuerDonneesImposition( @Param("impositionsTfuId") Long impositionsTfuId