From 8bdf9151dd7572b8f9a849604fc22417a42983e6 Mon Sep 17 00:00:00 2001
From: vincenzofariello <vincenzo.fariello@accenture.com>
Date: Tue, 5 Nov 2024 10:10:05 +0100
Subject: [PATCH] DBCFX_SM_695 - Anomalia viste del. 82 - errata/assente
 visualizzazione uscite OF

---
 .../dbcfxgo/DbcfxgoFormatController.java                 | 4 +++-
 .../core/dao/db/hb/GnpgoGestioneRichiesteD82DAO.java     | 9 ++++-----
 .../dbcfxgo/web/res/content/ricercaOrdineUsciteFTTH.jsp  | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbcfxgo/DbcfxgoFormatController.java b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbcfxgo/DbcfxgoFormatController.java
index 2e5da017..7768fdd9 100644
--- a/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbcfxgo/DbcfxgoFormatController.java
+++ b/gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbcfxgo/DbcfxgoFormatController.java
@@ -1144,9 +1144,11 @@ public class DbcfxgoFormatController extends FormatController{
 		notifica.setCOW(dbcfxgoOutDel82.getCow());
 		notifica.setNOME_FILE(dbcfxgoOutDel82.getNomeFile());
 
-		if(notifica.getDATA_SCADENZA() != null) {
+		// DBCFX_SM_695 - update if per check sulla DataScadenza presente in tabella GNP_DBCFXGO_OUT_DEL82
+		if(dbcfxgoOutDel82.getDataScadenza() != null) {
 			notifica.setDATA_SCADENZA(DateUtils.toString(dbcfxgoOutDel82.getDataScadenza(), DATE_PATTERN));
 		}
+
 		notifica.setCOS(dbcfxgoOutDel82.getCos());
 		notifica.setDN1(dbcfxgoOutDel82.getDn1());
 		notifica.setDN2(dbcfxgoOutDel82.getDn2());
diff --git a/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/dao/db/hb/GnpgoGestioneRichiesteD82DAO.java b/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/dao/db/hb/GnpgoGestioneRichiesteD82DAO.java
index 043d87e2..f2d236b5 100644
--- a/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/dao/db/hb/GnpgoGestioneRichiesteD82DAO.java
+++ b/gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/dao/db/hb/GnpgoGestioneRichiesteD82DAO.java
@@ -191,7 +191,6 @@ public class GnpgoGestioneRichiesteD82DAO extends BaseHibernateDAO{
     public GnpgoGestioneRichiesteD82 creaTestataD82(GnpgoGestioneNotificheD82 notifica) {
         GnpgoGestioneRichiesteD82 testataD82 = new GnpgoGestioneRichiesteD82();
         testataD82.setStato(0L);
-        //testataD82.setPiattaformaCrm(notifica.getPiattaformaCrm());
         testataD82.setNumeroTelefono(notifica.getNumeroTelefono());
         testataD82.setIdRichiesta(notifica.getIdRichiesta());
         testataD82.setOpRecipient(notifica.getOpRecipient());
@@ -204,11 +203,11 @@ public class GnpgoGestioneRichiesteD82DAO extends BaseHibernateDAO{
     }
 
     public GnpgoGestioneRichiesteD82 aggiornaTestataD82(GnpgoGestioneNotificheD82 notifica) {
-  	    List<Criterion> criterion = new ArrayList<Criterion>();
-        //criterion.add(Restrictions.eq("idRichiesta", notifica.getIdRichiesta()));
-        if (findById(notifica.getIdRichiesta()) != null && findByCriteria(criterion).size() > 0) {
-            GnpgoGestioneRichiesteD82 testataD82 = findByCriteria(criterion).get(0);
 
+        // DBCFX_SM_695 - find della richiesta D82 presente sulla tabella GNPGO_GESTIONE_RICHIESTE_D82 per ID_RICHIESTA
+        GnpgoGestioneRichiesteD82 testataD82 = findById(notifica.getIdRichiesta());
+
+        if (testataD82 != null) {
             if (notifica.getTipoComunicazione().equalsIgnoreCase("2")) {
                 testataD82.setCodiceSessione(notifica.getCodiceSessione());
                 testataD82.setStato(notifica.getStato());
diff --git a/gnpdev/dbcfxgo/web/res/content/ricercaOrdineUsciteFTTH.jsp b/gnpdev/dbcfxgo/web/res/content/ricercaOrdineUsciteFTTH.jsp
index 5ba5cc1e..fe1314f7 100644
--- a/gnpdev/dbcfxgo/web/res/content/ricercaOrdineUsciteFTTH.jsp
+++ b/gnpdev/dbcfxgo/web/res/content/ricercaOrdineUsciteFTTH.jsp
@@ -350,7 +350,7 @@
                                                         <h:outputText value="#{donList.codiceSessione}" style="color:black;font-weight:bold;" />
                                                     </h:panelGroup>
                                                     <h:panelGroup>
-                                                        <h:outputText value="Data notifica : "
+                                                        <h:outputText value="Data scadenza : "
                                                                       styleClass="standard_bold_ruby"></h:outputText>
                                                         <h:outputFormat value="{0, date, dd-MM-yyyy}" style="color:black;font-weight:bold;"
                                                                         rendered="#{donList.dataScadenza != null}">