From 679097955b97d02c8c962f7fd92f0dad34634667 Mon Sep 17 00:00:00 2001 From: manuelstefanile Date: Wed, 24 Jul 2024 10:36:36 +0200 Subject: [PATCH] DBCFX_RU_365 - GATEWAY DBC FX : NP NNG Donating, modifica notifica TC5 con dati TC1 o TC3 dbcfxGO --- .../DbcfxFormatController.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java b/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java index 44653321..d031d651 100644 --- a/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java +++ b/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/systemcontroller/formatcontroller/DbcfxFormatController.java @@ -460,7 +460,7 @@ public class DbcfxFormatController extends FormatController { nngDonating.setDac(DateUtils.toDate(notifica_nng.getRDAC(),"dd/MM/yyyy")); } - if (notifica_nng.getTIPO_COMUNICAZIONE().equals("5") || notifica_nng.getTIPO_COMUNICAZIONE().equals("6")) { + if (notifica_nng.getTIPO_COMUNICAZIONE().equals("6")) { List criterion = new ArrayList(); nngDonating.setDataEspletamento(DateUtils.toDate(notifica_nng.getDAC(),"dd/MM/yyyy")); criterion.add(Restrictions.eq(GnpgoNngDonatingDAO.HP_TIPO_COMUNICAZIONE, "1")); @@ -469,6 +469,33 @@ public class DbcfxFormatController extends FormatController { nngDonating.setDataOrdine(tc1.getDataOrdine()); } + if (notifica_nng.getTIPO_COMUNICAZIONE().equals("5")) { + + List criterionTC1 = new ArrayList(); + criterionTC1.add(Restrictions.eq(GnpgoNngDonatingDAO.HP_TIPO_COMUNICAZIONE, "1")); + criterionTC1.add(Restrictions.eq(GnpgoNngDonatingDAO.HIB_PROP_CODICE_ORDINE, nngDonating.getCodiceOrdine())); + List listaTC1 = new GnpgoNngDonatingDAO().findByCriteria(criterionTC1); + + if(listaTC1 != null || !listaTC1.isEmpty() || listaTC1.size()>0) { + GnpgoNngDonating tc1 = listaTC1.get(0); + nngDonating.setDataEspletamento(DateUtils.toDate(notifica_nng.getDAC(),"dd/MM/yyyy")); + nngDonating.setDataOrdine(tc1.getDataOrdine()); + } + else { + List criterionTC3 = new ArrayList(); + criterionTC3.add(Restrictions.eq(GnpgoNngDonatingDAO.HP_TIPO_COMUNICAZIONE, "3")); + criterionTC3.add(Restrictions.eq(GnpgoNngDonatingDAO.HIB_PROP_CODICE_ORDINE, nngDonating.getCodiceOrdine())); + List listaTC3 = new GnpgoNngDonatingDAO().findByCriteria(criterionTC3); + + if(listaTC3 != null || !listaTC3.isEmpty() || listaTC3.size()>0) { + GnpgoNngDonating tc3 = listaTC3.get(0); + nngDonating.setDataEspletamento(tc3.getDac()); + nngDonating.setDataOrdine(tc3.getDataOrdine()); + } + } + + } + return nngDonating; }