From 033c8001c5ad7b6aaadea0d04dd5b67390060f96 Mon Sep 17 00:00:00 2001 From: marcoalderighi Date: Fri, 21 Apr 2023 10:45:30 +0200 Subject: [PATCH] fix data inizio lavori in avviso FL1 --- .../FL1_avviso_inizio_lavori.jrxml | 5 +++-- .../dist/portos-report-shared-6.2.0.1.jar | Bin 17909 -> 17909 bytes .../WEB-INF/lib/portos-report-shared.jar | Bin 17909 -> 17909 bytes .../report/builder/bean/ReportAvvisoBean.java | 9 +++++++++ .../builder/ReportAvvisoBeanBuilder.java | 3 +++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml b/jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml index 122b5c80..b52d39a4 100644 --- a/jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml +++ b/jasper/reports-2023/FL1_avviso_inizio_lavori.jrxml @@ -2,7 +2,7 @@ - + @@ -31,6 +31,7 @@ + @@ -328,7 +329,7 @@ wCgPZhPf4z delta 63 zcmey`&G@yOkvG7bnT3mifrEiTF|ThTuLiS1Uf)KGHeIHy+|37cqxhMD!jolfEkNR% PBWw?{10^O)yWRo-M6MHF diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index ddf7d3a1927a6dd04344731fe066499c903c1bc6..20791461ea44542a642a8fa45867676f4add3c34 100644 GIT binary patch delta 63 zcmey`&G@yOkvG7bnT3mifrEizXVBD%yc*0qf~Ib?Xwzk?&D(rHH;SJbC_Gu#)&eBH PIl}fJJ5XY>wCgPZhPf4z delta 63 zcmey`&G@yOkvG7bnT3mifrEiTF|ThTuLiS1Uf)KGHeIHy+|37cqxhMD!jolfEkNR% PBWw?{10^O)yWRo-M6MHF diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java index e88b9b60..d746d05d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/bean/ReportAvvisoBean.java @@ -51,6 +51,15 @@ public class ReportAvvisoBean implements Serializable { private boolean richiestaAttestazione; private String dataPraticaString; private String dataFineLavoriString; + private String dataInizioLavoriString; + + public String getDataInizioLavoriString() { + return dataInizioLavoriString; + } + + public void setDataInizioLavoriString(String dataInizioLavoriString) { + this.dataInizioLavoriString = dataInizioLavoriString; + } public String getDataFineLavoriString() { return dataFineLavoriString; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java index 6a3bdb33..e17409c3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoBeanBuilder.java @@ -82,6 +82,9 @@ public class ReportAvvisoBeanBuilder { dettPratica = DettPraticaLocalServiceUtil.getDettPratica(avviso.getClassPk()); bean.setNumeroProtocollo(dettPratica.getProtocollo()); bean.setVarianteNumero(dettPratica.getVarianteNumero()); + bean.setDataInizioLavoriString( + Validator.isNull(dettPratica.getDataInizioLavoriOpera()) ? + StringPool.BLANK : new SimpleDateFormat("dd/MM/yyy").format(dettPratica.getDataInizioLavoriOpera())); // DATI PER INTEGRAZIONE if (dettPratica.getIntegrazione() > 0) { numeroIntegrazione = dettPratica.getIntegrazione();