Merge pull request 'develop' (#166) from develop into main
Reviewed-on: #166
This commit was merged in pull request #166.
This commit is contained in:
@@ -99,7 +99,6 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
|
||||
public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
|
||||
Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId);
|
||||
|
||||
|
||||
ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
|
||||
impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE);
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public interface DonneesImpositionTfuService {
|
||||
|
||||
|
||||
DonneesImpositionTfu createDonneesImpositionTfu(DonneesImpositionTfu donneesImpositionTfu) throws BadRequestException;
|
||||
|
||||
DonneesImpositionTfu updateDonneesImpositionTfu(Long id, DonneesImpositionTfu donneesImpositionTfu) throws NotFoundException;
|
||||
|
||||
@@ -194,6 +194,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
|
||||
LEFT join d.structure s
|
||||
LEFT join d.zoneRfu z
|
||||
WHERE itfu.id = :impositionTfuId
|
||||
order by d.nomProp,d.nomProp asc
|
||||
""")
|
||||
List<DonneesImpositionPaylaodWeb> findAllByImpositionTfuId(
|
||||
Long impositionTfuId
|
||||
@@ -268,6 +269,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
|
||||
LEFT join d.structure s
|
||||
LEFT join d.zoneRfu z
|
||||
WHERE itfu.id = :impositionTfuId
|
||||
order by d.nomProp,d.nomProp asc
|
||||
""")
|
||||
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdPageable(
|
||||
Long impositionTfuId,
|
||||
@@ -345,6 +347,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
|
||||
WHERE itfu.id = :impositionTfuId
|
||||
and d.batie is true
|
||||
and d.numUniteLogement is null
|
||||
order by d.nomProp,d.nomProp asc
|
||||
""")
|
||||
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieBatimentPageable(
|
||||
Long impositionTfuId,
|
||||
@@ -421,6 +424,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
|
||||
WHERE itfu.id = :impositionTfuId
|
||||
and d.batie is true
|
||||
and d.numUniteLogement is not null
|
||||
order by d.nomProp,d.nomProp asc
|
||||
""")
|
||||
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdBatieUniteLogPageable(
|
||||
Long impositionTfuId,
|
||||
@@ -497,6 +501,7 @@ SELECT new io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb(
|
||||
LEFT join d.zoneRfu z
|
||||
WHERE itfu.id = :impositionTfuId
|
||||
and d.batie is false
|
||||
order by d.nomProp,d.nomProp asc
|
||||
""")
|
||||
Page<DonneesImpositionPaylaodWeb> findAllByImpositionTfuIdNonBatiePageable(
|
||||
Long impositionTfuId,
|
||||
|
||||
Reference in New Issue
Block a user