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

Merge pull request 'develop' (#13) from develop into main

Browse Source 
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
AKAKPO Aurince
2025-12-16 18:23:59 +00:00
parent 69af57f876 d27b622db8
commit 5e9f437497
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java
View File

@@ -13,16 +13,16 @@ import io.swagger.v3.oas.annotations.servers.Server;
@OpenAPIDefinition( @OpenAPIDefinition(
info = @Info( info = @Info(
contact = @Contact( contact = @Contact(
name = "Novatic", name = "ABS Company Bénin",
email = "contact@novatic.org", email = "contact@abs.org",
url = "https://novatic.org" url = "https://abs.org"
), ),
description = "Cette page présente toutes les ressources API pour la gestion des données socio-foncières et fiscales", description = "Cette page présente toutes les ressources API pour la gestion des données socio-foncières et fiscales",
title = "FISCAD", title = "FISCAD",
version = "1.0", version = "1.0",
license = @License( license = @License(
name = "Licence name", name = "Licence name",
url = "https://novatic.org" url = "https://abs.org"
), ),
termsOfService = "Terms of service" termsOfService = "Terms of service"
), ),
@@ -33,7 +33,7 @@ import io.swagger.v3.oas.annotations.servers.Server;
), ),
@Server( @Server(
description = "TEST ENV (http)", description = "TEST ENV (http)",
url = "http://novatic.vps.webdock.cloud:8282" url = "https://backend.fiscad-test.novatic.org"
), ),
@Server( @Server(
description = "PROD ENV (https)", description = "PROD ENV (https)",

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataDeclarationNc.java
View File

@@ -15,7 +15,7 @@ import java.io.Serializable;
@Setter @Setter
@Table( @Table(
indexes = { indexes = {
@Index(name = "idx_terminal_external_bat", columnList = "terminalId, externalKey") @Index(name = "idx_terminal_external_dnc", columnList = "terminalId, externalKey")
} }
) )
public class MobileDataDeclarationNc extends BaseEntity implements Serializable { public class MobileDataDeclarationNc extends BaseEntity implements Serializable {

3
src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteActivite.java
View File

@@ -49,8 +49,9 @@ public class EnqueteActivite extends BaseEntity implements Serializable {
@JsonDeserialize(using = LocalDateDeserializer.class) @JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateEnquete; private LocalDate dateEnquete;
@Column(columnDefinition = "false") @Column(columnDefinition = "boolean default false", nullable = false)
private boolean estDeclarer; private boolean estDeclarer;
private String nc; private String nc;
private Long ChiffreAffaire; private Long ChiffreAffaire;
private String NumeroRccm; private String NumeroRccm;