Merge pull request 'Generation tfu batie et non batie avec ressource de liste de données imposition' (#165) from features/crud_entites into develop

Reviewed-on: #165
This commit was merged in pull request #165.
This commit is contained in:
2026-03-12 20:01:27 +00:00
3 changed files with 5 additions and 3 deletions

View File

@@ -99,7 +99,6 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) { public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId); Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId);
ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb); ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE); impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE);

View File

@@ -13,8 +13,6 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
public interface DonneesImpositionTfuService { public interface DonneesImpositionTfuService {
DonneesImpositionTfu createDonneesImpositionTfu(DonneesImpositionTfu donneesImpositionTfu) throws BadRequestException; DonneesImpositionTfu createDonneesImpositionTfu(DonneesImpositionTfu donneesImpositionTfu) throws BadRequestException;
DonneesImpositionTfu updateDonneesImpositionTfu(Long id, DonneesImpositionTfu donneesImpositionTfu) throws NotFoundException; DonneesImpositionTfu updateDonneesImpositionTfu(Long id, DonneesImpositionTfu donneesImpositionTfu) throws NotFoundException;

View File

@@ -194,6 +194,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
order by d.nomProp,d.nomProp asc
""") """)
List<DonneesImpositionPaylaodWeb> findAllByImpositionTfuId( List<DonneesImpositionPaylaodWeb> findAllByImpositionTfuId(
Long impositionTfuId Long impositionTfuId
@@ -268,6 +269,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
order by d.nomProp,d.nomProp asc
""") """)
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdPageable( Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdPageable(
Long impositionTfuId, Long impositionTfuId,
@@ -345,6 +347,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
WHERE itfu.id = :impositionTfuId WHERE itfu.id = :impositionTfuId
and d.batie is true and d.batie is true
and d.numUniteLogement is null and d.numUniteLogement is null
order by d.nomProp,d.nomProp asc
""") """)
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieBatimentPageable( Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieBatimentPageable(
Long impositionTfuId, Long impositionTfuId,
@@ -421,6 +424,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
WHERE itfu.id = :impositionTfuId WHERE itfu.id = :impositionTfuId
and d.batie is true and d.batie is true
and d.numUniteLogement is not null and d.numUniteLogement is not null
order by d.nomProp,d.nomProp asc
""") """)
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieUniteLogPageable( Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieUniteLogPageable(
Long impositionTfuId, Long impositionTfuId,
@@ -497,6 +501,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
LEFT join d.zoneRfu z LEFT join d.zoneRfu z
WHERE itfu.id = :impositionTfuId WHERE itfu.id = :impositionTfuId
and d.batie is false and d.batie is false
order by d.nomProp,d.nomProp asc
""") """)
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdNonBatiePageable( Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdNonBatiePageable(
Long impositionTfuId, Long impositionTfuId,