From 9cf4c792a860865c88c44e573402a1ae0c5da806 Mon Sep 17 00:00:00 2001 From: vincenzofariello Date: Thu, 23 May 2024 17:22:49 +0200 Subject: [PATCH] Fix DBCFX_RU_362 - Aggiunto campo COD_FISCALE_PARTITA_IVA nelle tabelle GNP_RICHIESTE_D82 e GNP_CRM_NOTIFY_DONOR_OUT e mapping verso CCC (CHECKFASE2, NOTIFICACONTROLLIFASE3) --- .../gnp/dao/db/hb/GnpRichiesteDonor82.hbm.xml | 3 ++ .../gnp/dao/db/hb/GnpRichiesteDonor82.java | 10 +++++ .../db/hb/crm/GnpCrmNotifyDonorOut.hbm.xml | 3 ++ .../dao/db/hb/crm/GnpCrmNotifyDonorOut.java | 40 +++++------------ .../gnp/manager/RequestManagerDonor82.java | 3 ++ .../dbss/DBSSFormatController.java | 45 ++++++++++++++----- 6 files changed, 62 insertions(+), 42 deletions(-) diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.hbm.xml b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.hbm.xml index c218fa81..51a859b7 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.hbm.xml +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.hbm.xml @@ -97,5 +97,8 @@ + + + diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.java b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.java index d6f687b9..332316d3 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/GnpRichiesteDonor82.java @@ -41,6 +41,7 @@ public class GnpRichiesteDonor82 implements java.io.Serializable { private String dn10; private String cor; private String cos; + private String codFiscalePartitaIva; public GnpRichiesteDonor82() { } @@ -304,6 +305,15 @@ public class GnpRichiesteDonor82 implements java.io.Serializable { public void setDataInvioEsitoFase2(Date dataInvioEsitoFase2) { this.dataInvioEsitoFase2 = dataInvioEsitoFase2; } + + public String getCodFiscalePartitaIva() { + return codFiscalePartitaIva; + } + + public void setCodFiscalePartitaIva(String codFiscalePartitaIva) { + this.codFiscalePartitaIva = codFiscalePartitaIva; + } + } diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.hbm.xml b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.hbm.xml index 0c593300..de332193 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.hbm.xml +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.hbm.xml @@ -91,5 +91,8 @@ + + + diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.java b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.java index 2f7f74c1..d8dc4924 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/dao/db/hb/crm/GnpCrmNotifyDonorOut.java @@ -42,47 +42,20 @@ public class GnpCrmNotifyDonorOut implements java.io.Serializable { private String codiceOloRecipient; private String codiceSessione; + private String codFiscalePartitaIva; + public GnpCrmNotifyDonorOut() { } - public GnpCrmNotifyDonorOut(Long daScodare, String directoryNumber, Long codiceRichiesta, String sistComp) { this.daScodare = daScodare; this.directoryNumber = directoryNumber; this.codiceRichiesta = codiceRichiesta; this.sistComp = sistComp; } - - public GnpCrmNotifyDonorOut(Long daScodare, String directoryNumber, Long codiceRichiesta, String nativoTlc, String tipoEvento, Date dac, Date des, Long tipoLinea, String ambito, String idOperatoreDonating, String cognomeCliente, Date dataInvioMessaggio, String codiceOrdineOlo, String sistComp, String businessId, String transactionId, Date dataOrdine, String idOperatoreDonor, String cow, String flagNp, String aggiuntivi, String note, String codiceSegreto, String cor, String codiceOloRecipient) { - this.daScodare = daScodare; - this.directoryNumber = directoryNumber; - this.codiceRichiesta = codiceRichiesta; - this.nativoTlc = nativoTlc; - this.tipoEvento = tipoEvento; - this.dac = dac; - this.des = des; - this.tipoLinea = tipoLinea; - this.ambito = ambito; - this.idOperatoreDonating = idOperatoreDonating; - this.cognomeCliente = cognomeCliente; - this.dataInvioMessaggio = dataInvioMessaggio; - this.codiceOrdineOlo = codiceOrdineOlo; - this.sistComp = sistComp; - this.businessId = businessId; - this.transactionId = transactionId; - this.dataOrdine = dataOrdine; - this.idOperatoreDonor = idOperatoreDonor; - this.cow = cow; - this.flagNp = flagNp; - this.aggiuntivi = aggiuntivi; - this.note = note; - this.codiceSegreto = codiceSegreto; - this.cor = cor; - this.codiceOloRecipient = codiceOloRecipient; - } - public GnpCrmNotifyDonorOut(Long daScodare, String directoryNumber, Long codiceRichiesta, String nativoTlc, String tipoEvento, Date dac, Date des, Long tipoLinea, String ambito, String idOperatoreDonating, String cognomeCliente, Date dataInvioMessaggio, String codiceOrdineOlo, String sistComp, String businessId, String transactionId, Date dataOrdine, String idOperatoreDonor, String cow, String flagNp, String aggiuntivi, String note, String telefonoReferenteRichiedente, String codiceSegreto, String cor, String codiceOloRecipient) { + public GnpCrmNotifyDonorOut(Long daScodare, String directoryNumber, Long codiceRichiesta, String nativoTlc, String tipoEvento, Date dac, Date des, Long tipoLinea, String ambito, String idOperatoreDonating, String cognomeCliente, Date dataInvioMessaggio, String codiceOrdineOlo, String sistComp, String businessId, String transactionId, Date dataOrdine, String idOperatoreDonor, String cow, String flagNp, String aggiuntivi, String note, String telefonoReferenteRichiedente, String codiceSegreto, String cor, String codiceOloRecipient, String codFiscalePartitaIva) { this.daScodare = daScodare; this.directoryNumber = directoryNumber; this.codiceRichiesta = codiceRichiesta; @@ -109,6 +82,7 @@ public class GnpCrmNotifyDonorOut implements java.io.Serializable { this.codiceSegreto = codiceSegreto; this.cor = cor; this.codiceOloRecipient = codiceOloRecipient; + this.codFiscalePartitaIva = codFiscalePartitaIva; } public Long getUniqueId() { @@ -313,5 +287,11 @@ public class GnpCrmNotifyDonorOut implements java.io.Serializable { this.codiceSessione = codiceSessione; } + public String getCodFiscalePartitaIva() { + return codFiscalePartitaIva; + } + public void setCodFiscalePartitaIva(String codFiscalePartitaIva) { + this.codFiscalePartitaIva = codFiscalePartitaIva; + } } \ No newline at end of file diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/manager/RequestManagerDonor82.java b/gnpdev/dbcfx/src/it/valueteam/gnp/manager/RequestManagerDonor82.java index 0ec00ffe..fd92c775 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/manager/RequestManagerDonor82.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/manager/RequestManagerDonor82.java @@ -136,6 +136,9 @@ public class RequestManagerDonor82 { richiesteDonor.setDn8(oloRichiesteDonorIn.getDn8()); richiesteDonor.setDn9(oloRichiesteDonorIn.getDn9()); richiesteDonor.setDn10(oloRichiesteDonorIn.getDn10()); + + richiesteDonor.setCodFiscalePartitaIva(oloRichiesteDonorIn.getCodFiscalePartitaIva()); + //I campi codice Sessione, CRMCompetenza, KoNonInviato, PresaInCarico, CodValidazione //vengono inseriti successivamente nel processo diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java index 684f9cee..e44ed408 100644 --- a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java +++ b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbss/DBSSFormatController.java @@ -1074,6 +1074,7 @@ public class DBSSFormatController extends FormatController { dbssDonorOut.setCognomeCliente(richiesta.getCognomeCliente()); dbssDonorOut.setIdOperatoreDonor("TLC"); dbssDonorOut.setIdOperatoreDonating("TLC"); + dbssDonorOut.setCodFiscalePartitaIva(richiesta.getCodFiscalePartitaIva()); String aggiuntivi = ""; @@ -1434,27 +1435,26 @@ public class DBSSFormatController extends FormatController { } request.setInteractionDate(calendar); - CharacteristicValueType[] characteristics = new CharacteristicValueType[11]; + CharacteristicValueType[] characteristics = new CharacteristicValueType[12]; // Check lunghezza array characteristics - begin if (!Func.isNull(dbssDonorOut.getAggiuntivi())) { - characteristics = new CharacteristicValueType[12]; + characteristics = new CharacteristicValueType[13]; } if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) { nowDonorOut = nowDonorOutDAO.findByIdRichiesta82(dbssDonorOut.getCodiceRichiesta()); if (!Func.isNull(dbssDonorOut.getAggiuntivi()) && (nowDonorOut != null && !Func.isNull(nowDonorOut.getMotivazione()))) { - characteristics = new CharacteristicValueType[14]; + characteristics = new CharacteristicValueType[15]; } else { if (!Func.isNull(dbssDonorOut.getAggiuntivi()) || (nowDonorOut != null && !Func.isNull(nowDonorOut.getMotivazione()))) - characteristics = new CharacteristicValueType[13]; + characteristics = new CharacteristicValueType[14]; else - characteristics = new CharacteristicValueType[12]; + characteristics = new CharacteristicValueType[13]; } } - // Check lunghezza array characteristics - end CharacteristicValueType reqType = new CharacteristicValueType(); CharacteristicSpecificationType reqName = new CharacteristicSpecificationType(); @@ -1535,12 +1535,33 @@ public class DBSSFormatController extends FormatController { oloRecType.setValue(dbssDonorOut.getCodiceOloRecipient()); characteristics[charValueIndex++] = oloRecType; - CharacteristicValueType cognomeClienteType = new CharacteristicValueType(); - CharacteristicSpecificationType cognomeClienteName = new CharacteristicSpecificationType(); - cognomeClienteName.setName("COWCode"); - cognomeClienteType.setCharacteristicSpecification(cognomeClienteName); - cognomeClienteType.setValue(dbssDonorOut.getCow()); - characteristics[charValueIndex++] = cognomeClienteType; + CharacteristicValueType cowCodeType = new CharacteristicValueType(); + CharacteristicSpecificationType cowCodeName = new CharacteristicSpecificationType(); + cowCodeName.setName("COWCode"); + cowCodeType.setCharacteristicSpecification(cowCodeName); + cowCodeType.setValue(dbssDonorOut.getCow()); + characteristics[charValueIndex++] = cowCodeType; + + if (!Func.isNull(dbssDonorOut.getCodFiscalePartitaIva())) { + + if(dbssDonorOut.getCodFiscalePartitaIva().length() == 16){ + CharacteristicValueType codiceFiscaleType = new CharacteristicValueType(); + CharacteristicSpecificationType codiceFiscaleName = new CharacteristicSpecificationType(); + codiceFiscaleName.setName("FiscalCode"); + codiceFiscaleType.setCharacteristicSpecification(codiceFiscaleName); + codiceFiscaleType.setValue(dbssDonorOut.getCow()); + characteristics[charValueIndex++] = codiceFiscaleType; + } + else{ + CharacteristicValueType partitaIvaType = new CharacteristicValueType(); + CharacteristicSpecificationType partitaIvaName = new CharacteristicSpecificationType(); + partitaIvaName.setName("VATCode"); + partitaIvaType.setCharacteristicSpecification(partitaIvaName); + partitaIvaType.setValue(dbssDonorOut.getCow()); + characteristics[charValueIndex++] = partitaIvaType; + } + + } if (operation.equals(DBSSMap.EVENTO_ESITO_VERIFICA_COD_SESSIONE)) { if (nowDonorOut != null) {