admin/gateway-dbc-fx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DBCFX_SM_695 - Anomalia viste del. 82 - errata/assente visualizzazione uscite OF

Browse Source
This commit is contained in:
vincenzofariello
2024-11-05 10:10:05 +01:00
parent d1c394eaac
commit 8bdf9151dd
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnpdev/dbcfx/src/it/valueteam/gnp/systemcontroller/formatcontroller/dbcfxgo/DbcfxgoFormatController.java
View File

@@ -1144,9 +1144,11 @@ public class DbcfxgoFormatController extends FormatController{
notifica.setCOW(dbcfxgoOutDel82.getCow()); notifica.setCOW(dbcfxgoOutDel82.getCow());
notifica.setNOME_FILE(dbcfxgoOutDel82.getNomeFile()); 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.setDATA_SCADENZA(DateUtils.toString(dbcfxgoOutDel82.getDataScadenza(), DATE_PATTERN));
} }
notifica.setCOS(dbcfxgoOutDel82.getCos()); notifica.setCOS(dbcfxgoOutDel82.getCos());
notifica.setDN1(dbcfxgoOutDel82.getDn1()); notifica.setDN1(dbcfxgoOutDel82.getDn1());
notifica.setDN2(dbcfxgoOutDel82.getDn2()); notifica.setDN2(dbcfxgoOutDel82.getDn2());

9
gnpdev/dbcfxgo/src/it/valueteam/gnpgo/core/dao/db/hb/GnpgoGestioneRichiesteD82DAO.java
View File

@@ -191,7 +191,6 @@ public class GnpgoGestioneRichiesteD82DAO extends BaseHibernateDAO{
public GnpgoGestioneRichiesteD82 creaTestataD82(GnpgoGestioneNotificheD82 notifica) { public GnpgoGestioneRichiesteD82 creaTestataD82(GnpgoGestioneNotificheD82 notifica) {
GnpgoGestioneRichiesteD82 testataD82 = new GnpgoGestioneRichiesteD82(); GnpgoGestioneRichiesteD82 testataD82 = new GnpgoGestioneRichiesteD82();
testataD82.setStato(0L); testataD82.setStato(0L);
//testataD82.setPiattaformaCrm(notifica.getPiattaformaCrm());
testataD82.setNumeroTelefono(notifica.getNumeroTelefono()); testataD82.setNumeroTelefono(notifica.getNumeroTelefono());
testataD82.setIdRichiesta(notifica.getIdRichiesta()); testataD82.setIdRichiesta(notifica.getIdRichiesta());
testataD82.setOpRecipient(notifica.getOpRecipient()); testataD82.setOpRecipient(notifica.getOpRecipient());
@@ -204,11 +203,11 @@ public class GnpgoGestioneRichiesteD82DAO extends BaseHibernateDAO{
} }
public GnpgoGestioneRichiesteD82 aggiornaTestataD82(GnpgoGestioneNotificheD82 notifica) { 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")) { if (notifica.getTipoComunicazione().equalsIgnoreCase("2")) {
testataD82.setCodiceSessione(notifica.getCodiceSessione()); testataD82.setCodiceSessione(notifica.getCodiceSessione());
testataD82.setStato(notifica.getStato()); testataD82.setStato(notifica.getStato());

2
gnpdev/dbcfxgo/web/res/content/ricercaOrdineUsciteFTTH.jsp
View File

@@ -350,7 +350,7 @@
<h:outputText value="#{donList.codiceSessione}" style="color:black;font-weight:bold;" /> <h:outputText value="#{donList.codiceSessione}" style="color:black;font-weight:bold;" />
</h:panelGroup> </h:panelGroup>
<h:panelGroup> <h:panelGroup>
<h:outputText value="Data notifica : " <h:outputText value="Data scadenza : "
styleClass="standard_bold_ruby"></h:outputText> styleClass="standard_bold_ruby"></h:outputText>
<h:outputFormat value="{0, date, dd-MM-yyyy}" style="color:black;font-weight:bold;" <h:outputFormat value="{0, date, dd-MM-yyyy}" style="color:black;font-weight:bold;"
rendered="#{donList.dataScadenza != null}"> rendered="#{donList.dataScadenza != null}">