diff --git a/src/main/java/io/gmss/fiscad/entities/interface_sigibe/EavisContribuable.java b/src/main/java/io/gmss/fiscad/entities/interface_sigibe/EavisContribuable.java new file mode 100644 index 0000000..2af9c6a --- /dev/null +++ b/src/main/java/io/gmss/fiscad/entities/interface_sigibe/EavisContribuable.java @@ -0,0 +1,35 @@ +package io.gmss.fiscad.entities.interface_sigibe; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import io.gmss.fiscad.deserializer.LocalDateDeserializer; +import io.gmss.fiscad.entities.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDate; + +@EqualsAndHashCode(callSuper = true) +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EavisContribuable extends BaseEntity implements Serializable { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private Long idAvis; + private Long idContribuableFoncier; + private String ifu; + private String statut; + @JsonFormat(pattern = "dd-MM-yyyy") + @JsonDeserialize(using = LocalDateDeserializer.class) + private LocalDate dateInformation; +} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/entities/interface_sigibe/DeclarationSpontaneBien.java b/src/main/java/io/gmss/fiscad/entities/interface_sigibe/EdeclarationPropriete.java similarity index 90% rename from src/main/java/io/gmss/fiscad/entities/interface_sigibe/DeclarationSpontaneBien.java rename to src/main/java/io/gmss/fiscad/entities/interface_sigibe/EdeclarationPropriete.java index 5e7b5f3..2f549cd 100644 --- a/src/main/java/io/gmss/fiscad/entities/interface_sigibe/DeclarationSpontaneBien.java +++ b/src/main/java/io/gmss/fiscad/entities/interface_sigibe/EdeclarationPropriete.java @@ -1,7 +1,6 @@ package io.gmss.fiscad.entities.interface_sigibe; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.gmss.fiscad.deserializer.LocalDateDeserializer; import io.gmss.fiscad.entities.BaseEntity; @@ -21,12 +20,12 @@ import java.time.LocalDate; @Data @NoArgsConstructor @AllArgsConstructor -public class DeclarationSpontaneBien extends BaseEntity implements Serializable { +public class EdeclarationPropriete extends BaseEntity implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private Long idImposition ; - private String rImposition ; + private Long idImpot ; + private String rImpot ; private String ifu ; private String rCommune ; private String rQuartier ; diff --git a/src/main/java/io/gmss/fiscad/entities/interface_sigibe/PaiementAvis.java b/src/main/java/io/gmss/fiscad/entities/interface_sigibe/EpaiementAvis.java similarity index 87% rename from src/main/java/io/gmss/fiscad/entities/interface_sigibe/PaiementAvis.java rename to src/main/java/io/gmss/fiscad/entities/interface_sigibe/EpaiementAvis.java index 1940541..72bba0c 100644 --- a/src/main/java/io/gmss/fiscad/entities/interface_sigibe/PaiementAvis.java +++ b/src/main/java/io/gmss/fiscad/entities/interface_sigibe/EpaiementAvis.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.gmss.fiscad.deserializer.LocalDateDeserializer; import io.gmss.fiscad.entities.BaseEntity; -import io.gmss.fiscad.enums.SourceDonnee; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; @@ -19,7 +18,7 @@ import java.time.LocalDate; @Data @NoArgsConstructor @AllArgsConstructor -public class PaiementAvis extends BaseEntity implements Serializable { +public class EpaiementAvis extends BaseEntity implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @@ -33,6 +32,11 @@ public class PaiementAvis extends BaseEntity implements Serializable { private String idImpotNature; private String ifu; private String rCommune; + private String rQuartier; + private String qipQuartier; + private String qipIlot; + private String qipParcelle; + private String nup; @JsonFormat(pattern = "dd-MM-yyyy") @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateValidation; @@ -46,5 +50,5 @@ public class PaiementAvis extends BaseEntity implements Serializable { @JsonDeserialize(using = LocalDateDeserializer.class) private LocalDate dateInformation; private Long montantPayer; +} -} \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/enums/UserProfile.java b/src/main/java/io/gmss/fiscad/enums/UserProfile.java index 58eb08a..9658365 100644 --- a/src/main/java/io/gmss/fiscad/enums/UserProfile.java +++ b/src/main/java/io/gmss/fiscad/enums/UserProfile.java @@ -73,5 +73,6 @@ public enum UserProfile { EBANQUE_CASCHEF, ENRAGENT, ENRCHEF, - AMFRE + AMFRE, + GESSECTCHEF } diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/dll_export_imposition_pour_sigibe.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/dll_export_imposition_pour_sigibe.sql index 9601952..60881b6 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/dll_export_imposition_pour_sigibe.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/dll_export_imposition_pour_sigibe.sql @@ -19,16 +19,19 @@ CREATE TABLE e_avis ( CREATE TABLE e_avis_detail ( id_avis_detail BIGINT NOT NULL, id_avis BIGINT NOT NULL, + r_avis VARCHAR(50), id_impot_nature VARCHAR(50), id_unite_foncier BIGINT NOT NULL, nup VARCHAR(20), r_quartier VARCHAR(50), qip_quartier VARCHAR(10), + qip_ilot VARCHAR(10), qip_parcelle VARCHAR(10), batiment VARCHAR(10), unite_logement VARCHAR(10), montant_base_imposition NUMERIC(22,3), - montant_valeur_locative NUMERIC(22,3), taux NUMERIC(22,10), - montant_du NUMERIC(22,3) -); \ No newline at end of file + montant_du NUMERIC(22,3), + penalite NUMERIC(22,3), + booleen_parcelle_contact boolean +); diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql index 4a37c30..19f3497 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_donnee_imposition_vers_sigibe.sql @@ -1,5 +1,4 @@ ------------------ - +---------------- create or replace view e_avis_view as WITH first_parcelle_imposition AS ( SELECT DISTINCT ON (personne_id) @@ -124,13 +123,11 @@ FROM impositions_tfu imp ON st.id = cca.structure_id where dimp.personne_id is not null order by exo.annee,dimp.parcelle_id,dimp.nature_impot, dimp.montant_taxe-coalesce(dimp.acompte,0)-coalesce(dimp.retenu_irf,0) desc ; - and dimp.ifu='208558'; - - - + -- and dimp.ifu='208558'; --------------------------------------------------- +/* select * from e_avis_detail_view where qip_quartier='6431' and qip_ilot='1656' and qip_parcelle='C' ; @@ -145,4 +142,6 @@ where not exists(select 1 from parcelle_view pv select penalite -from donnees_imposition_tfu; \ No newline at end of file +from donnees_imposition_tfu; + + */ \ No newline at end of file diff --git a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql index 8173201..039464b 100644 --- a/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql +++ b/src/main/java/io/gmss/fiscad/persistence/procedure_fonction_stocke/export_parcelles_vers_sigibe.sql @@ -1,11 +1,12 @@ ----------------- -create or replace view parcelle_view as +create or replace view e_parcelle_view as select distinct q.code as r_quartier,q.nom,p.nup, p.q,p.i,p.p from parcelle p inner join quartier q on q.id=p.quartier_id ; +/* select * from donnees_imposition_tfu dimp where not exists( select * from parcelle p @@ -13,9 +14,7 @@ select * from parcelle p where dimp.q=p.q and dimp.ilot=p.i and dimp.parcelle=p.p); select * from parcelle_view; - - - - select * from impositions_tfu; + */ +