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

develop #289

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

2
src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java
View File

@@ -94,7 +94,7 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
private Long nombrePiscine; private Long nombrePiscine;
private Long nombreUlog; private Long nombreUlog;
private Long nombreBat; private Long nombreBat;
@Column(nullable = true, columnDefinition = "boolean default true") //@Column(nullable = true, columnDefinition = "boolean default true")
private Boolean homologable ; private Boolean homologable ;
@JsonFormat(pattern = "dd-MM-yyyy") @JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)

4
src/main/java/io/gmss/fiscad/persistence/repositories/rfu/metier/DonneesImpositionTfuRepository.java
View File

@@ -667,7 +667,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
LEFT join d.structure s LEFT join d.structure s
LEFT join d.zoneRfu z LEFT join d.zoneRfu z
WHERE itfu.id = :impositionTfuId 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 order by d.nomProp,d.nomProp asc
""") """)
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdHomologablePageable( Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdHomologablePageable(
@@ -682,7 +682,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
UPDATE DonneesImpositionTfu d UPDATE DonneesImpositionTfu d
SET d.homologable = true SET d.homologable = true
WHERE d.impositionsTfu.id = :impositionsTfuId WHERE d.impositionsTfu.id = :impositionsTfuId
AND (d.homologable IS NULL OR d.homologable = true) AND d.homologable IS NULL
""") """)
int homologuerDonneesImposition( int homologuerDonneesImposition(
@Param("impositionsTfuId") Long impositionsTfuId @Param("impositionsTfuId") Long impositionsTfuId