-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 5944370 Author: nardil <[email protected]> Date: Fri Nov 11 10:20:59 2016 +0100 [GP-374] Aggiunta pagina di consultazione estratti conto da console [GP-386] Uniformati i formati degli estratti conto nelle varie pagine di estrazione commit 7073cdc Author: nardil <[email protected]> Date: Wed Nov 9 14:32:43 2016 +0100 Avanzamento di versione per packaging commit d74cb86 Author: nardil <[email protected]> Date: Wed Nov 9 11:53:48 2016 +0100 Recuperato codice Fix#27 commit a4898c6 Author: nardil <[email protected]> Date: Wed Nov 9 11:07:16 2016 +0100 Ridotto log di Acquisizione Rendicontazioni commit 06b6024 Author: nardil <[email protected]> Date: Mon Nov 7 16:54:26 2016 +0100 Corretto bug in acquisizione pendenti commit edda22b Author: nardil <[email protected]> Date: Mon Nov 7 10:09:25 2016 +0100 [FIX GP-399] Rilassati controlli di validazione RT per campi opzionali
- Loading branch information
Showing
45 changed files
with
3,429 additions
and
1,997 deletions.
There are no files selected for viewing
439 changes: 259 additions & 180 deletions
439
govpay-core/src/main/java/it/govpay/core/business/EstrattoConto.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
govpay-core/src/main/java/it/govpay/core/utils/CSVUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
package it.govpay.core.utils; | ||
|
||
import java.text.SimpleDateFormat; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
import org.apache.commons.lang.StringUtils; | ||
|
||
import it.govpay.bd.reportistica.EstrattoContoCostanti; | ||
import it.govpay.model.EstrattoConto; | ||
|
||
public class CSVUtils { | ||
|
||
public static List<String> getEstrattoContoCsvHeader(){ | ||
List<String> header = new ArrayList<String>(); | ||
|
||
header.add(EstrattoContoCostanti.COD_VERSAMENTO_HEADER); | ||
header.add(EstrattoContoCostanti.COD_SINGOLO_VERSAMENTO_HEADER); | ||
header.add(EstrattoContoCostanti.IUV_HEADER); | ||
header.add(EstrattoContoCostanti.CODICE_FISCALE_DEBITORE_HEADER); | ||
header.add(EstrattoContoCostanti.IMPORTO_DOVUTO_HEADER); | ||
header.add(EstrattoContoCostanti.IMPORTO_PAGATO_HEADER); | ||
header.add(EstrattoContoCostanti.DATA_PAGAMENTO_HEADER); | ||
header.add(EstrattoContoCostanti.STATO_VERSAMENTO_HEADER); | ||
header.add(EstrattoContoCostanti.STATO_SINGOLO_VERSAMENTO_HEADER); | ||
header.add(EstrattoContoCostanti.IUR_HEADER); | ||
header.add(EstrattoContoCostanti.CODICE_RENDICONTAZIONE_HEADER); | ||
header.add(EstrattoContoCostanti.BIC_RIVERSAMENTO_HEADER); | ||
header.add(EstrattoContoCostanti.ID_REGOLAMENTO_HEADER); | ||
header.add(EstrattoContoCostanti.IBAN_ACCREDITO_HEADER); | ||
header.add(EstrattoContoCostanti.CAUSALE_HEADER); | ||
header.add(EstrattoContoCostanti.NOTE_HEADER); | ||
|
||
return header; | ||
} | ||
|
||
public static List<String> getEstrattoContoAsCsvRow(EstrattoConto pagamento, SimpleDateFormat sdf) throws Exception{ | ||
List<String> oneLine = new ArrayList<String>(); | ||
// CodVersamentoEnte | ||
if(StringUtils.isNotEmpty(pagamento.getCodVersamentoEnte())) | ||
oneLine.add(pagamento.getCodVersamentoEnte()); | ||
else | ||
oneLine.add(""); | ||
// CodSingoloVersamentoEnte | ||
if(StringUtils.isNotEmpty(pagamento.getCodSingoloVersamentoEnte())) | ||
oneLine.add(pagamento.getCodSingoloVersamentoEnte()); | ||
else | ||
oneLine.add(""); | ||
// Iuv | ||
if(StringUtils.isNotEmpty(pagamento.getIuv())) | ||
oneLine.add(pagamento.getIuv()); | ||
else | ||
oneLine.add(""); | ||
// CF Debitore | ||
if(StringUtils.isNotEmpty(pagamento.getDebitoreIdentificativo())) | ||
oneLine.add(pagamento.getDebitoreIdentificativo()); | ||
else | ||
oneLine.add(""); | ||
//Importo Dovuto | ||
if(pagamento.getImportoDovuto() != null) | ||
oneLine.add(pagamento.getImportoDovuto().doubleValue()+""); | ||
else | ||
oneLine.add(""); | ||
// Importo Pagato | ||
if(pagamento.getImportoPagato() != null) | ||
oneLine.add(pagamento.getImportoPagato().doubleValue()+""); | ||
else | ||
oneLine.add(""); | ||
// Data Pagamento | ||
if(pagamento.getDataPagamento() != null) | ||
oneLine.add(sdf.format(pagamento.getDataPagamento())); | ||
else | ||
oneLine.add(""); | ||
// Stato Versamento | ||
if(pagamento.getStatoVersamento() != null) | ||
oneLine.add(pagamento.getStatoVersamento().toString()); | ||
else | ||
oneLine.add(""); | ||
// Stato Singolo Versamento | ||
if(pagamento.getStatoSingoloVersamento() != null) | ||
oneLine.add(pagamento.getStatoSingoloVersamento().toString()); | ||
else | ||
oneLine.add(""); | ||
// p.IUR | ||
if(StringUtils.isNotEmpty(pagamento.getIur())) | ||
oneLine.add(pagamento.getIur()); | ||
else | ||
oneLine.add(""); | ||
// Codice Rendicontazione | ||
if(StringUtils.isNotEmpty(pagamento.getCodFlussoRendicontazione())) | ||
oneLine.add(pagamento.getCodFlussoRendicontazione()); | ||
else | ||
oneLine.add(""); | ||
//BicRiversamento | ||
if(StringUtils.isNotEmpty(pagamento.getCodBicRiversamento())) | ||
oneLine.add(pagamento.getCodBicRiversamento()); | ||
else | ||
oneLine.add(""); | ||
// Id Regolamento | ||
if(StringUtils.isNotEmpty(pagamento.getIdRegolamento())) | ||
oneLine.add(pagamento.getIdRegolamento()); | ||
else | ||
oneLine.add(""); | ||
// IBAN | ||
if(StringUtils.isNotEmpty(pagamento.getIbanAccredito())) | ||
oneLine.add(pagamento.getIbanAccredito()); | ||
else | ||
oneLine.add(""); | ||
// Causale | ||
if(StringUtils.isNotEmpty(pagamento.getCausale())) | ||
oneLine.add(pagamento.getCausale()); | ||
else | ||
oneLine.add(""); | ||
// Note | ||
if(StringUtils.isNotEmpty(pagamento.getNote())) | ||
oneLine.add(pagamento.getNote()); | ||
else | ||
oneLine.add(""); | ||
|
||
return oneLine; | ||
} | ||
} |
15 changes: 15 additions & 0 deletions
15
govpay-ear/src/main/application/properties/govpay-orm.properties
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.