diff --git a/liferay-plugins-sdk-6.2/build.portos.properties b/liferay-plugins-sdk-6.2/build.portos.properties index f0db2994..c7ef7abd 100644 --- a/liferay-plugins-sdk-6.2/build.portos.properties +++ b/liferay-plugins-sdk-6.2/build.portos.properties @@ -1,7 +1,9 @@ -app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/lib/ext -app.server.tomcat.deploy.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/webapps -app.server.parent.dir = /home/portos/bin/liferay-paesaggistica -app.server.tomcat.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62 +# Managed by Liferay IDE (remove this comment to prevent future updates) + +app.server.tomcat.lib.global.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext +app.server.tomcat.deploy.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps +app.server.parent.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6 +app.server.tomcat.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62 app.server.type = tomcat -app.server.tomcat.portal.dir = /home/portos/bin/liferay-paesaggistica/tomcat-7.0.62/webapps/ROOT +app.server.tomcat.portal.dir = /home/portos/bin/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT javac.encoding = UTF-8 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/util-java.jar new file mode 100644 index 00000000..6b5d95f8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/lib/util-java.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties index 2e149d63..9ec08e3e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_atti - build.number=24 - build.date=1598351718206 + build.number=25 + build.date=1616602904864 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml index c968ecd9..f679b091 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 index 11baead3..81f1995e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-accesso-atti-portlet/ivy.xml.MD5 @@ -1 +1 @@ -3ae4ba23d25ab17dd579df162025fd7e +987c468ab803b131a7ff0c2ece8911b3 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/axis.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/axis.jar new file mode 100644 index 00000000..a4ad0aa8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/axis.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-logging.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/commons-logging.jar rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/commons-logging.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jaxrpc.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jaxrpc.jar new file mode 100644 index 00000000..a2c13d9a Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jaxrpc.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/jstl-api.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-api.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/jstl-api.jar rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-api.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/jstl-impl.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-impl.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/jstl-impl.jar rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/jstl-impl.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/log4j.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/log4j.jar rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/log4j.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-bridges.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/util-bridges.jar rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-bridges.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-taglib.jar similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/util-taglib.jar rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/util-taglib.jar diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/wsdl4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/wsdl4j.jar new file mode 100644 index 00000000..67a35fcb Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/wsdl4j.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/xml-apis.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/xml-apis.jar new file mode 100644 index 00000000..46733464 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/xml-apis.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index 486d9c48..2f2d8553 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -1,5 +1,6 @@ - + Davide Barbagallo, 3F Consulting portos_bo @@ -36,8 +37,7 @@ - + @@ -86,13 +86,11 @@ - + - + @@ -128,12 +126,7 @@ - - - - - @@ -158,8 +151,7 @@ - + @@ -199,12 +191,10 @@ - + - + @@ -217,15 +207,13 @@ - + - + @@ -243,7 +231,6 @@ - @@ -254,10 +241,6 @@ - - - - @@ -267,8 +250,7 @@ - + @@ -297,7 +279,6 @@ - @@ -306,9 +287,6 @@ - - - @@ -345,12 +323,10 @@ - + - + @@ -365,8 +341,6 @@ - - @@ -376,13 +350,9 @@ - - - - + @@ -411,12 +381,9 @@ - - - + + + @@ -426,8 +393,6 @@ - - @@ -574,7 +539,6 @@ - @@ -591,7 +555,6 @@ - @@ -612,11 +575,9 @@ - - @@ -679,12 +640,9 @@ - - - @@ -693,39 +651,24 @@ - - - - + - - + - - - - - - - + + - + @@ -738,8 +681,7 @@ - + @@ -758,7 +700,6 @@ - @@ -794,13 +735,9 @@ - - - - + @@ -813,8 +750,7 @@ - + @@ -832,7 +768,6 @@ - @@ -864,13 +799,9 @@ - - - - + @@ -943,8 +874,7 @@ - + @@ -973,12 +903,10 @@ - + - + @@ -1019,14 +947,10 @@ - - - - + + + + @@ -1047,12 +971,10 @@ - + - + @@ -1152,8 +1074,7 @@ - + @@ -1164,14 +1085,12 @@ - + - + @@ -1181,8 +1100,7 @@ - + @@ -1214,8 +1132,7 @@ - + @@ -1237,10 +1154,8 @@ - - + + @@ -1253,8 +1168,7 @@ - + @@ -1276,8 +1190,7 @@ - + @@ -1304,8 +1217,7 @@ - + @@ -1347,8 +1259,7 @@ - + @@ -1421,12 +1332,10 @@ - + - + @@ -1462,8 +1371,7 @@ - + @@ -1475,8 +1383,7 @@ - + @@ -1490,8 +1397,7 @@ - + @@ -1530,12 +1436,10 @@ - + - + @@ -1565,12 +1469,10 @@ - + - + @@ -1629,8 +1531,7 @@ - + @@ -1656,21 +1557,18 @@ - + - + - + @@ -1748,19 +1646,16 @@ - + - + - + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java index 71c125f6..69f2607d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoClp.java @@ -100,7 +100,6 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { attributes.put("mezzoPagamento", getMezzoPagamento()); attributes.put("normEsenteBollo", getNormEsenteBollo()); attributes.put("importoBolli", getImportoBolli()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); return attributes; } @@ -257,12 +256,6 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { if (importoBolli != null) { setImportoBolli(importoBolli); } - - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } } @Override @@ -876,30 +869,6 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { } } - @Override - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _oldDettPraticaId = oldDettPraticaId; - - if (_collaudoRemoteModel != null) { - try { - Class clazz = _collaudoRemoteModel.getClass(); - - Method method = clazz.getMethod("setOldDettPraticaId", - long.class); - - method.invoke(_collaudoRemoteModel, oldDettPraticaId); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - @Override public java.lang.String getTitle(java.util.Locale locale) { try { @@ -1057,7 +1026,6 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { clone.setMezzoPagamento(getMezzoPagamento()); clone.setNormEsenteBollo(getNormEsenteBollo()); clone.setImportoBolli(getImportoBolli()); - clone.setOldDettPraticaId(getOldDettPraticaId()); return clone; } @@ -1110,7 +1078,7 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { @Override public String toString() { - StringBundler sb = new StringBundler(53); + StringBundler sb = new StringBundler(51); sb.append("{uuid="); sb.append(getUuid()); @@ -1162,8 +1130,6 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { sb.append(getNormEsenteBollo()); sb.append(", importoBolli="); sb.append(getImportoBolli()); - sb.append(", oldDettPraticaId="); - sb.append(getOldDettPraticaId()); sb.append("}"); return sb.toString(); @@ -1171,7 +1137,7 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { @Override public String toXmlString() { - StringBundler sb = new StringBundler(82); + StringBundler sb = new StringBundler(79); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Collaudo"); @@ -1277,10 +1243,6 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { "importoBolli"); - sb.append( - "oldDettPraticaId"); sb.append(""); @@ -1313,7 +1275,6 @@ public class CollaudoClp extends BaseModelImpl implements Collaudo { private String _mezzoPagamento; private boolean _normEsenteBollo; private String _importoBolli; - private long _oldDettPraticaId; private BaseModel _collaudoRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java index dd2edaf0..c3f66f09 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoModel.java @@ -479,20 +479,6 @@ public interface CollaudoModel extends BaseModel, StagedGroupedModel { */ public void setImportoBolli(String importoBolli); - /** - * Returns the old dett pratica ID of this collaudo. - * - * @return the old dett pratica ID of this collaudo - */ - public long getOldDettPraticaId(); - - /** - * Sets the old dett pratica ID of this collaudo. - * - * @param oldDettPraticaId the old dett pratica ID of this collaudo - */ - public void setOldDettPraticaId(long oldDettPraticaId); - @Override public boolean isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java index 6f82f9be..073e5032 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoSoap.java @@ -56,7 +56,6 @@ public class CollaudoSoap implements Serializable { soapModel.setMezzoPagamento(model.getMezzoPagamento()); soapModel.setNormEsenteBollo(model.getNormEsenteBollo()); soapModel.setImportoBolli(model.getImportoBolli()); - soapModel.setOldDettPraticaId(model.getOldDettPraticaId()); return soapModel; } @@ -325,14 +324,6 @@ public class CollaudoSoap implements Serializable { _importoBolli = importoBolli; } - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - public void setOldDettPraticaId(long oldDettPraticaId) { - _oldDettPraticaId = oldDettPraticaId; - } - private String _uuid; private long _collaudoId; private long _companyId; @@ -358,5 +349,4 @@ public class CollaudoSoap implements Serializable { private String _mezzoPagamento; private boolean _normEsenteBollo; private String _importoBolli; - private long _oldDettPraticaId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java index 8f5fc12b..313e67a7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/CollaudoWrapper.java @@ -75,7 +75,6 @@ public class CollaudoWrapper implements Collaudo, ModelWrapper { attributes.put("mezzoPagamento", getMezzoPagamento()); attributes.put("normEsenteBollo", getNormEsenteBollo()); attributes.put("importoBolli", getImportoBolli()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); return attributes; } @@ -232,12 +231,6 @@ public class CollaudoWrapper implements Collaudo, ModelWrapper { if (importoBolli != null) { setImportoBolli(importoBolli); } - - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } } /** @@ -822,26 +815,6 @@ public class CollaudoWrapper implements Collaudo, ModelWrapper { _collaudo.setImportoBolli(importoBolli); } - /** - * Returns the old dett pratica ID of this collaudo. - * - * @return the old dett pratica ID of this collaudo - */ - @Override - public long getOldDettPraticaId() { - return _collaudo.getOldDettPraticaId(); - } - - /** - * Sets the old dett pratica ID of this collaudo. - * - * @param oldDettPraticaId the old dett pratica ID of this collaudo - */ - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _collaudo.setOldDettPraticaId(oldDettPraticaId); - } - @Override public boolean isNew() { return _collaudo.isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java index 053f5639..b1c70183 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaClp.java @@ -111,7 +111,6 @@ public class DettPraticaClp extends BaseModelImpl attributes.put("workflowForzato", getWorkflowForzato()); attributes.put("soggettoSostituitoId", getSoggettoSostituitoId()); attributes.put("dtInvioSignal", getDtInvioSignal()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); attributes.put("destinazione", getDestinazione()); attributes.put("ag", getAg()); attributes.put("descLongIntervento", getDescLongIntervento()); @@ -627,12 +626,6 @@ public class DettPraticaClp extends BaseModelImpl setDtInvioSignal(dtInvioSignal); } - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } - String destinazione = (String)attributes.get("destinazione"); if (destinazione != null) { @@ -3018,30 +3011,6 @@ public class DettPraticaClp extends BaseModelImpl } } - @Override - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _oldDettPraticaId = oldDettPraticaId; - - if (_dettPraticaRemoteModel != null) { - try { - Class clazz = _dettPraticaRemoteModel.getClass(); - - Method method = clazz.getMethod("setOldDettPraticaId", - long.class); - - method.invoke(_dettPraticaRemoteModel, oldDettPraticaId); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - @Override public String getDestinazione() { return _destinazione; @@ -9650,7 +9619,6 @@ public class DettPraticaClp extends BaseModelImpl clone.setWorkflowForzato(getWorkflowForzato()); clone.setSoggettoSostituitoId(getSoggettoSostituitoId()); clone.setDtInvioSignal(getDtInvioSignal()); - clone.setOldDettPraticaId(getOldDettPraticaId()); clone.setDestinazione(getDestinazione()); clone.setAg(getAg()); clone.setDescLongIntervento(getDescLongIntervento()); @@ -9939,7 +9907,7 @@ public class DettPraticaClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(543); + StringBundler sb = new StringBundler(541); sb.append("{uuid="); sb.append(getUuid()); @@ -10009,8 +9977,6 @@ public class DettPraticaClp extends BaseModelImpl sb.append(getSoggettoSostituitoId()); sb.append(", dtInvioSignal="); sb.append(getDtInvioSignal()); - sb.append(", oldDettPraticaId="); - sb.append(getOldDettPraticaId()); sb.append(", destinazione="); sb.append(getDestinazione()); sb.append(", ag="); @@ -10490,7 +10456,7 @@ public class DettPraticaClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(817); + StringBundler sb = new StringBundler(814); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.DettPratica"); @@ -10632,10 +10598,6 @@ public class DettPraticaClp extends BaseModelImpl "dtInvioSignal"); - sb.append( - "oldDettPraticaId"); sb.append( "destinazione private boolean _workflowForzato; private long _soggettoSostituitoId; private Date _dtInvioSignal; - private long _oldDettPraticaId; private String _destinazione; private String _ag; private String _descLongIntervento; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java index cd3f619d..6888ae90 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaModel.java @@ -636,20 +636,6 @@ public interface DettPraticaModel extends BaseModel, */ public void setDtInvioSignal(Date dtInvioSignal); - /** - * Returns the old dett pratica ID of this dett pratica. - * - * @return the old dett pratica ID of this dett pratica - */ - public long getOldDettPraticaId(); - - /** - * Sets the old dett pratica ID of this dett pratica. - * - * @param oldDettPraticaId the old dett pratica ID of this dett pratica - */ - public void setOldDettPraticaId(long oldDettPraticaId); - /** * Returns the destinazione of this dett pratica. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java index e7aa1f95..f3bab169 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaSoap.java @@ -65,7 +65,6 @@ public class DettPraticaSoap implements Serializable { soapModel.setWorkflowForzato(model.getWorkflowForzato()); soapModel.setSoggettoSostituitoId(model.getSoggettoSostituitoId()); soapModel.setDtInvioSignal(model.getDtInvioSignal()); - soapModel.setOldDettPraticaId(model.getOldDettPraticaId()); soapModel.setDestinazione(model.getDestinazione()); soapModel.setAg(model.getAg()); soapModel.setDescLongIntervento(model.getDescLongIntervento()); @@ -642,14 +641,6 @@ public class DettPraticaSoap implements Serializable { _dtInvioSignal = dtInvioSignal; } - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - public void setOldDettPraticaId(long oldDettPraticaId) { - _oldDettPraticaId = oldDettPraticaId; - } - public String getDestinazione() { return _destinazione; } @@ -3096,7 +3087,6 @@ public class DettPraticaSoap implements Serializable { private boolean _workflowForzato; private long _soggettoSostituitoId; private Date _dtInvioSignal; - private long _oldDettPraticaId; private String _destinazione; private String _ag; private String _descLongIntervento; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java index 77e4a10f..906d92a4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DettPraticaWrapper.java @@ -85,7 +85,6 @@ public class DettPraticaWrapper implements DettPratica, attributes.put("workflowForzato", getWorkflowForzato()); attributes.put("soggettoSostituitoId", getSoggettoSostituitoId()); attributes.put("dtInvioSignal", getDtInvioSignal()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); attributes.put("destinazione", getDestinazione()); attributes.put("ag", getAg()); attributes.put("descLongIntervento", getDescLongIntervento()); @@ -601,12 +600,6 @@ public class DettPraticaWrapper implements DettPratica, setDtInvioSignal(dtInvioSignal); } - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } - String destinazione = (String)attributes.get("destinazione"); if (destinazione != null) { @@ -2942,26 +2935,6 @@ public class DettPraticaWrapper implements DettPratica, _dettPratica.setDtInvioSignal(dtInvioSignal); } - /** - * Returns the old dett pratica ID of this dett pratica. - * - * @return the old dett pratica ID of this dett pratica - */ - @Override - public long getOldDettPraticaId() { - return _dettPratica.getOldDettPraticaId(); - } - - /** - * Sets the old dett pratica ID of this dett pratica. - * - * @param oldDettPraticaId the old dett pratica ID of this dett pratica - */ - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _dettPratica.setOldDettPraticaId(oldDettPraticaId); - } - /** * Returns the destinazione of this dett pratica. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java index 64d4a693..0f7e3968 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaClp.java @@ -99,7 +99,6 @@ public class DocPraticaClp extends BaseModelImpl attributes.put("jsonFirmatari", getJsonFirmatari()); attributes.put("status", getStatus()); attributes.put("errorCode", getErrorCode()); - attributes.put("oldDocPraticaId", getOldDocPraticaId()); attributes.put("rimosso", getRimosso()); attributes.put("dettPraticaIdRimozione", getDettPraticaIdRimozione()); attributes.put("dtDataRimozione", getDtDataRimozione()); @@ -247,12 +246,6 @@ public class DocPraticaClp extends BaseModelImpl setErrorCode(errorCode); } - Long oldDocPraticaId = (Long)attributes.get("oldDocPraticaId"); - - if (oldDocPraticaId != null) { - setOldDocPraticaId(oldDocPraticaId); - } - Boolean rimosso = (Boolean)attributes.get("rimosso"); if (rimosso != null) { @@ -824,29 +817,6 @@ public class DocPraticaClp extends BaseModelImpl } } - @Override - public long getOldDocPraticaId() { - return _oldDocPraticaId; - } - - @Override - public void setOldDocPraticaId(long oldDocPraticaId) { - _oldDocPraticaId = oldDocPraticaId; - - if (_docPraticaRemoteModel != null) { - try { - Class clazz = _docPraticaRemoteModel.getClass(); - - Method method = clazz.getMethod("setOldDocPraticaId", long.class); - - method.invoke(_docPraticaRemoteModel, oldDocPraticaId); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - @Override public boolean getRimosso() { return _rimosso; @@ -1061,7 +1031,6 @@ public class DocPraticaClp extends BaseModelImpl clone.setJsonFirmatari(getJsonFirmatari()); clone.setStatus(getStatus()); clone.setErrorCode(getErrorCode()); - clone.setOldDocPraticaId(getOldDocPraticaId()); clone.setRimosso(getRimosso()); clone.setDettPraticaIdRimozione(getDettPraticaIdRimozione()); clone.setDtDataRimozione(getDtDataRimozione()); @@ -1117,7 +1086,7 @@ public class DocPraticaClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(55); + StringBundler sb = new StringBundler(53); sb.append("{uuid="); sb.append(getUuid()); @@ -1165,8 +1134,6 @@ public class DocPraticaClp extends BaseModelImpl sb.append(getStatus()); sb.append(", errorCode="); sb.append(getErrorCode()); - sb.append(", oldDocPraticaId="); - sb.append(getOldDocPraticaId()); sb.append(", rimosso="); sb.append(getRimosso()); sb.append(", dettPraticaIdRimozione="); @@ -1180,7 +1147,7 @@ public class DocPraticaClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(85); + StringBundler sb = new StringBundler(82); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.DocPratica"); @@ -1278,10 +1245,6 @@ public class DocPraticaClp extends BaseModelImpl "errorCode"); - sb.append( - "oldDocPraticaId"); sb.append( "rimosso private String _jsonFirmatari; private long _status; private String _errorCode; - private long _oldDocPraticaId; private boolean _rimosso; private long _dettPraticaIdRimozione; private Date _dtDataRimozione; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java index df154541..7b3bda65 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaModel.java @@ -439,20 +439,6 @@ public interface DocPraticaModel extends BaseModel, */ public void setErrorCode(String errorCode); - /** - * Returns the old doc pratica ID of this doc pratica. - * - * @return the old doc pratica ID of this doc pratica - */ - public long getOldDocPraticaId(); - - /** - * Sets the old doc pratica ID of this doc pratica. - * - * @param oldDocPraticaId the old doc pratica ID of this doc pratica - */ - public void setOldDocPraticaId(long oldDocPraticaId); - /** * Returns the rimosso of this doc pratica. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java index ec9c56f4..258ac29f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaSoap.java @@ -54,7 +54,6 @@ public class DocPraticaSoap implements Serializable { soapModel.setJsonFirmatari(model.getJsonFirmatari()); soapModel.setStatus(model.getStatus()); soapModel.setErrorCode(model.getErrorCode()); - soapModel.setOldDocPraticaId(model.getOldDocPraticaId()); soapModel.setRimosso(model.getRimosso()); soapModel.setDettPraticaIdRimozione(model.getDettPraticaIdRimozione()); soapModel.setDtDataRimozione(model.getDtDataRimozione()); @@ -302,14 +301,6 @@ public class DocPraticaSoap implements Serializable { _errorCode = errorCode; } - public long getOldDocPraticaId() { - return _oldDocPraticaId; - } - - public void setOldDocPraticaId(long oldDocPraticaId) { - _oldDocPraticaId = oldDocPraticaId; - } - public boolean getRimosso() { return _rimosso; } @@ -361,7 +352,6 @@ public class DocPraticaSoap implements Serializable { private String _jsonFirmatari; private long _status; private String _errorCode; - private long _oldDocPraticaId; private boolean _rimosso; private long _dettPraticaIdRimozione; private Date _dtDataRimozione; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java index 7c528ccc..341087bc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/DocPraticaWrapper.java @@ -73,7 +73,6 @@ public class DocPraticaWrapper implements DocPratica, ModelWrapper { attributes.put("jsonFirmatari", getJsonFirmatari()); attributes.put("status", getStatus()); attributes.put("errorCode", getErrorCode()); - attributes.put("oldDocPraticaId", getOldDocPraticaId()); attributes.put("rimosso", getRimosso()); attributes.put("dettPraticaIdRimozione", getDettPraticaIdRimozione()); attributes.put("dtDataRimozione", getDtDataRimozione()); @@ -221,12 +220,6 @@ public class DocPraticaWrapper implements DocPratica, ModelWrapper { setErrorCode(errorCode); } - Long oldDocPraticaId = (Long)attributes.get("oldDocPraticaId"); - - if (oldDocPraticaId != null) { - setOldDocPraticaId(oldDocPraticaId); - } - Boolean rimosso = (Boolean)attributes.get("rimosso"); if (rimosso != null) { @@ -769,26 +762,6 @@ public class DocPraticaWrapper implements DocPratica, ModelWrapper { _docPratica.setErrorCode(errorCode); } - /** - * Returns the old doc pratica ID of this doc pratica. - * - * @return the old doc pratica ID of this doc pratica - */ - @Override - public long getOldDocPraticaId() { - return _docPratica.getOldDocPraticaId(); - } - - /** - * Sets the old doc pratica ID of this doc pratica. - * - * @param oldDocPraticaId the old doc pratica ID of this doc pratica - */ - @Override - public void setOldDocPraticaId(long oldDocPraticaId) { - _docPratica.setOldDocPraticaId(oldDocPraticaId); - } - /** * Returns the rimosso of this doc pratica. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java index 5914a942..7b1699ce 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriClp.java @@ -103,7 +103,6 @@ public class FineLavoriClp extends BaseModelImpl attributes.put("causalePagamento", getCausalePagamento()); attributes.put("mezzoPagamento", getMezzoPagamento()); attributes.put("importoBolli", getImportoBolli()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); return attributes; } @@ -268,12 +267,6 @@ public class FineLavoriClp extends BaseModelImpl if (importoBolli != null) { setImportoBolli(importoBolli); } - - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } } @Override @@ -919,30 +912,6 @@ public class FineLavoriClp extends BaseModelImpl } } - @Override - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _oldDettPraticaId = oldDettPraticaId; - - if (_fineLavoriRemoteModel != null) { - try { - Class clazz = _fineLavoriRemoteModel.getClass(); - - Method method = clazz.getMethod("setOldDettPraticaId", - long.class); - - method.invoke(_fineLavoriRemoteModel, oldDettPraticaId); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - @Override public java.lang.String getTitle(java.util.Locale locale) { try { @@ -1101,7 +1070,6 @@ public class FineLavoriClp extends BaseModelImpl clone.setCausalePagamento(getCausalePagamento()); clone.setMezzoPagamento(getMezzoPagamento()); clone.setImportoBolli(getImportoBolli()); - clone.setOldDettPraticaId(getOldDettPraticaId()); return clone; } @@ -1154,7 +1122,7 @@ public class FineLavoriClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(55); + StringBundler sb = new StringBundler(53); sb.append("{uuid="); sb.append(getUuid()); @@ -1208,8 +1176,6 @@ public class FineLavoriClp extends BaseModelImpl sb.append(getMezzoPagamento()); sb.append(", importoBolli="); sb.append(getImportoBolli()); - sb.append(", oldDettPraticaId="); - sb.append(getOldDettPraticaId()); sb.append("}"); return sb.toString(); @@ -1217,7 +1183,7 @@ public class FineLavoriClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(85); + StringBundler sb = new StringBundler(82); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.FineLavori"); @@ -1327,10 +1293,6 @@ public class FineLavoriClp extends BaseModelImpl "importoBolli"); - sb.append( - "oldDettPraticaId"); sb.append(""); @@ -1364,7 +1326,6 @@ public class FineLavoriClp extends BaseModelImpl private String _causalePagamento; private String _mezzoPagamento; private String _importoBolli; - private long _oldDettPraticaId; private BaseModel _fineLavoriRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java index 5e39541f..af48c702 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriModel.java @@ -502,20 +502,6 @@ public interface FineLavoriModel extends BaseModel, */ public void setImportoBolli(String importoBolli); - /** - * Returns the old dett pratica ID of this fine lavori. - * - * @return the old dett pratica ID of this fine lavori - */ - public long getOldDettPraticaId(); - - /** - * Sets the old dett pratica ID of this fine lavori. - * - * @param oldDettPraticaId the old dett pratica ID of this fine lavori - */ - public void setOldDettPraticaId(long oldDettPraticaId); - @Override public boolean isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java index 9c2f4256..9eb254fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriSoap.java @@ -57,7 +57,6 @@ public class FineLavoriSoap implements Serializable { soapModel.setCausalePagamento(model.getCausalePagamento()); soapModel.setMezzoPagamento(model.getMezzoPagamento()); soapModel.setImportoBolli(model.getImportoBolli()); - soapModel.setOldDettPraticaId(model.getOldDettPraticaId()); return soapModel; } @@ -339,14 +338,6 @@ public class FineLavoriSoap implements Serializable { _importoBolli = importoBolli; } - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - public void setOldDettPraticaId(long oldDettPraticaId) { - _oldDettPraticaId = oldDettPraticaId; - } - private String _uuid; private long _fineLavoriId; private long _companyId; @@ -373,5 +364,4 @@ public class FineLavoriSoap implements Serializable { private String _causalePagamento; private String _mezzoPagamento; private String _importoBolli; - private long _oldDettPraticaId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java index 93490ba2..23a1b864 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/FineLavoriWrapper.java @@ -77,7 +77,6 @@ public class FineLavoriWrapper implements FineLavori, ModelWrapper { attributes.put("causalePagamento", getCausalePagamento()); attributes.put("mezzoPagamento", getMezzoPagamento()); attributes.put("importoBolli", getImportoBolli()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); return attributes; } @@ -242,12 +241,6 @@ public class FineLavoriWrapper implements FineLavori, ModelWrapper { if (importoBolli != null) { setImportoBolli(importoBolli); } - - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } } /** @@ -863,26 +856,6 @@ public class FineLavoriWrapper implements FineLavori, ModelWrapper { _fineLavori.setImportoBolli(importoBolli); } - /** - * Returns the old dett pratica ID of this fine lavori. - * - * @return the old dett pratica ID of this fine lavori - */ - @Override - public long getOldDettPraticaId() { - return _fineLavori.getOldDettPraticaId(); - } - - /** - * Sets the old dett pratica ID of this fine lavori. - * - * @param oldDettPraticaId the old dett pratica ID of this fine lavori - */ - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _fineLavori.setOldDettPraticaId(oldDettPraticaId); - } - @Override public boolean isNew() { return _fineLavori.isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java index dd88f8a0..11dad491 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioClp.java @@ -106,7 +106,6 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio attributes.put("mesePrecedente", getMesePrecedente()); attributes.put("esterna", getEsterna()); attributes.put("praticaEsternaId", getPraticaEsternaId()); - attributes.put("oldSorteggioId", getOldSorteggioId()); return attributes; } @@ -292,12 +291,6 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio if (praticaEsternaId != null) { setPraticaEsternaId(praticaEsternaId); } - - Long oldSorteggioId = (Long)attributes.get("oldSorteggioId"); - - if (oldSorteggioId != null) { - setOldSorteggioId(oldSorteggioId); - } } @Override @@ -1020,29 +1013,6 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio } } - @Override - public long getOldSorteggioId() { - return _oldSorteggioId; - } - - @Override - public void setOldSorteggioId(long oldSorteggioId) { - _oldSorteggioId = oldSorteggioId; - - if (_sorteggioRemoteModel != null) { - try { - Class clazz = _sorteggioRemoteModel.getClass(); - - Method method = clazz.getMethod("setOldSorteggioId", long.class); - - method.invoke(_sorteggioRemoteModel, oldSorteggioId); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - @Override public boolean mesePrecedenteToBoolean() { try { @@ -1255,7 +1225,6 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio clone.setMesePrecedente(getMesePrecedente()); clone.setEsterna(getEsterna()); clone.setPraticaEsternaId(getPraticaEsternaId()); - clone.setOldSorteggioId(getOldSorteggioId()); return clone; } @@ -1308,7 +1277,7 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio @Override public String toString() { - StringBundler sb = new StringBundler(63); + StringBundler sb = new StringBundler(61); sb.append("{uuid="); sb.append(getUuid()); @@ -1370,8 +1339,6 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio sb.append(getEsterna()); sb.append(", praticaEsternaId="); sb.append(getPraticaEsternaId()); - sb.append(", oldSorteggioId="); - sb.append(getOldSorteggioId()); sb.append("}"); return sb.toString(); @@ -1379,7 +1346,7 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio @Override public String toXmlString() { - StringBundler sb = new StringBundler(97); + StringBundler sb = new StringBundler(94); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Sorteggio"); @@ -1505,10 +1472,6 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio "praticaEsternaId"); - sb.append( - "oldSorteggioId"); sb.append(""); @@ -1547,7 +1510,6 @@ public class SorteggioClp extends BaseModelImpl implements Sorteggio private String _mesePrecedente; private boolean _esterna; private long _praticaEsternaId; - private long _oldSorteggioId; private BaseModel _sorteggioRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java index d1d890d3..1be0174a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioModel.java @@ -560,20 +560,6 @@ public interface SorteggioModel extends BaseModel, StagedGroupedModel */ public void setPraticaEsternaId(long praticaEsternaId); - /** - * Returns the old sorteggio ID of this sorteggio. - * - * @return the old sorteggio ID of this sorteggio - */ - public long getOldSorteggioId(); - - /** - * Sets the old sorteggio ID of this sorteggio. - * - * @param oldSorteggioId the old sorteggio ID of this sorteggio - */ - public void setOldSorteggioId(long oldSorteggioId); - /** * @deprecated As of 6.1.0, replaced by {@link #isApproved()} */ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java index e1d17aa8..6705fbe4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioSoap.java @@ -61,7 +61,6 @@ public class SorteggioSoap implements Serializable { soapModel.setMesePrecedente(model.getMesePrecedente()); soapModel.setEsterna(model.getEsterna()); soapModel.setPraticaEsternaId(model.getPraticaEsternaId()); - soapModel.setOldSorteggioId(model.getOldSorteggioId()); return soapModel; } @@ -358,14 +357,6 @@ public class SorteggioSoap implements Serializable { _praticaEsternaId = praticaEsternaId; } - public long getOldSorteggioId() { - return _oldSorteggioId; - } - - public void setOldSorteggioId(long oldSorteggioId) { - _oldSorteggioId = oldSorteggioId; - } - private String _uuid; private long _sorteggioId; private long _companyId; @@ -396,5 +387,4 @@ public class SorteggioSoap implements Serializable { private String _mesePrecedente; private boolean _esterna; private long _praticaEsternaId; - private long _oldSorteggioId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java index 63f543d3..9be326c1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/SorteggioWrapper.java @@ -80,7 +80,6 @@ public class SorteggioWrapper implements Sorteggio, ModelWrapper { attributes.put("mesePrecedente", getMesePrecedente()); attributes.put("esterna", getEsterna()); attributes.put("praticaEsternaId", getPraticaEsternaId()); - attributes.put("oldSorteggioId", getOldSorteggioId()); return attributes; } @@ -266,12 +265,6 @@ public class SorteggioWrapper implements Sorteggio, ModelWrapper { if (praticaEsternaId != null) { setPraticaEsternaId(praticaEsternaId); } - - Long oldSorteggioId = (Long)attributes.get("oldSorteggioId"); - - if (oldSorteggioId != null) { - setOldSorteggioId(oldSorteggioId); - } } /** @@ -948,26 +941,6 @@ public class SorteggioWrapper implements Sorteggio, ModelWrapper { _sorteggio.setPraticaEsternaId(praticaEsternaId); } - /** - * Returns the old sorteggio ID of this sorteggio. - * - * @return the old sorteggio ID of this sorteggio - */ - @Override - public long getOldSorteggioId() { - return _sorteggio.getOldSorteggioId(); - } - - /** - * Sets the old sorteggio ID of this sorteggio. - * - * @param oldSorteggioId the old sorteggio ID of this sorteggio - */ - @Override - public void setOldSorteggioId(long oldSorteggioId) { - _sorteggio.setOldSorteggioId(oldSorteggioId); - } - /** * @deprecated As of 6.1.0, replaced by {@link #isApproved()} */ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java index dd0513dc..b73c9a34 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaClp.java @@ -87,8 +87,6 @@ public class StoricoSoggettoPraticaClp extends BaseModelImpl clazz = _storicoSoggettoPraticaRemoteModel.getClass(); - - Method method = clazz.getMethod("setOldStoricoSoggettoPraticaId", - long.class); - - method.invoke(_storicoSoggettoPraticaRemoteModel, - oldStoricoSoggettoPraticaId); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - public BaseModel getStoricoSoggettoPraticaRemoteModel() { return _storicoSoggettoPraticaRemoteModel; } @@ -542,7 +508,6 @@ public class StoricoSoggettoPraticaClp extends BaseModelImpl"); sb.append("it.tref.liferay.portos.bo.model.StoricoSoggettoPratica"); @@ -677,10 +640,6 @@ public class StoricoSoggettoPraticaClp extends BaseModelImplcodiceFiscale"); - sb.append( - "oldStoricoSoggettoPraticaId"); sb.append(""); @@ -699,7 +658,6 @@ public class StoricoSoggettoPraticaClp extends BaseModelImpl _storicoSoggettoPraticaRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java index 39cee054..d9fef6aa 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/StoricoSoggettoPraticaModel.java @@ -249,20 +249,6 @@ public interface StoricoSoggettoPraticaModel extends BaseModel attributes.put("stop", getStop()); attributes.put("wait", getWait()); attributes.put("completo", getCompleto()); - attributes.put("oldTempisticaId", getOldTempisticaId()); return attributes; } @@ -187,12 +186,6 @@ public class TempisticaClp extends BaseModelImpl if (completo != null) { setCompleto(completo); } - - Long oldTempisticaId = (Long)attributes.get("oldTempisticaId"); - - if (oldTempisticaId != null) { - setOldTempisticaId(oldTempisticaId); - } } @Override @@ -555,29 +548,6 @@ public class TempisticaClp extends BaseModelImpl } } - @Override - public long getOldTempisticaId() { - return _oldTempisticaId; - } - - @Override - public void setOldTempisticaId(long oldTempisticaId) { - _oldTempisticaId = oldTempisticaId; - - if (_tempisticaRemoteModel != null) { - try { - Class clazz = _tempisticaRemoteModel.getClass(); - - Method method = clazz.getMethod("setOldTempisticaId", long.class); - - method.invoke(_tempisticaRemoteModel, oldTempisticaId); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -668,7 +638,6 @@ public class TempisticaClp extends BaseModelImpl clone.setStop(getStop()); clone.setWait(getWait()); clone.setCompleto(getCompleto()); - clone.setOldTempisticaId(getOldTempisticaId()); return clone; } @@ -721,7 +690,7 @@ public class TempisticaClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(33); + StringBundler sb = new StringBundler(31); sb.append("{uuid="); sb.append(getUuid()); @@ -753,8 +722,6 @@ public class TempisticaClp extends BaseModelImpl sb.append(getWait()); sb.append(", completo="); sb.append(getCompleto()); - sb.append(", oldTempisticaId="); - sb.append(getOldTempisticaId()); sb.append("}"); return sb.toString(); @@ -762,7 +729,7 @@ public class TempisticaClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(52); + StringBundler sb = new StringBundler(49); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Tempistica"); @@ -828,10 +795,6 @@ public class TempisticaClp extends BaseModelImpl "completo"); - sb.append( - "oldTempisticaId"); sb.append(""); @@ -854,7 +817,6 @@ public class TempisticaClp extends BaseModelImpl private long _stop; private long _wait; private boolean _completo; - private long _oldTempisticaId; private BaseModel _tempisticaRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java index 91947abc..250186bd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaModel.java @@ -313,20 +313,6 @@ public interface TempisticaModel extends BaseModel, */ public void setCompleto(boolean completo); - /** - * Returns the old tempistica ID of this tempistica. - * - * @return the old tempistica ID of this tempistica - */ - public long getOldTempisticaId(); - - /** - * Sets the old tempistica ID of this tempistica. - * - * @param oldTempisticaId the old tempistica ID of this tempistica - */ - public void setOldTempisticaId(long oldTempisticaId); - @Override public boolean isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java index 0c049d92..11aa339d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaSoap.java @@ -46,7 +46,6 @@ public class TempisticaSoap implements Serializable { soapModel.setStop(model.getStop()); soapModel.setWait(model.getWait()); soapModel.setCompleto(model.getCompleto()); - soapModel.setOldTempisticaId(model.getOldTempisticaId()); return soapModel; } @@ -223,14 +222,6 @@ public class TempisticaSoap implements Serializable { _completo = completo; } - public long getOldTempisticaId() { - return _oldTempisticaId; - } - - public void setOldTempisticaId(long oldTempisticaId) { - _oldTempisticaId = oldTempisticaId; - } - private String _uuid; private long _tempisticaId; private long _companyId; @@ -246,5 +237,4 @@ public class TempisticaSoap implements Serializable { private long _stop; private long _wait; private boolean _completo; - private long _oldTempisticaId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java index 15c520d6..ce917e8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/TempisticaWrapper.java @@ -65,7 +65,6 @@ public class TempisticaWrapper implements Tempistica, ModelWrapper { attributes.put("stop", getStop()); attributes.put("wait", getWait()); attributes.put("completo", getCompleto()); - attributes.put("oldTempisticaId", getOldTempisticaId()); return attributes; } @@ -161,12 +160,6 @@ public class TempisticaWrapper implements Tempistica, ModelWrapper { if (completo != null) { setCompleto(completo); } - - Long oldTempisticaId = (Long)attributes.get("oldTempisticaId"); - - if (oldTempisticaId != null) { - setOldTempisticaId(oldTempisticaId); - } } /** @@ -521,26 +514,6 @@ public class TempisticaWrapper implements Tempistica, ModelWrapper { _tempistica.setCompleto(completo); } - /** - * Returns the old tempistica ID of this tempistica. - * - * @return the old tempistica ID of this tempistica - */ - @Override - public long getOldTempisticaId() { - return _tempistica.getOldTempisticaId(); - } - - /** - * Sets the old tempistica ID of this tempistica. - * - * @param oldTempisticaId the old tempistica ID of this tempistica - */ - @Override - public void setOldTempisticaId(long oldTempisticaId) { - _tempistica.setOldTempisticaId(oldTempisticaId); - } - @Override public boolean isNew() { return _tempistica.isNew(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java index bcf536de..bf139b57 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalService.java @@ -432,9 +432,4 @@ public interface CollaudoLocalService extends BaseLocalService, public int countCollaudiCompletiNotGestiti() throws com.liferay.portal.kernel.exception.SystemException; - - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java index bd1f292f..108efa5c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceClp.java @@ -258,10 +258,6 @@ public class CollaudoLocalServiceClp implements CollaudoLocalService { _methodName47 = "countCollaudiCompletiNotGestiti"; _methodParameterTypes47 = new String[] { }; - - _methodName48 = "fetchByOldDettPraticaId"; - - _methodParameterTypes48 = new String[] { "long" }; } @Override @@ -1843,35 +1839,6 @@ public class CollaudoLocalServiceClp implements CollaudoLocalService { return ((Integer)returnObj).intValue(); } - @Override - public it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, new Object[] { oldDettPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.Collaudo)ClpSerializer.translateOutput(returnObj); - } - private InvokableLocalService _invokableLocalService; private String _methodName0; private String[] _methodParameterTypes0; @@ -1967,6 +1934,4 @@ public class CollaudoLocalServiceClp implements CollaudoLocalService { private String[] _methodParameterTypes46; private String _methodName47; private String[] _methodParameterTypes47; - private String _methodName48; - private String[] _methodParameterTypes48; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java index 12dea105..45c5bed8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceUtil.java @@ -527,12 +527,6 @@ public class CollaudoLocalServiceUtil { return getService().countCollaudiCompletiNotGestiti(); } - public static it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().fetchByOldDettPraticaId(oldDettPraticaId); - } - public static void clearService() { _service = null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java index cf820b85..3b698da1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/CollaudoLocalServiceWrapper.java @@ -562,13 +562,6 @@ public class CollaudoLocalServiceWrapper implements CollaudoLocalService, return _collaudoLocalService.countCollaudiCompletiNotGestiti(); } - @Override - public it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _collaudoLocalService.fetchByOldDettPraticaId(oldDettPraticaId); - } - /** * @deprecated As of 6.1.0, replaced by {@link #getWrappedService} */ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java index 671723f8..c8a6c0e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalService.java @@ -312,6 +312,7 @@ public interface ControlloPraticaLocalService extends BaseLocalService, java.lang.String[] parameterTypes, java.lang.Object[] arguments) throws java.lang.Throwable; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.ControlloPratica addControlloPratica( long groupId, long userId, long intPraticaId, long dettPraticaId, boolean updateFlagControlloObbligatorio, @@ -338,6 +339,7 @@ public interface ControlloPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.ControlloPratica updateStatus( long userId, long resourcePrimKey, int status, com.liferay.portal.service.ServiceContext serviceContext, @@ -352,13 +354,6 @@ public interface ControlloPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - @java.lang.Deprecated - public boolean updateStatoPraticaGeneraDocumentoFinale( - long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - public boolean generaDocumentoFinale(long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, java.util.Map workflowContext) @@ -370,17 +365,8 @@ public interface ControlloPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - @java.lang.Deprecated - public java.lang.String valutazioneEsitoFinale(long controlloPraticaId, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - /** * I valori di ritorno possibili sono: approvato,non_approvato,annullato,richiesta_integrazione - * - * @throws SystemException - * @throws PortalException */ public java.lang.String valutazioneEsitoFinaleUpdateStatoPratica( long controlloPraticaId, @@ -388,6 +374,7 @@ public interface ControlloPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public void aggiornaStatoPerRichiestaIntegrazione(long controlloPraticaId, java.util.Map workflowContext) throws com.liferay.portal.kernel.exception.PortalException, @@ -405,6 +392,7 @@ public interface ControlloPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.ControlloPratica addPraticheAlControllo( long controlloPraticaId, long dettPraticaId) throws com.liferay.portal.kernel.exception.PortalException, @@ -412,13 +400,8 @@ public interface ControlloPraticaLocalService extends BaseLocalService, /** * ADT: BUG ID=5 - tracciamento operazione aggiungi varianti al controllo - * - * @param controlloPraticaId - * @param dettPraticaId - * @return - * @throws PortalException - * @throws SystemException */ + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.ControlloPratica addPraticheAlControlloVarianti( long controlloPraticaId, long dettPraticaId, com.liferay.portal.service.ServiceContext serviceContext) @@ -447,9 +430,6 @@ public interface ControlloPraticaLocalService extends BaseLocalService, /** * ADT: gestione workflow varianti - * - * @param dettPraticaId - * @throws Exception */ public void gestioneWFVarianti( it.tref.liferay.portos.bo.model.ControlloPratica cp); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java index 9b4eac2b..791759ef 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceClp.java @@ -174,71 +174,61 @@ public class ControlloPraticaLocalServiceClp "java.util.Map" }; - _methodName30 = "updateStatoPraticaGeneraDocumentoFinale"; + _methodName30 = "generaDocumentoFinale"; _methodParameterTypes30 = new String[] { "long", "java.lang.String", "long", "java.util.Map" }; - _methodName31 = "generaDocumentoFinale"; + _methodName31 = "updateIstruttore"; - _methodParameterTypes31 = new String[] { - "long", "java.lang.String", "long", "java.util.Map" - }; + _methodParameterTypes31 = new String[] { "long", "java.util.Map" }; - _methodName32 = "updateIstruttore"; + _methodName32 = "valutazioneEsitoFinaleUpdateStatoPratica"; _methodParameterTypes32 = new String[] { "long", "java.util.Map" }; - _methodName33 = "valutazioneEsitoFinale"; + _methodName33 = "aggiornaStatoPerRichiestaIntegrazione"; _methodParameterTypes33 = new String[] { "long", "java.util.Map" }; - _methodName34 = "valutazioneEsitoFinaleUpdateStatoPratica"; + _methodName34 = "getJsonListaIstruttori"; _methodParameterTypes34 = new String[] { "long", "java.util.Map" }; - _methodName35 = "aggiornaStatoPerRichiestaIntegrazione"; + _methodName35 = "getJsonEsitoPratica"; _methodParameterTypes35 = new String[] { "long", "java.util.Map" }; - _methodName36 = "getJsonListaIstruttori"; - - _methodParameterTypes36 = new String[] { "long", "java.util.Map" }; - - _methodName37 = "getJsonEsitoPratica"; + _methodName36 = "addPraticheAlControllo"; - _methodParameterTypes37 = new String[] { "long", "java.util.Map" }; + _methodParameterTypes36 = new String[] { "long", "long" }; - _methodName38 = "addPraticheAlControllo"; + _methodName37 = "addPraticheAlControlloVarianti"; - _methodParameterTypes38 = new String[] { "long", "long" }; - - _methodName39 = "addPraticheAlControlloVarianti"; - - _methodParameterTypes39 = new String[] { + _methodParameterTypes37 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName40 = "getReturnValueScriptIniziale"; + _methodName38 = "getReturnValueScriptIniziale"; - _methodParameterTypes40 = new String[] { "long" }; + _methodParameterTypes38 = new String[] { "long" }; - _methodName41 = "getTipoEsito"; + _methodName39 = "getTipoEsito"; - _methodParameterTypes41 = new String[] { "long" }; + _methodParameterTypes39 = new String[] { "long" }; - _methodName42 = "findByIntPratica"; + _methodName40 = "findByIntPratica"; - _methodParameterTypes42 = new String[] { "long" }; + _methodParameterTypes40 = new String[] { "long" }; - _methodName43 = "calculateDateAvvioProcedimento"; + _methodName41 = "calculateDateAvvioProcedimento"; - _methodParameterTypes43 = new String[] { "long" }; + _methodParameterTypes41 = new String[] { "long" }; - _methodName44 = "gestioneWFVarianti"; + _methodName42 = "gestioneWFVarianti"; - _methodParameterTypes44 = new String[] { + _methodParameterTypes42 = new String[] { "it.tref.liferay.portos.bo.model.ControlloPratica" }; } @@ -1209,50 +1199,6 @@ public class ControlloPraticaLocalServiceClp return ((Boolean)returnObj).booleanValue(); } - @Override - public boolean updateStatoPraticaGeneraDocumentoFinale( - long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, - new Object[] { - controlloPraticaId, - - ClpSerializer.translateInput(jsonParams), - - userIdFirma, - - ClpSerializer.translateInput(workflowContext) - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Boolean)returnObj).booleanValue(); - } - @Override public boolean generaDocumentoFinale(long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, @@ -1262,8 +1208,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { controlloPraticaId, @@ -1303,8 +1249,8 @@ public class ControlloPraticaLocalServiceClp throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, + _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { controlloPraticaId, @@ -1332,45 +1278,6 @@ public class ControlloPraticaLocalServiceClp } } - @Override - public java.lang.String valutazioneEsitoFinale(long controlloPraticaId, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, - new Object[] { - controlloPraticaId, - - ClpSerializer.translateInput(workflowContext) - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (java.lang.String)ClpSerializer.translateOutput(returnObj); - } - @Override public java.lang.String valutazioneEsitoFinaleUpdateStatoPratica( long controlloPraticaId, @@ -1380,8 +1287,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName34, - _methodParameterTypes34, + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { controlloPraticaId, @@ -1417,8 +1324,8 @@ public class ControlloPraticaLocalServiceClp throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName35, - _methodParameterTypes35, + _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { controlloPraticaId, @@ -1454,8 +1361,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, + returnObj = _invokableLocalService.invokeMethod(_methodName34, + _methodParameterTypes34, new Object[] { controlloPraticaId, @@ -1493,8 +1400,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, + returnObj = _invokableLocalService.invokeMethod(_methodName35, + _methodParameterTypes35, new Object[] { controlloPraticaId, @@ -1532,8 +1439,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { controlloPraticaId, dettPraticaId }); } catch (Throwable t) { @@ -1568,8 +1475,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { controlloPraticaId, @@ -1609,8 +1516,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, new Object[] { controlloPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { controlloPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1642,8 +1549,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, new Object[] { controlloPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { controlloPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1675,8 +1582,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1705,8 +1612,8 @@ public class ControlloPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, new Object[] { controlloPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { controlloPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1735,8 +1642,8 @@ public class ControlloPraticaLocalServiceClp public void gestioneWFVarianti( it.tref.liferay.portos.bo.model.ControlloPratica cp) { try { - _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { ClpSerializer.translateInput(cp) }); } catch (Throwable t) { @@ -1837,8 +1744,4 @@ public class ControlloPraticaLocalServiceClp private String[] _methodParameterTypes41; private String _methodName42; private String[] _methodParameterTypes42; - private String _methodName43; - private String[] _methodParameterTypes43; - private String _methodName44; - private String[] _methodParameterTypes44; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java index 92be71e6..8264c658 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceUtil.java @@ -401,16 +401,6 @@ public class ControlloPraticaLocalServiceUtil { tipoAvviso, userIdFirma, workflowContext); } - public static boolean updateStatoPraticaGeneraDocumentoFinale( - long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .updateStatoPraticaGeneraDocumentoFinale(controlloPraticaId, - jsonParams, userIdFirma, workflowContext); - } - public static boolean generaDocumentoFinale(long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, java.util.Map workflowContext) @@ -428,20 +418,8 @@ public class ControlloPraticaLocalServiceUtil { getService().updateIstruttore(controlloPraticaId, workflowContext); } - public static java.lang.String valutazioneEsitoFinale( - long controlloPraticaId, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .valutazioneEsitoFinale(controlloPraticaId, workflowContext); - } - /** * I valori di ritorno possibili sono: approvato,non_approvato,annullato,richiesta_integrazione - * - * @throws SystemException - * @throws PortalException */ public static java.lang.String valutazioneEsitoFinaleUpdateStatoPratica( long controlloPraticaId, @@ -491,12 +469,6 @@ public class ControlloPraticaLocalServiceUtil { /** * ADT: BUG ID=5 - tracciamento operazione aggiungi varianti al controllo - * - * @param controlloPraticaId - * @param dettPraticaId - * @return - * @throws PortalException - * @throws SystemException */ public static it.tref.liferay.portos.bo.model.ControlloPratica addPraticheAlControlloVarianti( long controlloPraticaId, long dettPraticaId, @@ -536,9 +508,6 @@ public class ControlloPraticaLocalServiceUtil { /** * ADT: gestione workflow varianti - * - * @param dettPraticaId - * @throws Exception */ public static void gestioneWFVarianti( it.tref.liferay.portos.bo.model.ControlloPratica cp) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java index b1905d05..ba3a1359 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/ControlloPraticaLocalServiceWrapper.java @@ -427,16 +427,6 @@ public class ControlloPraticaLocalServiceWrapper jsonParams, tipoAvviso, userIdFirma, workflowContext); } - @Override - public boolean updateStatoPraticaGeneraDocumentoFinale( - long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _controlloPraticaLocalService.updateStatoPraticaGeneraDocumentoFinale(controlloPraticaId, - jsonParams, userIdFirma, workflowContext); - } - @Override public boolean generaDocumentoFinale(long controlloPraticaId, java.lang.String jsonParams, long userIdFirma, @@ -456,20 +446,8 @@ public class ControlloPraticaLocalServiceWrapper workflowContext); } - @Override - public java.lang.String valutazioneEsitoFinale(long controlloPraticaId, - java.util.Map workflowContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _controlloPraticaLocalService.valutazioneEsitoFinale(controlloPraticaId, - workflowContext); - } - /** * I valori di ritorno possibili sono: approvato,non_approvato,annullato,richiesta_integrazione - * - * @throws SystemException - * @throws PortalException */ @Override public java.lang.String valutazioneEsitoFinaleUpdateStatoPratica( @@ -519,12 +497,6 @@ public class ControlloPraticaLocalServiceWrapper /** * ADT: BUG ID=5 - tracciamento operazione aggiungi varianti al controllo - * - * @param controlloPraticaId - * @param dettPraticaId - * @return - * @throws PortalException - * @throws SystemException */ @Override public it.tref.liferay.portos.bo.model.ControlloPratica addPraticheAlControlloVarianti( @@ -568,9 +540,6 @@ public class ControlloPraticaLocalServiceWrapper /** * ADT: gestione workflow varianti - * - * @param dettPraticaId - * @throws Exception */ @Override public void gestioneWFVarianti( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java index e33a52d0..21463860 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalService.java @@ -334,8 +334,9 @@ public interface DettPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica cloneDettagliSoggetti( - long dettPraticaId, long dettPraticaToCloneId) + long dettPraticaId, long sourceId) throws com.liferay.portal.kernel.exception.SystemException, it.tref.liferay.portos.bo.NoSuchDettPraticaException; @@ -387,12 +388,6 @@ public interface DettPraticaLocalService extends BaseLocalService, long intPraticaId, long dettPraticaId) throws com.liferay.portal.kernel.exception.SystemException; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.DettPratica getByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public java.util.List search( com.liferay.portal.kernel.search.SearchContext searchContext) @@ -425,12 +420,12 @@ public interface DettPraticaLocalService extends BaseLocalService, java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -759,6 +754,7 @@ public interface DettPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updateDettPraticaPagamento( long dettPraticaId, java.lang.String importoSpeseIstruttoria, java.lang.String importoBolli, @@ -780,19 +776,23 @@ public interface DettPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updateCheckPagamenti( long dettPraticaId, boolean normEsenteSpese, boolean normEsenteBollo) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, - java.lang.String stato) + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) + public it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException; - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, - long fileEntryId, java.lang.String stato) + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) + public it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, long fileEntryId, + java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException; @@ -801,12 +801,14 @@ public interface DettPraticaLocalService extends BaseLocalService, public boolean isControlloObbligatorio( it.tref.liferay.portos.bo.model.DettPratica dettPratica); + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updateEsito( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updateEsitoIntegrazione( long dettPraticaId, int stato) throws com.liferay.portal.kernel.exception.PortalException, @@ -842,6 +844,7 @@ public interface DettPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updateDettPraticaProtocollo( long dettPraticaId, java.lang.String protocollo) throws com.liferay.portal.kernel.exception.PortalException, @@ -901,20 +904,18 @@ public interface DettPraticaLocalService extends BaseLocalService, public int countPraticheCompletateNonversionate() throws com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updateDettPraticaGestita( long dettPraticaId, boolean gestita) throws com.liferay.portal.kernel.exception.SystemException; - public void updateAsset( - it.tref.liferay.portos.bo.model.DettPratica dettPratica, - long[] categoryIds, boolean visible) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - public void updateStatus(long dettPraticaId, int status) + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) + public it.tref.liferay.portos.bo.model.DettPratica updateStatus( + long dettPraticaId, int status) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updateSignal( long dettPraticaId, java.util.Date dtInvioSignal) throws com.liferay.portal.kernel.exception.SystemException; @@ -940,6 +941,7 @@ public interface DettPraticaLocalService extends BaseLocalService, long pagamentoId) throws com.liferay.portal.kernel.exception.SystemException; + @com.liferay.portal.kernel.search.Indexable(type = IndexableType.REINDEX) public it.tref.liferay.portos.bo.model.DettPratica updatePrincipale( long dettPraticaId, java.lang.String codiceFiscale, java.lang.String tipologiaSoggetto) @@ -960,20 +962,11 @@ public interface DettPraticaLocalService extends BaseLocalService, public com.liferay.portal.kernel.json.JSONArray callForChanges( java.lang.String url) throws java.lang.Exception; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - public int countVariateByIntPratica(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException; /** * ADT: nuovo metodo per stampa fascicolo - * - * @param intPraticaId - * @return - * @throws SystemException */ @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public it.tref.liferay.portos.bo.model.DettPratica getFirstCompletedByIntPratica( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java index fe147d31..1a7e60f3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceClp.java @@ -197,60 +197,56 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { _methodParameterTypes36 = new String[] { "long", "long" }; - _methodName37 = "getByOldDettPraticaId"; + _methodName37 = "search"; - _methodParameterTypes37 = new String[] { "long" }; - - _methodName38 = "search"; - - _methodParameterTypes38 = new String[] { + _methodParameterTypes37 = new String[] { "com.liferay.portal.kernel.search.SearchContext" }; - _methodName39 = "searchCount"; + _methodName38 = "searchCount"; - _methodParameterTypes39 = new String[] { + _methodParameterTypes38 = new String[] { "com.liferay.portal.kernel.search.SearchContext" }; - _methodName40 = "updateDettPraticaSoggetti"; + _methodName39 = "updateDettPraticaSoggetti"; - _methodParameterTypes40 = new String[] { + _methodParameterTypes39 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName41 = "updateDettPratica"; + _methodName40 = "updateDettPratica"; - _methodParameterTypes41 = new String[] { + _methodParameterTypes40 = new String[] { "long", "long", "long", "long", "java.lang.String", "java.lang.String", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.util.Date", "int", "boolean", "long", - "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "long", "long", - "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "boolean", "java.util.Date", "java.util.Date", - "java.util.Date", "java.lang.String", "boolean", "long", "int", + "java.lang.String", "long", "long", "boolean", "boolean", + "boolean", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "java.util.Date", "java.util.Date", "java.util.Date", + "java.lang.String", "boolean", "long", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -258,32 +254,32 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.util.Date", - "java.lang.Double", "java.lang.Double", "java.lang.Double", + "java.util.Date", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", - "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "java.lang.Double", "java.lang.String", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "java.lang.String", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", - "java.lang.String", "com.liferay.portal.service.ServiceContext", - "boolean", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.Boolean", - "java.lang.Boolean", "java.lang.Boolean", "java.lang.String", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "java.lang.String", + "com.liferay.portal.service.ServiceContext", "boolean", + "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.Boolean", "java.lang.Boolean", + "java.lang.Boolean", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "double", "java.lang.String" + "boolean", "double", "java.lang.String" }; - _methodName42 = "updateDettPraticaDatiDomanda"; + _methodName41 = "updateDettPraticaDatiDomanda"; - _methodParameterTypes42 = new String[] { + _methodParameterTypes41 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -323,9 +319,9 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "boolean", "java.lang.String" }; - _methodName43 = "updateDettPraticaDatiIntegrazione"; + _methodName42 = "updateDettPraticaDatiIntegrazione"; - _methodParameterTypes43 = new String[] { + _methodParameterTypes42 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", @@ -349,9 +345,9 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "boolean", "boolean", "boolean", "java.lang.String" }; - _methodName44 = "updateDettPraticaGeologo"; + _methodName43 = "updateDettPraticaGeologo"; - _methodParameterTypes44 = new String[] { + _methodParameterTypes43 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -363,9 +359,9 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "com.liferay.portal.service.ServiceContext", "boolean" }; - _methodName45 = "updateDettPraticaPagamento"; + _methodName44 = "updateDettPraticaPagamento"; - _methodParameterTypes45 = new String[] { + _methodParameterTypes44 = new String[] { "long", "java.lang.String", "java.lang.String", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", @@ -375,39 +371,39 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "java.lang.Double", "com.liferay.portal.service.ServiceContext" }; - _methodName46 = "updateCheckPagamenti"; + _methodName45 = "updateCheckPagamenti"; - _methodParameterTypes46 = new String[] { "long", "boolean", "boolean" }; + _methodParameterTypes45 = new String[] { "long", "boolean", "boolean" }; - _methodName47 = "updateEsitoPagamento"; + _methodName46 = "updateEsitoPagamento"; - _methodParameterTypes47 = new String[] { + _methodParameterTypes46 = new String[] { "long", "long", "java.lang.String" }; - _methodName48 = "updateEsitoPagamento"; + _methodName47 = "updateEsitoPagamento"; - _methodParameterTypes48 = new String[] { + _methodParameterTypes47 = new String[] { "long", "long", "long", "java.lang.String" }; - _methodName49 = "isControlloObbligatorio"; + _methodName48 = "isControlloObbligatorio"; - _methodParameterTypes49 = new String[] { + _methodParameterTypes48 = new String[] { "it.tref.liferay.portos.bo.model.DettPratica" }; - _methodName50 = "updateEsito"; + _methodName49 = "updateEsito"; - _methodParameterTypes50 = new String[] { "long", "int" }; + _methodParameterTypes49 = new String[] { "long", "int" }; - _methodName51 = "updateEsitoIntegrazione"; + _methodName50 = "updateEsitoIntegrazione"; - _methodParameterTypes51 = new String[] { "long", "int" }; + _methodParameterTypes50 = new String[] { "long", "int" }; - _methodName52 = "pagaInvia"; + _methodName51 = "pagaInvia"; - _methodParameterTypes52 = new String[] { + _methodParameterTypes51 = new String[] { "long", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", @@ -418,149 +414,138 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { "com.liferay.portal.service.ServiceContext" }; - _methodName53 = "updateStatus"; + _methodName52 = "updateStatus"; - _methodParameterTypes53 = new String[] { + _methodParameterTypes52 = new String[] { "long", "long", "int", "com.liferay.portal.service.ServiceContext" }; - _methodName54 = "updateDettPraticaProtocollo"; + _methodName53 = "updateDettPraticaProtocollo"; - _methodParameterTypes54 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes53 = new String[] { "long", "java.lang.String" }; - _methodName55 = "findByProtocollo"; + _methodName54 = "findByProtocollo"; - _methodParameterTypes55 = new String[] { + _methodParameterTypes54 = new String[] { "long", "long", "java.lang.String" }; - _methodName56 = "fetchByProtocollo"; + _methodName55 = "fetchByProtocollo"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes55 = new String[] { "long", "long", "java.lang.String" }; - _methodName57 = "fetchByProtocollo"; + _methodName56 = "fetchByProtocollo"; - _methodParameterTypes57 = new String[] { "java.lang.String" }; + _methodParameterTypes56 = new String[] { "java.lang.String" }; - _methodName58 = "findByIntPraticaId"; + _methodName57 = "findByIntPraticaId"; - _methodParameterTypes58 = new String[] { "long" }; + _methodParameterTypes57 = new String[] { "long" }; - _methodName59 = "findByIntPraticaIdInviate"; + _methodName58 = "findByIntPraticaIdInviate"; - _methodParameterTypes59 = new String[] { "long", "int", "int" }; + _methodParameterTypes58 = new String[] { "long", "int", "int" }; - _methodName60 = "findPraticheCompleteNotProtocollo"; + _methodName59 = "findPraticheCompleteNotProtocollo"; - _methodParameterTypes60 = new String[] { "int", "int" }; + _methodParameterTypes59 = new String[] { "int", "int" }; - _methodName61 = "countPraticheCompleteNotProtocollo"; + _methodName60 = "countPraticheCompleteNotProtocollo"; - _methodParameterTypes61 = new String[] { }; + _methodParameterTypes60 = new String[] { }; - _methodName62 = "findPraticheCompleteNotGestite"; + _methodName61 = "findPraticheCompleteNotGestite"; - _methodParameterTypes62 = new String[] { "int", "int" }; + _methodParameterTypes61 = new String[] { "int", "int" }; - _methodName63 = "countPraticheCompleteNotGestite"; + _methodName62 = "countPraticheCompleteNotGestite"; - _methodParameterTypes63 = new String[] { }; + _methodParameterTypes62 = new String[] { }; - _methodName64 = "findByIntPraticaId_TipoIntegrazione_Completa"; + _methodName63 = "findByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes64 = new String[] { + _methodParameterTypes63 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName65 = "countByIntPraticaId_TipoIntegrazione_Completa"; + _methodName64 = "countByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes65 = new String[] { + _methodParameterTypes64 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName66 = "findPraticheCompletateNonVersionate"; - - _methodParameterTypes66 = new String[] { "int", "int" }; + _methodName65 = "findPraticheCompletateNonVersionate"; - _methodName67 = "countPraticheCompletateNonversionate"; + _methodParameterTypes65 = new String[] { "int", "int" }; - _methodParameterTypes67 = new String[] { }; + _methodName66 = "countPraticheCompletateNonversionate"; - _methodName68 = "updateDettPraticaGestita"; + _methodParameterTypes66 = new String[] { }; - _methodParameterTypes68 = new String[] { "long", "boolean" }; + _methodName67 = "updateDettPraticaGestita"; - _methodName69 = "updateAsset"; - - _methodParameterTypes69 = new String[] { - "it.tref.liferay.portos.bo.model.DettPratica", "long[][]", - "boolean" - }; + _methodParameterTypes67 = new String[] { "long", "boolean" }; - _methodName70 = "updateStatus"; + _methodName68 = "updateStatus"; - _methodParameterTypes70 = new String[] { "long", "int" }; + _methodParameterTypes68 = new String[] { "long", "int" }; - _methodName71 = "updateSignal"; + _methodName69 = "updateSignal"; - _methodParameterTypes71 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes69 = new String[] { "long", "java.util.Date" }; - _methodName72 = "countInvioSignal"; + _methodName70 = "countInvioSignal"; - _methodParameterTypes72 = new String[] { }; + _methodParameterTypes70 = new String[] { }; - _methodName73 = "getInvioSignal"; + _methodName71 = "getInvioSignal"; - _methodParameterTypes73 = new String[] { "long" }; + _methodParameterTypes71 = new String[] { "long" }; - _methodName74 = "getInviiSignal"; + _methodName72 = "getInviiSignal"; - _methodParameterTypes74 = new String[] { "int", "int" }; + _methodParameterTypes72 = new String[] { "int", "int" }; - _methodName75 = "dynamicQueryInvioSignal"; + _methodName73 = "dynamicQueryInvioSignal"; - _methodParameterTypes75 = new String[] { "java.lang.Long" }; + _methodParameterTypes73 = new String[] { "java.lang.Long" }; - _methodName76 = "findByPagamentoId"; + _methodName74 = "findByPagamentoId"; - _methodParameterTypes76 = new String[] { "long" }; + _methodParameterTypes74 = new String[] { "long" }; - _methodName77 = "updatePrincipale"; + _methodName75 = "updatePrincipale"; - _methodParameterTypes77 = new String[] { + _methodParameterTypes75 = new String[] { "long", "java.lang.String", "java.lang.String" }; - _methodName78 = "sendToVersioning"; + _methodName76 = "sendToVersioning"; - _methodParameterTypes78 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes76 = new String[] { "long", "java.lang.String" }; - _methodName79 = "getNumeroDiVersioni"; + _methodName77 = "getNumeroDiVersioni"; - _methodParameterTypes79 = new String[] { "java.lang.String" }; - - _methodName80 = "getVersionNumber"; + _methodParameterTypes77 = new String[] { "java.lang.String" }; - _methodParameterTypes80 = new String[] { "java.lang.String", "int" }; + _methodName78 = "getVersionNumber"; - _methodName81 = "callForChanges"; + _methodParameterTypes78 = new String[] { "java.lang.String", "int" }; - _methodParameterTypes81 = new String[] { "java.lang.String" }; + _methodName79 = "callForChanges"; - _methodName82 = "fetchByOldDettPraticaId"; - - _methodParameterTypes82 = new String[] { "long" }; + _methodParameterTypes79 = new String[] { "java.lang.String" }; - _methodName83 = "countVariateByIntPratica"; + _methodName80 = "countVariateByIntPratica"; - _methodParameterTypes83 = new String[] { "long" }; + _methodParameterTypes80 = new String[] { "long" }; - _methodName84 = "getFirstCompletedByIntPratica"; + _methodName81 = "getFirstCompletedByIntPratica"; - _methodParameterTypes84 = new String[] { "long" }; + _methodParameterTypes81 = new String[] { "long" }; } @Override @@ -1377,7 +1362,7 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { @Override public it.tref.liferay.portos.bo.model.DettPratica cloneDettagliSoggetti( - long dettPraticaId, long dettPraticaToCloneId) + long dettPraticaId, long sourceId) throws com.liferay.portal.kernel.exception.SystemException, it.tref.liferay.portos.bo.NoSuchDettPraticaException { Object returnObj = null; @@ -1385,7 +1370,7 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { try { returnObj = _invokableLocalService.invokeMethod(_methodName26, _methodParameterTypes26, - new Object[] { dettPraticaId, dettPraticaToCloneId }); + new Object[] { dettPraticaId, sourceId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1728,40 +1713,6 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { return (java.util.List)ClpSerializer.translateOutput(returnObj); } - @Override - public it.tref.liferay.portos.bo.model.DettPratica getByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, new Object[] { oldDettPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.DettPratica)ClpSerializer.translateOutput(returnObj); - } - @Override public java.util.List search( com.liferay.portal.kernel.search.SearchContext searchContext) @@ -1770,8 +1721,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { ClpSerializer.translateInput(searchContext) }); } catch (Throwable t) { @@ -1804,8 +1755,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { ClpSerializer.translateInput(searchContext) }); } catch (Throwable t) { @@ -1839,8 +1790,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { userId, @@ -1893,12 +1844,12 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -2033,8 +1984,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { userId, @@ -2070,8 +2021,6 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { soggettoSostituitoId, - oldDettPraticaId, - ClpSerializer.translateInput(destinazione), ClpSerializer.translateInput(ag), @@ -2615,8 +2564,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { userId, @@ -3041,8 +2990,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { userId, @@ -3298,8 +3247,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { userId, @@ -3405,8 +3354,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { dettPraticaId, @@ -3480,8 +3429,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { dettPraticaId, normEsenteSpese, normEsenteBollo }); } catch (Throwable t) { @@ -3508,21 +3457,23 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } @Override - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, - java.lang.String stato) + public it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { + Object returnObj = null; + try { - _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, - new Object[] { - pagamentoId, - - dettPraticaId, - - ClpSerializer.translateInput(stato) - }); + returnObj = _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, + new Object[] { + pagamentoId, + + dettPraticaId, + + ClpSerializer.translateInput(stato) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3547,26 +3498,31 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { " is not a valid exception"); } } + + return (it.tref.liferay.portos.bo.model.DettPratica)ClpSerializer.translateOutput(returnObj); } @Override - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, - long fileEntryId, java.lang.String stato) + public it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, long fileEntryId, + java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { + Object returnObj = null; + try { - _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, - new Object[] { - pagamentoId, - - dettPraticaId, - - fileEntryId, - - ClpSerializer.translateInput(stato) - }); + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, + new Object[] { + pagamentoId, + + dettPraticaId, + + fileEntryId, + + ClpSerializer.translateInput(stato) + }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -3591,6 +3547,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { " is not a valid exception"); } } + + return (it.tref.liferay.portos.bo.model.DettPratica)ClpSerializer.translateOutput(returnObj); } @Override @@ -3599,8 +3557,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { ClpSerializer.translateInput(dettPratica) }); } catch (Throwable t) { @@ -3627,8 +3585,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { dettPraticaId, stato }); } catch (Throwable t) { @@ -3667,8 +3625,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { dettPraticaId, stato }); } catch (Throwable t) { @@ -3723,8 +3681,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { dettPraticaId, @@ -3801,8 +3759,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { userId, @@ -3844,8 +3802,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { dettPraticaId, @@ -3883,8 +3841,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { companyId, @@ -3924,8 +3882,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { companyId, @@ -3965,8 +3923,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { ClpSerializer.translateInput(protocollo) }); } catch (Throwable t) { @@ -3999,8 +3957,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4028,8 +3986,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { intPraticaId, start, end }); } catch (Throwable t) { @@ -4058,8 +4016,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4086,8 +4044,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4115,8 +4073,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4143,8 +4101,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4172,8 +4130,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, + returnObj = _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { intPraticaId, @@ -4208,8 +4166,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + returnObj = _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { intPraticaId, @@ -4244,8 +4202,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName65, + _methodParameterTypes65, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4272,8 +4230,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName67, - _methodParameterTypes67, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName66, + _methodParameterTypes66, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4301,8 +4259,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName68, - _methodParameterTypes68, + returnObj = _invokableLocalService.invokeMethod(_methodName67, + _methodParameterTypes67, new Object[] { dettPraticaId, gestita }); } catch (Throwable t) { @@ -4325,50 +4283,16 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { } @Override - public void updateAsset( - it.tref.liferay.portos.bo.model.DettPratica dettPratica, - long[] categoryIds, boolean visible) + public it.tref.liferay.portos.bo.model.DettPratica updateStatus( + long dettPraticaId, int status) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - try { - _invokableLocalService.invokeMethod(_methodName69, - _methodParameterTypes69, - new Object[] { - ClpSerializer.translateInput(dettPratica), - - ClpSerializer.translateInput(categoryIds), - - visible - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - } + Object returnObj = null; - @Override - public void updateStatus(long dettPraticaId, int status) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName70, - _methodParameterTypes70, new Object[] { dettPraticaId, status }); + returnObj = _invokableLocalService.invokeMethod(_methodName68, + _methodParameterTypes68, + new Object[] { dettPraticaId, status }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4389,6 +4313,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { " is not a valid exception"); } } + + return (it.tref.liferay.portos.bo.model.DettPratica)ClpSerializer.translateOutput(returnObj); } @Override @@ -4398,8 +4324,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName71, - _methodParameterTypes71, + returnObj = _invokableLocalService.invokeMethod(_methodName69, + _methodParameterTypes69, new Object[] { dettPraticaId, @@ -4431,8 +4357,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName72, - _methodParameterTypes72, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName70, + _methodParameterTypes70, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4460,8 +4386,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName73, - _methodParameterTypes73, new Object[] { dettPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName71, + _methodParameterTypes71, new Object[] { dettPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4489,8 +4415,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName74, - _methodParameterTypes74, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName72, + _methodParameterTypes72, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4518,8 +4444,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName75, - _methodParameterTypes75, + returnObj = _invokableLocalService.invokeMethod(_methodName73, + _methodParameterTypes73, new Object[] { ClpSerializer.translateInput(dettPraticaId) }); } catch (Throwable t) { @@ -4548,8 +4474,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName76, - _methodParameterTypes76, new Object[] { pagamentoId }); + returnObj = _invokableLocalService.invokeMethod(_methodName74, + _methodParameterTypes74, new Object[] { pagamentoId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4579,8 +4505,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName77, - _methodParameterTypes77, + returnObj = _invokableLocalService.invokeMethod(_methodName75, + _methodParameterTypes75, new Object[] { dettPraticaId, @@ -4616,8 +4542,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { public void sendToVersioning(long dettPraticaId, java.lang.String url) throws java.lang.Exception { try { - _invokableLocalService.invokeMethod(_methodName78, - _methodParameterTypes78, + _invokableLocalService.invokeMethod(_methodName76, + _methodParameterTypes76, new Object[] { dettPraticaId, ClpSerializer.translateInput(url) }); } catch (Throwable t) { @@ -4643,8 +4569,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName79, - _methodParameterTypes79, + returnObj = _invokableLocalService.invokeMethod(_methodName77, + _methodParameterTypes77, new Object[] { ClpSerializer.translateInput(url) }); } catch (Throwable t) { @@ -4676,8 +4602,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName80, - _methodParameterTypes80, + returnObj = _invokableLocalService.invokeMethod(_methodName78, + _methodParameterTypes78, new Object[] { ClpSerializer.translateInput(url), version }); } catch (Throwable t) { @@ -4705,8 +4631,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName81, - _methodParameterTypes81, + returnObj = _invokableLocalService.invokeMethod(_methodName79, + _methodParameterTypes79, new Object[] { ClpSerializer.translateInput(url) }); } catch (Throwable t) { @@ -4728,43 +4654,14 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { return (com.liferay.portal.kernel.json.JSONArray)ClpSerializer.translateOutput(returnObj); } - @Override - public it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName82, - _methodParameterTypes82, new Object[] { oldDettPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.DettPratica)ClpSerializer.translateOutput(returnObj); - } - @Override public int countVariateByIntPratica(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName83, - _methodParameterTypes83, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName80, + _methodParameterTypes80, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4792,8 +4689,8 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName84, - _methodParameterTypes84, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName81, + _methodParameterTypes81, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -4977,10 +4874,4 @@ public class DettPraticaLocalServiceClp implements DettPraticaLocalService { private String[] _methodParameterTypes80; private String _methodName81; private String[] _methodParameterTypes81; - private String _methodName82; - private String[] _methodParameterTypes82; - private String _methodName83; - private String[] _methodParameterTypes83; - private String _methodName84; - private String[] _methodParameterTypes84; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java index feb2693b..3cb19286 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceUtil.java @@ -367,11 +367,10 @@ public class DettPraticaLocalServiceUtil { } public static it.tref.liferay.portos.bo.model.DettPratica cloneDettagliSoggetti( - long dettPraticaId, long dettPraticaToCloneId) + long dettPraticaId, long sourceId) throws com.liferay.portal.kernel.exception.SystemException, it.tref.liferay.portos.bo.NoSuchDettPraticaException { - return getService() - .cloneDettagliSoggetti(dettPraticaId, dettPraticaToCloneId); + return getService().cloneDettagliSoggetti(dettPraticaId, sourceId); } public static it.tref.liferay.portos.bo.model.DettPratica addDettPraticaForImport( @@ -448,13 +447,6 @@ public class DettPraticaLocalServiceUtil { dettPraticaId); } - public static it.tref.liferay.portos.bo.model.DettPratica getByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService().getByOldDettPraticaId(oldDettPraticaId); - } - public static java.util.List search( com.liferay.portal.kernel.search.SearchContext searchContext) throws com.liferay.portal.kernel.exception.PortalException, @@ -493,12 +485,12 @@ public class DettPraticaLocalServiceUtil { java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -635,11 +627,10 @@ public class DettPraticaLocalServiceUtil { integrazione, protocollo, tipoIntegrazione, completa, gestita, codicePagamentoOneri, causalePagamentoOneri, mezzoPagamentoOneri, importoBolli, importoSpeseIstruttoria, dataEffettuazione, - statusTask, workflowForzato, soggettoSostituitoId, - oldDettPraticaId, destinazione, ag, descLongIntervento, via, - localita, estremiCatastali, estremiPratCom, variataDa, - varianteNumero, varianteSostanziale, operaConforme, - collaudoStatico, codiceFiscaleDelegatoCommittente, + statusTask, workflowForzato, soggettoSostituitoId, destinazione, + ag, descLongIntervento, via, localita, estremiCatastali, + estremiPratCom, variataDa, varianteNumero, varianteSostanziale, + operaConforme, collaudoStatico, codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, dataInizioLavoriOpera, @@ -1059,21 +1050,24 @@ public class DettPraticaLocalServiceUtil { normEsenteBollo); } - public static void updateEsitoPagamento(long pagamentoId, - long dettPraticaId, java.lang.String stato) + public static it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { - getService().updateEsitoPagamento(pagamentoId, dettPraticaId, stato); + return getService() + .updateEsitoPagamento(pagamentoId, dettPraticaId, stato); } - public static void updateEsitoPagamento(long pagamentoId, - long dettPraticaId, long fileEntryId, java.lang.String stato) + public static it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, long fileEntryId, + java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { - getService() - .updateEsitoPagamento(pagamentoId, dettPraticaId, fileEntryId, stato); + return getService() + .updateEsitoPagamento(pagamentoId, dettPraticaId, + fileEntryId, stato); } public static boolean isControlloObbligatorio( @@ -1235,18 +1229,11 @@ public class DettPraticaLocalServiceUtil { return getService().updateDettPraticaGestita(dettPraticaId, gestita); } - public static void updateAsset( - it.tref.liferay.portos.bo.model.DettPratica dettPratica, - long[] categoryIds, boolean visible) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - getService().updateAsset(dettPratica, categoryIds, visible); - } - - public static void updateStatus(long dettPraticaId, int status) + public static it.tref.liferay.portos.bo.model.DettPratica updateStatus( + long dettPraticaId, int status) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - getService().updateStatus(dettPraticaId, status); + return getService().updateStatus(dettPraticaId, status); } public static it.tref.liferay.portos.bo.model.DettPratica updateSignal( @@ -1314,12 +1301,6 @@ public class DettPraticaLocalServiceUtil { return getService().callForChanges(url); } - public static it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().fetchByOldDettPraticaId(oldDettPraticaId); - } - public static int countVariateByIntPratica(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { return getService().countVariateByIntPratica(intPraticaId); @@ -1327,10 +1308,6 @@ public class DettPraticaLocalServiceUtil { /** * ADT: nuovo metodo per stampa fascicolo - * - * @param intPraticaId - * @return - * @throws SystemException */ public static it.tref.liferay.portos.bo.model.DettPratica getFirstCompletedByIntPratica( long intPraticaId) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java index 83e429ea..c4ae9389 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaLocalServiceWrapper.java @@ -390,11 +390,11 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, @Override public it.tref.liferay.portos.bo.model.DettPratica cloneDettagliSoggetti( - long dettPraticaId, long dettPraticaToCloneId) + long dettPraticaId, long sourceId) throws com.liferay.portal.kernel.exception.SystemException, it.tref.liferay.portos.bo.NoSuchDettPraticaException { return _dettPraticaLocalService.cloneDettagliSoggetti(dettPraticaId, - dettPraticaToCloneId); + sourceId); } @Override @@ -474,14 +474,6 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, dettPraticaId); } - @Override - public it.tref.liferay.portos.bo.model.DettPratica getByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _dettPraticaLocalService.getByOldDettPraticaId(oldDettPraticaId); - } - @Override public java.util.List search( com.liferay.portal.kernel.search.SearchContext searchContext) @@ -523,12 +515,12 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -665,24 +657,23 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, tipoIntegrazione, completa, gestita, codicePagamentoOneri, causalePagamentoOneri, mezzoPagamentoOneri, importoBolli, importoSpeseIstruttoria, dataEffettuazione, statusTask, - workflowForzato, soggettoSostituitoId, oldDettPraticaId, - destinazione, ag, descLongIntervento, via, localita, - estremiCatastali, estremiPratCom, variataDa, varianteNumero, - varianteSostanziale, operaConforme, collaudoStatico, - codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, - lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, - dataInizioLavoriOpera, dataInizioEsecuzioneOpera, - dataFineEsecuzioneOpera, metratura, lavoriPubblici, - pagamentoIdOneri, lavoriPubbliciPercentuale, numeroCivico, - dcParticelle, dcFoglio, dcAllegato, dePiani, deAltezza, - deInterrati, deSuperficie, deCostruzione, deRistrutturazione, - deUso, dePubblica, dePrivata, deUtilizzazione, dePosizioneEdificio, - deInfStradalePonte, deInfStradaleStrada, deInfStradaleAltro, - deInfIdraulicaLong, deInfIdraulicaTrasv, deInfIdraulicaAltro, - deInfOperaAccStradale, deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, - dccFondazioni, dccStruttureEleMuraturePietrame, + workflowForzato, soggettoSostituitoId, destinazione, ag, + descLongIntervento, via, localita, estremiCatastali, + estremiPratCom, variataDa, varianteNumero, varianteSostanziale, + operaConforme, collaudoStatico, codiceFiscaleDelegatoCommittente, + codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, + codiceRuoloDelegato, lavoriInEconomiaCommittente, + inizioLavoriContestualeOpera, dataInizioLavoriOpera, + dataInizioEsecuzioneOpera, dataFineEsecuzioneOpera, metratura, + lavoriPubblici, pagamentoIdOneri, lavoriPubbliciPercentuale, + numeroCivico, dcParticelle, dcFoglio, dcAllegato, dePiani, + deAltezza, deInterrati, deSuperficie, deCostruzione, + deRistrutturazione, deUso, dePubblica, dePrivata, deUtilizzazione, + dePosizioneEdificio, deInfStradalePonte, deInfStradaleStrada, + deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, + deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, + deInfOperaAccAltro, deInfAltraInfrastruttura, deInfAltro, + deInfAltroDesc, dccFondazioni, dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, @@ -1090,22 +1081,23 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, } @Override - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, - java.lang.String stato) + public it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { - _dettPraticaLocalService.updateEsitoPagamento(pagamentoId, + return _dettPraticaLocalService.updateEsitoPagamento(pagamentoId, dettPraticaId, stato); } @Override - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, - long fileEntryId, java.lang.String stato) + public it.tref.liferay.portos.bo.model.DettPratica updateEsitoPagamento( + long pagamentoId, long dettPraticaId, long fileEntryId, + java.lang.String stato) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { - _dettPraticaLocalService.updateEsitoPagamento(pagamentoId, + return _dettPraticaLocalService.updateEsitoPagamento(pagamentoId, dettPraticaId, fileEntryId, stato); } @@ -1295,19 +1287,11 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, } @Override - public void updateAsset( - it.tref.liferay.portos.bo.model.DettPratica dettPratica, - long[] categoryIds, boolean visible) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - _dettPraticaLocalService.updateAsset(dettPratica, categoryIds, visible); - } - - @Override - public void updateStatus(long dettPraticaId, int status) + public it.tref.liferay.portos.bo.model.DettPratica updateStatus( + long dettPraticaId, int status) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { - _dettPraticaLocalService.updateStatus(dettPraticaId, status); + return _dettPraticaLocalService.updateStatus(dettPraticaId, status); } @Override @@ -1386,13 +1370,6 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, return _dettPraticaLocalService.callForChanges(url); } - @Override - public it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _dettPraticaLocalService.fetchByOldDettPraticaId(oldDettPraticaId); - } - @Override public int countVariateByIntPratica(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { @@ -1401,10 +1378,6 @@ public class DettPraticaLocalServiceWrapper implements DettPraticaLocalService, /** * ADT: nuovo metodo per stampa fascicolo - * - * @param intPraticaId - * @return - * @throws SystemException */ @Override public it.tref.liferay.portos.bo.model.DettPratica getFirstCompletedByIntPratica( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java index 8fcbd950..59455136 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaService.java @@ -124,12 +124,12 @@ public interface DettPraticaService extends BaseService, InvokableService { java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java index ac3547c0..bea75350 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceClp.java @@ -84,30 +84,30 @@ public class DettPraticaServiceClp implements DettPraticaService { "java.lang.String", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.util.Date", "int", "boolean", "long", - "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "long", "long", - "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "boolean", "java.util.Date", "java.util.Date", - "java.util.Date", "java.lang.String", "boolean", "long", "int", + "java.lang.String", "long", "long", "boolean", "boolean", + "boolean", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "java.util.Date", "java.util.Date", "java.util.Date", + "java.lang.String", "boolean", "long", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -115,28 +115,27 @@ public class DettPraticaServiceClp implements DettPraticaService { "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.util.Date", + "java.util.Date", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", - "java.lang.Double", "java.lang.Double", "java.lang.Double", - "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.Double", "java.lang.String", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "java.lang.String", + "com.liferay.portal.service.ServiceContext", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "java.lang.Boolean", + "java.lang.Boolean", "java.lang.Boolean", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", - "java.lang.String", "com.liferay.portal.service.ServiceContext", - "boolean", "boolean", "boolean", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.Boolean", "java.lang.Boolean", "java.lang.Boolean", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", "double", - "java.lang.String" + "boolean", "boolean", "boolean", "double", "java.lang.String" }; _methodName12 = "fetchDettPratica"; @@ -590,12 +589,12 @@ public class DettPraticaServiceClp implements DettPraticaService { java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -767,8 +766,6 @@ public class DettPraticaServiceClp implements DettPraticaService { soggettoSostituitoId, - oldDettPraticaId, - ClpSerializer.translateInput(destinazione), ClpSerializer.translateInput(ag), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java index 764b1705..8d43a66a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceUtil.java @@ -144,12 +144,12 @@ public class DettPraticaServiceUtil { java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -286,24 +286,23 @@ public class DettPraticaServiceUtil { integrazione, protocollo, tipoIntegrazione, completa, gestita, codicePagamento, causalePagamento, mezzoPagamento, importoBolli, importoSpeseIstruttoria, dataEffettuazione, statusTask, - workflowForzato, soggettoSostituitoId, oldDettPraticaId, - destinazione, ag, descLongIntervento, via, localita, - estremiCatastali, estremiPratCom, variataDa, varianteNumero, - varianteSostanziale, operaConforme, collaudoStatico, - codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, - lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, - dataInizioLavoriOpera, dataInizioEsecuzioneOpera, - dataFineEsecuzioneOpera, metratura, lavoriPubblici, pagamentoId, - lavoriPubbliciPercentuale, numeroCivico, dcParticelle, dcFoglio, - dcAllegato, dePiani, deAltezza, deInterrati, deSuperficie, - deCostruzione, deRistrutturazione, deUso, dePubblica, dePrivata, - deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, - deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, - deInfIdraulicaTrasv, deInfIdraulicaAltro, deInfOperaAccStradale, - deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, - dccFondazioni, dccStruttureEleMuraturePietrame, + workflowForzato, soggettoSostituitoId, destinazione, ag, + descLongIntervento, via, localita, estremiCatastali, + estremiPratCom, variataDa, varianteNumero, varianteSostanziale, + operaConforme, collaudoStatico, codiceFiscaleDelegatoCommittente, + codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, + codiceRuoloDelegato, lavoriInEconomiaCommittente, + inizioLavoriContestualeOpera, dataInizioLavoriOpera, + dataInizioEsecuzioneOpera, dataFineEsecuzioneOpera, metratura, + lavoriPubblici, pagamentoId, lavoriPubbliciPercentuale, + numeroCivico, dcParticelle, dcFoglio, dcAllegato, dePiani, + deAltezza, deInterrati, deSuperficie, deCostruzione, + deRistrutturazione, deUso, dePubblica, dePrivata, deUtilizzazione, + dePosizioneEdificio, deInfStradalePonte, deInfStradaleStrada, + deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, + deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, + deInfOperaAccAltro, deInfAltraInfrastruttura, deInfAltro, + deInfAltroDesc, dccFondazioni, dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java index b2753f3a..c69be878 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DettPraticaServiceWrapper.java @@ -144,12 +144,12 @@ public class DettPraticaServiceWrapper implements DettPraticaService, java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -285,11 +285,10 @@ public class DettPraticaServiceWrapper implements DettPraticaService, intPraticaId, integrazione, protocollo, tipoIntegrazione, completa, gestita, codicePagamento, causalePagamento, mezzoPagamento, importoBolli, importoSpeseIstruttoria, dataEffettuazione, - statusTask, workflowForzato, soggettoSostituitoId, - oldDettPraticaId, destinazione, ag, descLongIntervento, via, - localita, estremiCatastali, estremiPratCom, variataDa, - varianteNumero, varianteSostanziale, operaConforme, - collaudoStatico, codiceFiscaleDelegatoCommittente, + statusTask, workflowForzato, soggettoSostituitoId, destinazione, + ag, descLongIntervento, via, localita, estremiCatastali, + estremiPratCom, variataDa, varianteNumero, varianteSostanziale, + operaConforme, collaudoStatico, codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, dataInizioLavoriOpera, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java index 9f14d37b..85134b45 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalService.java @@ -338,18 +338,6 @@ public interface DocPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.DocPratica addDocPraticaForImport( - long userId, java.lang.String className, long classPk, - long intPraticaId, byte[] dlFileEntry, java.lang.String fileName, - java.lang.String version, boolean praticaValidata, - java.lang.String descLong, java.lang.String tipologia, - java.lang.String sha256, boolean aggiornato, - java.lang.String jsonFirmatari, long dettPraticaIdRimozione, - java.util.Date dtDataRimozione, long oldDocPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - public com.liferay.portal.kernel.repository.model.FileEntry addAttachment( long classPk, long intPraticaId, long delegaUserId, java.lang.String sourceFileName, byte[] content, @@ -445,11 +433,6 @@ public interface DocPraticaLocalService extends BaseLocalService, long dlFileEntryId, java.lang.String version) throws com.liferay.portal.kernel.exception.SystemException; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPraticaId( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findDistinctDlFileEntryId( long classPk, java.lang.String tipologia, int start, int end) throws com.liferay.portal.kernel.exception.SystemException; @@ -531,14 +514,6 @@ public interface DocPraticaLocalService extends BaseLocalService, /** * Metodo nuovo ADT - * - * @param intPraticaId - * @param classPk - * @param tipologia - * @param start - * @param end - * @return - * @throws SystemException */ public java.util.List findByIntPratica_ClassPk_TipologiaNew( long intPraticaId, long classPk, java.lang.String tipologia, int start, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java index 05b015e9..a9b479fd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceClp.java @@ -157,205 +157,191 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { "com.liferay.portal.service.ServiceContext" }; - _methodName26 = "addDocPraticaForImport"; + _methodName26 = "addAttachment"; _methodParameterTypes26 = new String[] { - "long", "java.lang.String", "long", "long", "byte[][]", - "java.lang.String", "java.lang.String", "boolean", - "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "java.lang.String", "long", "java.util.Date", "long", - "com.liferay.portal.service.ServiceContext" - }; - - _methodName27 = "addAttachment"; - - _methodParameterTypes27 = new String[] { "long", "long", "long", "java.lang.String", "byte[][]", "java.lang.String" }; - _methodName28 = "getAttachment"; + _methodName27 = "getAttachment"; - _methodParameterTypes28 = new String[] { "long" }; + _methodParameterTypes27 = new String[] { "long" }; - _methodName29 = "addFirma"; + _methodName28 = "addFirma"; - _methodParameterTypes29 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes28 = new String[] { "long", "java.lang.String" }; - _methodName30 = "addFirmeAndApprova"; + _methodName29 = "addFirmeAndApprova"; - _methodParameterTypes30 = new String[] { "long", "java.util.List" }; + _methodParameterTypes29 = new String[] { "long", "java.util.List" }; - _methodName31 = "addErrorAndApprova"; + _methodName30 = "addErrorAndApprova"; - _methodParameterTypes31 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes30 = new String[] { "long", "java.lang.String" }; - _methodName32 = "removeFirma"; + _methodName31 = "removeFirma"; - _methodParameterTypes32 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes31 = new String[] { "long", "java.lang.String" }; - _methodName33 = "updateDocPraticaAggiornato"; + _methodName32 = "updateDocPraticaAggiornato"; - _methodParameterTypes33 = new String[] { "long", "boolean" }; + _methodParameterTypes32 = new String[] { "long", "boolean" }; - _methodName34 = "countDocPraticaDaInviareDax"; + _methodName33 = "countDocPraticaDaInviareDax"; - _methodParameterTypes34 = new String[] { }; + _methodParameterTypes33 = new String[] { }; - _methodName35 = "getDocPraticaDaInviareDax"; + _methodName34 = "getDocPraticaDaInviareDax"; - _methodParameterTypes35 = new String[] { "int", "int" }; + _methodParameterTypes34 = new String[] { "int", "int" }; - _methodName36 = "countByClassPk"; + _methodName35 = "countByClassPk"; - _methodParameterTypes36 = new String[] { "long" }; + _methodParameterTypes35 = new String[] { "long" }; - _methodName37 = "findByClassPk"; + _methodName36 = "findByClassPk"; - _methodParameterTypes37 = new String[] { "long", "int", "int" }; + _methodParameterTypes36 = new String[] { "long", "int", "int" }; - _methodName38 = "findByIntPratica"; + _methodName37 = "findByIntPratica"; - _methodParameterTypes38 = new String[] { "long" }; + _methodParameterTypes37 = new String[] { "long" }; - _methodName39 = "findByClassPk"; + _methodName38 = "findByClassPk"; - _methodParameterTypes39 = new String[] { "long" }; + _methodParameterTypes38 = new String[] { "long" }; - _methodName40 = "findByStaus"; + _methodName39 = "findByStaus"; - _methodParameterTypes40 = new String[] { + _methodParameterTypes39 = new String[] { "int", "int", "int", "com.liferay.portal.kernel.util.OrderByComparator" }; - _methodName41 = "countByStatus"; + _methodName40 = "countByStatus"; - _methodParameterTypes41 = new String[] { "long" }; + _methodParameterTypes40 = new String[] { "long" }; - _methodName42 = "countByClassPk_Tipologia"; + _methodName41 = "countByClassPk_Tipologia"; - _methodParameterTypes42 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes41 = new String[] { "long", "java.lang.String" }; - _methodName43 = "findByClassPk_Tipologia"; + _methodName42 = "findByClassPk_Tipologia"; - _methodParameterTypes43 = new String[] { + _methodParameterTypes42 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName44 = "findByIntPratica_Tipologia"; + _methodName43 = "findByIntPratica_Tipologia"; - _methodParameterTypes44 = new String[] { + _methodParameterTypes43 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName45 = "findByIntPratica_ClassPk_Tipologia"; + _methodName44 = "findByIntPratica_ClassPk_Tipologia"; - _methodParameterTypes45 = new String[] { + _methodParameterTypes44 = new String[] { "long", "long", "java.lang.String", "int", "int" }; - _methodName46 = "findByIntPratica_ClassPk_Tipologie"; + _methodName45 = "findByIntPratica_ClassPk_Tipologie"; - _methodParameterTypes46 = new String[] { "long", "long", "java.util.List" }; - - _methodName47 = "findByIntPratica_ClassPkEqual_Tipologie"; + _methodParameterTypes45 = new String[] { "long", "long", "java.util.List" }; - _methodParameterTypes47 = new String[] { "long", "long", "java.util.List" }; + _methodName46 = "findByIntPratica_ClassPkEqual_Tipologie"; - _methodName48 = "fetchByC_Group_DlFileEntry_Version"; - - _methodParameterTypes48 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes46 = new String[] { "long", "long", "java.util.List" }; - _methodName49 = "fetchByOldDocPraticaId"; + _methodName47 = "fetchByC_Group_DlFileEntry_Version"; - _methodParameterTypes49 = new String[] { "long" }; + _methodParameterTypes47 = new String[] { "long", "java.lang.String" }; - _methodName50 = "findDistinctDlFileEntryId"; + _methodName48 = "findDistinctDlFileEntryId"; - _methodParameterTypes50 = new String[] { + _methodParameterTypes48 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName51 = "findDistinctDlFileEntryId"; + _methodName49 = "findDistinctDlFileEntryId"; - _methodParameterTypes51 = new String[] { + _methodParameterTypes49 = new String[] { "long[][]", "java.lang.String", "int", "int" }; - _methodName52 = "getValidByIntPratica"; + _methodName50 = "getValidByIntPratica"; - _methodParameterTypes52 = new String[] { "long" }; + _methodParameterTypes50 = new String[] { "long" }; - _methodName53 = "getValidByIntPratica_Tipologia"; + _methodName51 = "getValidByIntPratica_Tipologia"; - _methodParameterTypes53 = new String[] { + _methodParameterTypes51 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName54 = "countValidTmpByIntPratica_Tipologia"; + _methodName52 = "countValidTmpByIntPratica_Tipologia"; - _methodParameterTypes54 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes52 = new String[] { "long", "java.lang.String" }; - _methodName55 = "getValidTmpByIntPratica"; + _methodName53 = "getValidTmpByIntPratica"; - _methodParameterTypes55 = new String[] { "long", "int", "int" }; + _methodParameterTypes53 = new String[] { "long", "int", "int" }; - _methodName56 = "getValidTmpByIntPratica_Tipologia"; + _methodName54 = "getValidTmpByIntPratica_Tipologia"; - _methodParameterTypes56 = new String[] { + _methodParameterTypes54 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName57 = "getValidTmpByIntPratica_DettPratica_Tipologia"; + _methodName55 = "getValidTmpByIntPratica_DettPratica_Tipologia"; - _methodParameterTypes57 = new String[] { + _methodParameterTypes55 = new String[] { "long", "long", "java.lang.String", "int", "int" }; - _methodName58 = "getValidTmpByIntPratica_Tipologie"; + _methodName56 = "getValidTmpByIntPratica_Tipologie"; - _methodParameterTypes58 = new String[] { + _methodParameterTypes56 = new String[] { "long", "java.lang.String[][]", "int", "int" }; - _methodName59 = "countValidTmpByIntPratica_Tipologie"; + _methodName57 = "countValidTmpByIntPratica_Tipologie"; - _methodParameterTypes59 = new String[] { "long", "java.lang.String[][]" }; + _methodParameterTypes57 = new String[] { "long", "java.lang.String[][]" }; - _methodName60 = "getInvalidByIntPratica"; + _methodName58 = "getInvalidByIntPratica"; - _methodParameterTypes60 = new String[] { "long" }; + _methodParameterTypes58 = new String[] { "long" }; - _methodName61 = "getInvalidTmpByIntPratica"; + _methodName59 = "getInvalidTmpByIntPratica"; - _methodParameterTypes61 = new String[] { "long" }; + _methodParameterTypes59 = new String[] { "long" }; - _methodName62 = "getValidUntilClassPkByIntPratica"; + _methodName60 = "getValidUntilClassPkByIntPratica"; - _methodParameterTypes62 = new String[] { + _methodParameterTypes60 = new String[] { "long", "long", "java.lang.String", "int", "int" }; - _methodName63 = "completeInvalidation"; + _methodName61 = "completeInvalidation"; - _methodParameterTypes63 = new String[] { "long" }; + _methodParameterTypes61 = new String[] { "long" }; - _methodName64 = "getDocPraticaWithOldFileEntryId"; + _methodName62 = "getDocPraticaWithOldFileEntryId"; - _methodParameterTypes64 = new String[] { "int", "int" }; + _methodParameterTypes62 = new String[] { "int", "int" }; - _methodName65 = "addDocPraticaAnnullamento"; + _methodName63 = "addDocPraticaAnnullamento"; - _methodParameterTypes65 = new String[] { + _methodParameterTypes63 = new String[] { "long", "java.lang.String", "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName66 = "findByIntPratica_ClassPk_TipologiaNew"; + _methodName64 = "findByIntPratica_ClassPk_TipologiaNew"; - _methodParameterTypes66 = new String[] { + _methodParameterTypes64 = new String[] { "long", "long", "java.lang.String", "int", "int" }; } @@ -1226,82 +1212,6 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { return (it.tref.liferay.portos.bo.model.DocPratica)ClpSerializer.translateOutput(returnObj); } - @Override - public it.tref.liferay.portos.bo.model.DocPratica addDocPraticaForImport( - long userId, java.lang.String className, long classPk, - long intPraticaId, byte[] dlFileEntry, java.lang.String fileName, - java.lang.String version, boolean praticaValidata, - java.lang.String descLong, java.lang.String tipologia, - java.lang.String sha256, boolean aggiornato, - java.lang.String jsonFirmatari, long dettPraticaIdRimozione, - java.util.Date dtDataRimozione, long oldDocPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName26, - _methodParameterTypes26, - new Object[] { - userId, - - ClpSerializer.translateInput(className), - - classPk, - - intPraticaId, - - ClpSerializer.translateInput(dlFileEntry), - - ClpSerializer.translateInput(fileName), - - ClpSerializer.translateInput(version), - - praticaValidata, - - ClpSerializer.translateInput(descLong), - - ClpSerializer.translateInput(tipologia), - - ClpSerializer.translateInput(sha256), - - aggiornato, - - ClpSerializer.translateInput(jsonFirmatari), - - dettPraticaIdRimozione, - - ClpSerializer.translateInput(dtDataRimozione), - - oldDocPraticaId, - - ClpSerializer.translateInput(serviceContext) - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.DocPratica)ClpSerializer.translateOutput(returnObj); - } - @Override public com.liferay.portal.kernel.repository.model.FileEntry addAttachment( long classPk, long intPraticaId, long delegaUserId, @@ -1312,8 +1222,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName27, - _methodParameterTypes27, + returnObj = _invokableLocalService.invokeMethod(_methodName26, + _methodParameterTypes26, new Object[] { classPk, @@ -1359,8 +1269,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName28, - _methodParameterTypes28, new Object[] { classPk }); + returnObj = _invokableLocalService.invokeMethod(_methodName27, + _methodParameterTypes27, new Object[] { classPk }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1390,8 +1300,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName29, - _methodParameterTypes29, + _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, new Object[] { docPraticaId, @@ -1425,8 +1335,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, + _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { docPraticaId, @@ -1459,8 +1369,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, + _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { docPraticaId, @@ -1493,8 +1403,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, + _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { docPraticaId, @@ -1529,8 +1439,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { docPraticaId, aggiornato }); } catch (Throwable t) { @@ -1558,8 +1468,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName34, - _methodParameterTypes34, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1587,8 +1497,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName35, - _methodParameterTypes35, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName34, + _methodParameterTypes34, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1615,8 +1525,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, new Object[] { classPk }); + returnObj = _invokableLocalService.invokeMethod(_methodName35, + _methodParameterTypes35, new Object[] { classPk }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1644,8 +1554,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { classPk, start, end }); } catch (Throwable t) { @@ -1674,8 +1584,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1703,8 +1613,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, new Object[] { classPk }); + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { classPk }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1733,8 +1643,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { status, @@ -1770,8 +1680,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, new Object[] { status }); + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { status }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1798,8 +1708,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { classPk, @@ -1832,8 +1742,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { classPk, @@ -1870,8 +1780,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { intPraticaId, @@ -1908,8 +1818,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { intPraticaId, @@ -1949,8 +1859,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { intPraticaId, @@ -1986,8 +1896,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { intPraticaId, @@ -2022,8 +1932,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { dlFileEntryId, @@ -2049,35 +1959,6 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { return (it.tref.liferay.portos.bo.model.DocPratica)ClpSerializer.translateOutput(returnObj); } - @Override - public it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPraticaId( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, new Object[] { oldDocPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.DocPratica)ClpSerializer.translateOutput(returnObj); - } - @Override public java.util.List findDistinctDlFileEntryId( long classPk, java.lang.String tipologia, int start, int end) @@ -2085,8 +1966,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName50, - _methodParameterTypes50, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { classPk, @@ -2123,8 +2004,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName51, - _methodParameterTypes51, + returnObj = _invokableLocalService.invokeMethod(_methodName49, + _methodParameterTypes49, new Object[] { ClpSerializer.translateInput(classPks), @@ -2161,8 +2042,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName52, - _methodParameterTypes52, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName50, + _methodParameterTypes50, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2190,8 +2071,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName53, - _methodParameterTypes53, + returnObj = _invokableLocalService.invokeMethod(_methodName51, + _methodParameterTypes51, new Object[] { intPraticaId, @@ -2228,8 +2109,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName54, - _methodParameterTypes54, + returnObj = _invokableLocalService.invokeMethod(_methodName52, + _methodParameterTypes52, new Object[] { intPraticaId, @@ -2262,8 +2143,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, + returnObj = _invokableLocalService.invokeMethod(_methodName53, + _methodParameterTypes53, new Object[] { intPraticaId, start, end }); } catch (Throwable t) { @@ -2292,8 +2173,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName56, - _methodParameterTypes56, + returnObj = _invokableLocalService.invokeMethod(_methodName54, + _methodParameterTypes54, new Object[] { intPraticaId, @@ -2331,8 +2212,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName57, - _methodParameterTypes57, + returnObj = _invokableLocalService.invokeMethod(_methodName55, + _methodParameterTypes55, new Object[] { intPraticaId, @@ -2371,8 +2252,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName58, - _methodParameterTypes58, + returnObj = _invokableLocalService.invokeMethod(_methodName56, + _methodParameterTypes56, new Object[] { intPraticaId, @@ -2409,8 +2290,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName59, - _methodParameterTypes59, + returnObj = _invokableLocalService.invokeMethod(_methodName57, + _methodParameterTypes57, new Object[] { intPraticaId, @@ -2443,8 +2324,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName60, - _methodParameterTypes60, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName58, + _methodParameterTypes58, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2472,8 +2353,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName61, - _methodParameterTypes61, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName59, + _methodParameterTypes59, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2501,8 +2382,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName62, - _methodParameterTypes62, + returnObj = _invokableLocalService.invokeMethod(_methodName60, + _methodParameterTypes60, new Object[] { intPraticaId, @@ -2538,8 +2419,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { public void completeInvalidation(long intPraticaId) throws com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName63, - _methodParameterTypes63, new Object[] { intPraticaId }); + _invokableLocalService.invokeMethod(_methodName61, + _methodParameterTypes61, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2565,8 +2446,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName64, - _methodParameterTypes64, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName62, + _methodParameterTypes62, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -2599,8 +2480,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName65, - _methodParameterTypes65, + returnObj = _invokableLocalService.invokeMethod(_methodName63, + _methodParameterTypes63, new Object[] { userId, @@ -2653,8 +2534,8 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName66, - _methodParameterTypes66, + returnObj = _invokableLocalService.invokeMethod(_methodName64, + _methodParameterTypes64, new Object[] { intPraticaId, @@ -2815,8 +2696,4 @@ public class DocPraticaLocalServiceClp implements DocPraticaLocalService { private String[] _methodParameterTypes63; private String _methodName64; private String[] _methodParameterTypes64; - private String _methodName65; - private String[] _methodParameterTypes65; - private String _methodName66; - private String[] _methodParameterTypes66; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java index 71b4d638..54a67f04 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceUtil.java @@ -377,25 +377,6 @@ public class DocPraticaLocalServiceUtil { fileEntryId, fileName, tipologia, jsonFirmatari, serviceContext); } - public static it.tref.liferay.portos.bo.model.DocPratica addDocPraticaForImport( - long userId, java.lang.String className, long classPk, - long intPraticaId, byte[] dlFileEntry, java.lang.String fileName, - java.lang.String version, boolean praticaValidata, - java.lang.String descLong, java.lang.String tipologia, - java.lang.String sha256, boolean aggiornato, - java.lang.String jsonFirmatari, long dettPraticaIdRimozione, - java.util.Date dtDataRimozione, long oldDocPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .addDocPraticaForImport(userId, className, classPk, - intPraticaId, dlFileEntry, fileName, version, praticaValidata, - descLong, tipologia, sha256, aggiornato, jsonFirmatari, - dettPraticaIdRimozione, dtDataRimozione, oldDocPraticaId, - serviceContext); - } - public static com.liferay.portal.kernel.repository.model.FileEntry addAttachment( long classPk, long intPraticaId, long delegaUserId, java.lang.String sourceFileName, byte[] content, @@ -548,12 +529,6 @@ public class DocPraticaLocalServiceUtil { .fetchByC_Group_DlFileEntry_Version(dlFileEntryId, version); } - public static it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPraticaId( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().fetchByOldDocPraticaId(oldDocPraticaId); - } - public static java.util.List findDistinctDlFileEntryId( long classPk, java.lang.String tipologia, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { @@ -674,14 +649,6 @@ public class DocPraticaLocalServiceUtil { /** * Metodo nuovo ADT - * - * @param intPraticaId - * @param classPk - * @param tipologia - * @param start - * @param end - * @return - * @throws SystemException */ public static java.util.List findByIntPratica_ClassPk_TipologiaNew( long intPraticaId, long classPk, java.lang.String tipologia, int start, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java index 5fd5ff36..ef493bed 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/DocPraticaLocalServiceWrapper.java @@ -400,25 +400,6 @@ public class DocPraticaLocalServiceWrapper implements DocPraticaLocalService, jsonFirmatari, serviceContext); } - @Override - public it.tref.liferay.portos.bo.model.DocPratica addDocPraticaForImport( - long userId, java.lang.String className, long classPk, - long intPraticaId, byte[] dlFileEntry, java.lang.String fileName, - java.lang.String version, boolean praticaValidata, - java.lang.String descLong, java.lang.String tipologia, - java.lang.String sha256, boolean aggiornato, - java.lang.String jsonFirmatari, long dettPraticaIdRimozione, - java.util.Date dtDataRimozione, long oldDocPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _docPraticaLocalService.addDocPraticaForImport(userId, - className, classPk, intPraticaId, dlFileEntry, fileName, version, - praticaValidata, descLong, tipologia, sha256, aggiornato, - jsonFirmatari, dettPraticaIdRimozione, dtDataRimozione, - oldDocPraticaId, serviceContext); - } - @Override public com.liferay.portal.kernel.repository.model.FileEntry addAttachment( long classPk, long intPraticaId, long delegaUserId, @@ -586,13 +567,6 @@ public class DocPraticaLocalServiceWrapper implements DocPraticaLocalService, version); } - @Override - public it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPraticaId( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _docPraticaLocalService.fetchByOldDocPraticaId(oldDocPraticaId); - } - @Override public java.util.List findDistinctDlFileEntryId( long classPk, java.lang.String tipologia, int start, int end) @@ -725,14 +699,6 @@ public class DocPraticaLocalServiceWrapper implements DocPraticaLocalService, /** * Metodo nuovo ADT - * - * @param intPraticaId - * @param classPk - * @param tipologia - * @param start - * @param end - * @return - * @throws SystemException */ @Override public java.util.List findByIntPratica_ClassPk_TipologiaNew( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java index 6d3402c0..54d6b4ce 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalService.java @@ -470,9 +470,4 @@ public interface FineLavoriLocalService extends BaseLocalService, java.lang.String codiceFiscaleDelegatoCollaudo) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java index 6b5798d6..1ddfe738 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceClp.java @@ -295,10 +295,6 @@ public class FineLavoriLocalServiceClp implements FineLavoriLocalService { _methodName54 = "findIntPraticaByFineLavori"; _methodParameterTypes54 = new String[] { "java.lang.String" }; - - _methodName55 = "fetchByOldDettPraticaId"; - - _methodParameterTypes55 = new String[] { "long" }; } @Override @@ -2148,35 +2144,6 @@ public class FineLavoriLocalServiceClp implements FineLavoriLocalService { return (java.util.List)ClpSerializer.translateOutput(returnObj); } - @Override - public it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName55, - _methodParameterTypes55, new Object[] { oldDettPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.FineLavori)ClpSerializer.translateOutput(returnObj); - } - private InvokableLocalService _invokableLocalService; private String _methodName0; private String[] _methodParameterTypes0; @@ -2286,6 +2253,4 @@ public class FineLavoriLocalServiceClp implements FineLavoriLocalService { private String[] _methodParameterTypes53; private String _methodName54; private String[] _methodParameterTypes54; - private String _methodName55; - private String[] _methodParameterTypes55; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java index 6995b2d6..9679fdb9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceUtil.java @@ -585,12 +585,6 @@ public class FineLavoriLocalServiceUtil { .findIntPraticaByFineLavori(codiceFiscaleDelegatoCollaudo); } - public static it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().fetchByOldDettPraticaId(oldDettPraticaId); - } - public static void clearService() { _service = null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java index 50579a5c..633caf83 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/FineLavoriLocalServiceWrapper.java @@ -631,13 +631,6 @@ public class FineLavoriLocalServiceWrapper implements FineLavoriLocalService, return _fineLavoriLocalService.findIntPraticaByFineLavori(codiceFiscaleDelegatoCollaudo); } - @Override - public it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _fineLavoriLocalService.fetchByOldDettPraticaId(oldDettPraticaId); - } - /** * @deprecated As of 6.1.0, replaced by {@link #getWrappedService} */ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java index 4776b552..33ae5975 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalService.java @@ -321,31 +321,6 @@ public interface SorteggioLocalService extends BaseLocalService, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Sorteggio addSorteggioForImport( - long intPraticaId, long dettPraticaId, java.lang.String anno, - java.lang.String mese, int settimana, java.util.Date dtSorteggio, - java.lang.String note, java.lang.String stato, - java.lang.String dettagli, long numeroEstrazione, - java.lang.String pratica, java.lang.String committente, - java.lang.String comune, java.lang.String provincia, boolean esterna, - long praticaEsternaId, boolean mesePrecedente, int status, - long oldSorteggioId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.SystemException; - - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public java.util.List getYears(java.lang.Long groupId, - int lastResults) - throws com.liferay.portal.kernel.exception.SystemException; - - public int countDettPraticaWorkflowNonAvviato() - throws com.liferay.portal.kernel.exception.SystemException; - - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public java.util.List getDettPraticaWorkflowNonAvviato( - int start, int end) - throws com.liferay.portal.kernel.exception.SystemException; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) public java.util.List search( long groupId, java.lang.String anno, java.lang.String mese, @@ -370,15 +345,6 @@ public interface SorteggioLocalService extends BaseLocalService, java.lang.Long numeroEstrazione, java.lang.String provincia) throws com.liferay.portal.kernel.exception.SystemException; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public boolean isDettPraticaSorteggiata(long companyId, long dettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.Sorteggio findByC_DettPratica( long companyId, long dettPraticaId) throws com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java index d76319f9..8b333a34 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceClp.java @@ -141,144 +141,113 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { "com.liferay.portal.service.ServiceContext" }; - _methodName24 = "addSorteggioForImport"; + _methodName24 = "search"; _methodParameterTypes24 = new String[] { - "long", "long", "java.lang.String", "java.lang.String", "int", - "java.util.Date", "java.lang.String", "java.lang.String", - "java.lang.String", "long", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "long", "boolean", "int", "long", - "com.liferay.portal.service.ServiceContext" - }; - - _methodName25 = "getYears"; - - _methodParameterTypes25 = new String[] { "java.lang.Long", "int" }; - - _methodName26 = "countDettPraticaWorkflowNonAvviato"; - - _methodParameterTypes26 = new String[] { }; - - _methodName27 = "getDettPraticaWorkflowNonAvviato"; - - _methodParameterTypes27 = new String[] { "int", "int" }; - - _methodName28 = "search"; - - _methodParameterTypes28 = new String[] { "long", "java.lang.String", "java.lang.String", "int", "int", "int" }; - _methodName29 = "countSearch"; + _methodName25 = "countSearch"; - _methodParameterTypes29 = new String[] { + _methodParameterTypes25 = new String[] { "long", "java.lang.String", "java.lang.String", "int" }; - _methodName30 = "search"; + _methodName26 = "search"; - _methodParameterTypes30 = new String[] { + _methodParameterTypes26 = new String[] { "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String", "int", "int" }; - _methodName31 = "countSearch"; + _methodName27 = "countSearch"; - _methodParameterTypes31 = new String[] { + _methodParameterTypes27 = new String[] { "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String" }; - _methodName32 = "isDettPraticaSorteggiata"; - - _methodParameterTypes32 = new String[] { "long", "long" }; - - _methodName33 = "fetchByOldSorteggioId"; - - _methodParameterTypes33 = new String[] { "long" }; + _methodName28 = "findByC_DettPratica"; - _methodName34 = "findByC_DettPratica"; + _methodParameterTypes28 = new String[] { "long", "long" }; - _methodParameterTypes34 = new String[] { "long", "long" }; + _methodName29 = "findByIntPratica"; - _methodName35 = "findByIntPratica"; + _methodParameterTypes29 = new String[] { "long" }; - _methodParameterTypes35 = new String[] { "long" }; + _methodName30 = "findByGroupId_Anno_Mese_Settimana"; - _methodName36 = "findByGroupId_Anno_Mese_Settimana"; - - _methodParameterTypes36 = new String[] { + _methodParameterTypes30 = new String[] { "long", "java.lang.String", "java.lang.String", "int" }; - _methodName37 = "findByCompanyIdGroupId"; + _methodName31 = "findByCompanyIdGroupId"; - _methodParameterTypes37 = new String[] { "long", "long" }; + _methodParameterTypes31 = new String[] { "long", "long" }; - _methodName38 = "findByAnno_Mese_Settimana"; + _methodName32 = "findByAnno_Mese_Settimana"; - _methodParameterTypes38 = new String[] { + _methodParameterTypes32 = new String[] { "java.lang.String", "java.lang.String", "int" }; - _methodName39 = "findSorteggiGroupByAnnoMeseSettimana"; + _methodName33 = "findSorteggiGroupByAnnoMeseSettimana"; - _methodParameterTypes39 = new String[] { "int", "int" }; + _methodParameterTypes33 = new String[] { "int", "int" }; - _methodName40 = "countSorteggiGroupByAnnoMeseSettimana"; + _methodName34 = "countSorteggiGroupByAnnoMeseSettimana"; - _methodParameterTypes40 = new String[] { }; + _methodParameterTypes34 = new String[] { }; - _methodName41 = "countSorteggioMese"; + _methodName35 = "countSorteggioMese"; - _methodParameterTypes41 = new String[] { + _methodParameterTypes35 = new String[] { "java.util.Date", "java.util.Date", "java.util.List", "java.util.List" }; - _methodName42 = "findSorteggioMese"; + _methodName36 = "findSorteggioMese"; - _methodParameterTypes42 = new String[] { + _methodParameterTypes36 = new String[] { "java.util.Date", "java.util.Date", "java.util.List", "java.util.List", "java.util.List", "int" }; - _methodName43 = "findSorteggioAnno"; + _methodName37 = "findSorteggioAnno"; - _methodParameterTypes43 = new String[] { + _methodParameterTypes37 = new String[] { "java.util.Date", "java.util.Date", "java.util.List", "java.util.List", "java.util.List", "int" }; - _methodName44 = "updateDataSorteggioPraticaEsterna"; + _methodName38 = "updateDataSorteggioPraticaEsterna"; - _methodParameterTypes44 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes38 = new String[] { "long", "java.util.Date" }; - _methodName45 = "getTecnicoSorteggioPraticaEsterna"; + _methodName39 = "getTecnicoSorteggioPraticaEsterna"; - _methodParameterTypes45 = new String[] { "long" }; + _methodParameterTypes39 = new String[] { "long" }; - _methodName46 = "findTipoPraticaIdSorteggioPraticaEsterna"; + _methodName40 = "findTipoPraticaIdSorteggioPraticaEsterna"; - _methodParameterTypes46 = new String[] { "long" }; + _methodParameterTypes40 = new String[] { "long" }; - _methodName47 = "search"; + _methodName41 = "search"; - _methodParameterTypes47 = new String[] { + _methodParameterTypes41 = new String[] { "java.lang.Long", "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String", "int", "int" }; - _methodName48 = "count"; + _methodName42 = "count"; - _methodParameterTypes48 = new String[] { + _methodParameterTypes42 = new String[] { "java.lang.Long", "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String" @@ -1038,175 +1007,6 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { return (it.tref.liferay.portos.bo.model.Sorteggio)ClpSerializer.translateOutput(returnObj); } - @Override - public it.tref.liferay.portos.bo.model.Sorteggio addSorteggioForImport( - long intPraticaId, long dettPraticaId, java.lang.String anno, - java.lang.String mese, int settimana, java.util.Date dtSorteggio, - java.lang.String note, java.lang.String stato, - java.lang.String dettagli, long numeroEstrazione, - java.lang.String pratica, java.lang.String committente, - java.lang.String comune, java.lang.String provincia, boolean esterna, - long praticaEsternaId, boolean mesePrecedente, int status, - long oldSorteggioId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName24, - _methodParameterTypes24, - new Object[] { - intPraticaId, - - dettPraticaId, - - ClpSerializer.translateInput(anno), - - ClpSerializer.translateInput(mese), - - settimana, - - ClpSerializer.translateInput(dtSorteggio), - - ClpSerializer.translateInput(note), - - ClpSerializer.translateInput(stato), - - ClpSerializer.translateInput(dettagli), - - numeroEstrazione, - - ClpSerializer.translateInput(pratica), - - ClpSerializer.translateInput(committente), - - ClpSerializer.translateInput(comune), - - ClpSerializer.translateInput(provincia), - - esterna, - - praticaEsternaId, - - mesePrecedente, - - status, - - oldSorteggioId, - - ClpSerializer.translateInput(serviceContext) - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.Sorteggio)ClpSerializer.translateOutput(returnObj); - } - - @Override - public java.util.List getYears(java.lang.Long groupId, - int lastResults) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName25, - _methodParameterTypes25, - new Object[] { - ClpSerializer.translateInput(groupId), - - lastResults - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (java.util.List)ClpSerializer.translateOutput(returnObj); - } - - @Override - public int countDettPraticaWorkflowNonAvviato() - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName26, - _methodParameterTypes26, new Object[] { }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Integer)returnObj).intValue(); - } - - @Override - public java.util.List getDettPraticaWorkflowNonAvviato( - int start, int end) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName27, - _methodParameterTypes27, new Object[] { start, end }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (java.util.List)ClpSerializer.translateOutput(returnObj); - } - @Override public java.util.List search( long groupId, java.lang.String anno, java.lang.String mese, @@ -1215,8 +1015,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName28, - _methodParameterTypes28, + returnObj = _invokableLocalService.invokeMethod(_methodName24, + _methodParameterTypes24, new Object[] { groupId, @@ -1257,8 +1057,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName29, - _methodParameterTypes29, + returnObj = _invokableLocalService.invokeMethod(_methodName25, + _methodParameterTypes25, new Object[] { groupId, @@ -1298,8 +1098,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName30, - _methodParameterTypes30, + returnObj = _invokableLocalService.invokeMethod(_methodName26, + _methodParameterTypes26, new Object[] { ClpSerializer.translateInput(anno), @@ -1352,8 +1152,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName31, - _methodParameterTypes31, + returnObj = _invokableLocalService.invokeMethod(_methodName27, + _methodParameterTypes27, new Object[] { ClpSerializer.translateInput(anno), @@ -1393,64 +1193,6 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { return ((Integer)returnObj).intValue(); } - @Override - public boolean isDettPraticaSorteggiata(long companyId, long dettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName32, - _methodParameterTypes32, - new Object[] { companyId, dettPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return ((Boolean)returnObj).booleanValue(); - } - - @Override - public it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName33, - _methodParameterTypes33, new Object[] { oldSorteggioId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.Sorteggio)ClpSerializer.translateOutput(returnObj); - } - @Override public it.tref.liferay.portos.bo.model.Sorteggio findByC_DettPratica( long companyId, long dettPraticaId) @@ -1458,8 +1200,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName34, - _methodParameterTypes34, + returnObj = _invokableLocalService.invokeMethod(_methodName28, + _methodParameterTypes28, new Object[] { companyId, dettPraticaId }); } catch (Throwable t) { @@ -1488,8 +1230,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName35, - _methodParameterTypes35, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName29, + _methodParameterTypes29, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1518,8 +1260,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, + returnObj = _invokableLocalService.invokeMethod(_methodName30, + _methodParameterTypes30, new Object[] { groupId, @@ -1556,8 +1298,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName31, + _methodParameterTypes31, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1585,8 +1327,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, + returnObj = _invokableLocalService.invokeMethod(_methodName32, + _methodParameterTypes32, new Object[] { ClpSerializer.translateInput(anno), @@ -1621,8 +1363,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, new Object[] { start, end }); + returnObj = _invokableLocalService.invokeMethod(_methodName33, + _methodParameterTypes33, new Object[] { start, end }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1649,8 +1391,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, new Object[] { }); + returnObj = _invokableLocalService.invokeMethod(_methodName34, + _methodParameterTypes34, new Object[] { }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1679,8 +1421,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, + returnObj = _invokableLocalService.invokeMethod(_methodName35, + _methodParameterTypes35, new Object[] { ClpSerializer.translateInput(dtMin), @@ -1720,8 +1462,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { ClpSerializer.translateInput(dtMin), @@ -1765,8 +1507,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { ClpSerializer.translateInput(dtMin), @@ -1805,8 +1547,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { java.util.Date dataSorteggio) throws com.liferay.portal.kernel.exception.SystemException { try { - _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, + _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { praticaEsternaId, @@ -1837,8 +1579,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, new Object[] { praticaEsternaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { praticaEsternaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1865,8 +1607,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, new Object[] { praticaEsternaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { praticaEsternaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1897,8 +1639,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { ClpSerializer.translateInput(groupId), @@ -1954,8 +1696,8 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { ClpSerializer.translateInput(groupId), @@ -2082,16 +1824,4 @@ public class SorteggioLocalServiceClp implements SorteggioLocalService { private String[] _methodParameterTypes41; private String _methodName42; private String[] _methodParameterTypes42; - private String _methodName43; - private String[] _methodParameterTypes43; - private String _methodName44; - private String[] _methodParameterTypes44; - private String _methodName45; - private String[] _methodParameterTypes45; - private String _methodName46; - private String[] _methodParameterTypes46; - private String _methodName47; - private String[] _methodParameterTypes47; - private String _methodName48; - private String[] _methodParameterTypes48; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java index 5f064551..98616016 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceUtil.java @@ -352,42 +352,6 @@ public class SorteggioLocalServiceUtil { mesePrecedente, serviceContext); } - public static it.tref.liferay.portos.bo.model.Sorteggio addSorteggioForImport( - long intPraticaId, long dettPraticaId, java.lang.String anno, - java.lang.String mese, int settimana, java.util.Date dtSorteggio, - java.lang.String note, java.lang.String stato, - java.lang.String dettagli, long numeroEstrazione, - java.lang.String pratica, java.lang.String committente, - java.lang.String comune, java.lang.String provincia, boolean esterna, - long praticaEsternaId, boolean mesePrecedente, int status, - long oldSorteggioId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.SystemException { - return getService() - .addSorteggioForImport(intPraticaId, dettPraticaId, anno, - mese, settimana, dtSorteggio, note, stato, dettagli, - numeroEstrazione, pratica, committente, comune, provincia, esterna, - praticaEsternaId, mesePrecedente, status, oldSorteggioId, - serviceContext); - } - - public static java.util.List getYears( - java.lang.Long groupId, int lastResults) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().getYears(groupId, lastResults); - } - - public static int countDettPraticaWorkflowNonAvviato() - throws com.liferay.portal.kernel.exception.SystemException { - return getService().countDettPraticaWorkflowNonAvviato(); - } - - public static java.util.List getDettPraticaWorkflowNonAvviato( - int start, int end) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().getDettPraticaWorkflowNonAvviato(start, end); - } - public static java.util.List search( long groupId, java.lang.String anno, java.lang.String mese, int settimana, int start, int end) @@ -422,18 +386,6 @@ public class SorteggioLocalServiceUtil { comune, pratica, numeroEstrazione, provincia); } - public static boolean isDettPraticaSorteggiata(long companyId, - long dettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().isDettPraticaSorteggiata(companyId, dettPraticaId); - } - - public static it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().fetchByOldSorteggioId(oldSorteggioId); - } - public static it.tref.liferay.portos.bo.model.Sorteggio findByC_DettPratica( long companyId, long dettPraticaId) throws com.liferay.portal.kernel.exception.SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java index 9af4c63e..be47adb2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/SorteggioLocalServiceWrapper.java @@ -370,46 +370,6 @@ public class SorteggioLocalServiceWrapper implements SorteggioLocalService, praticaEsternaId, mesePrecedente, serviceContext); } - @Override - public it.tref.liferay.portos.bo.model.Sorteggio addSorteggioForImport( - long intPraticaId, long dettPraticaId, java.lang.String anno, - java.lang.String mese, int settimana, java.util.Date dtSorteggio, - java.lang.String note, java.lang.String stato, - java.lang.String dettagli, long numeroEstrazione, - java.lang.String pratica, java.lang.String committente, - java.lang.String comune, java.lang.String provincia, boolean esterna, - long praticaEsternaId, boolean mesePrecedente, int status, - long oldSorteggioId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.SystemException { - return _sorteggioLocalService.addSorteggioForImport(intPraticaId, - dettPraticaId, anno, mese, settimana, dtSorteggio, note, stato, - dettagli, numeroEstrazione, pratica, committente, comune, - provincia, esterna, praticaEsternaId, mesePrecedente, status, - oldSorteggioId, serviceContext); - } - - @Override - public java.util.List getYears(java.lang.Long groupId, - int lastResults) - throws com.liferay.portal.kernel.exception.SystemException { - return _sorteggioLocalService.getYears(groupId, lastResults); - } - - @Override - public int countDettPraticaWorkflowNonAvviato() - throws com.liferay.portal.kernel.exception.SystemException { - return _sorteggioLocalService.countDettPraticaWorkflowNonAvviato(); - } - - @Override - public java.util.List getDettPraticaWorkflowNonAvviato( - int start, int end) - throws com.liferay.portal.kernel.exception.SystemException { - return _sorteggioLocalService.getDettPraticaWorkflowNonAvviato(start, - end); - } - @Override public java.util.List search( long groupId, java.lang.String anno, java.lang.String mese, @@ -448,20 +408,6 @@ public class SorteggioLocalServiceWrapper implements SorteggioLocalService, committente, tecnico, comune, pratica, numeroEstrazione, provincia); } - @Override - public boolean isDettPraticaSorteggiata(long companyId, long dettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _sorteggioLocalService.isDettPraticaSorteggiata(companyId, - dettPraticaId); - } - - @Override - public it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException { - return _sorteggioLocalService.fetchByOldSorteggioId(oldSorteggioId); - } - @Override public it.tref.liferay.portos.bo.model.Sorteggio findByC_DettPratica( long companyId, long dettPraticaId) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java index 561a07a6..e0791130 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalService.java @@ -261,18 +261,6 @@ public interface StoricoSoggettoPraticaLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica addStoricoSoggettoPraticaForImport( - long intPraticaId, java.lang.String nome, java.lang.String cognome, - java.lang.String codiceFiscale, long oldStoricoSoggettoPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException; - - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByIntPratica( long companyId, long intPraticaId, int start, int end) throws com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java index edb5f1ca..cec584ab 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceClp.java @@ -123,25 +123,13 @@ public class StoricoSoggettoPraticaLocalServiceClp "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName20 = "addStoricoSoggettoPraticaForImport"; + _methodName20 = "findByIntPratica"; - _methodParameterTypes20 = new String[] { - "long", "java.lang.String", "java.lang.String", - "java.lang.String", "long", - "com.liferay.portal.service.ServiceContext" - }; - - _methodName21 = "fetchByOldStoricoSoggettoPraticaId"; - - _methodParameterTypes21 = new String[] { "long" }; - - _methodName22 = "findByIntPratica"; - - _methodParameterTypes22 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes20 = new String[] { "long", "long", "int", "int" }; - _methodName23 = "countByIntPratica"; + _methodName21 = "countByIntPratica"; - _methodParameterTypes23 = new String[] { "long", "long" }; + _methodParameterTypes21 = new String[] { "long", "long" }; } @Override @@ -751,85 +739,6 @@ public class StoricoSoggettoPraticaLocalServiceClp return (it.tref.liferay.portos.bo.model.StoricoSoggettoPratica)ClpSerializer.translateOutput(returnObj); } - @Override - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica addStoricoSoggettoPraticaForImport( - long intPraticaId, java.lang.String nome, java.lang.String cognome, - java.lang.String codiceFiscale, long oldStoricoSoggettoPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName20, - _methodParameterTypes20, - new Object[] { - intPraticaId, - - ClpSerializer.translateInput(nome), - - ClpSerializer.translateInput(cognome), - - ClpSerializer.translateInput(codiceFiscale), - - oldStoricoSoggettoPraticaId, - - ClpSerializer.translateInput(serviceContext) - }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.PortalException) { - throw (com.liferay.portal.kernel.exception.PortalException)t; - } - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.StoricoSoggettoPratica)ClpSerializer.translateOutput(returnObj); - } - - @Override - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName21, - _methodParameterTypes21, - new Object[] { oldStoricoSoggettoPraticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.StoricoSoggettoPratica)ClpSerializer.translateOutput(returnObj); - } - @Override public java.util.List findByIntPratica( long companyId, long intPraticaId, int start, int end) @@ -837,8 +746,8 @@ public class StoricoSoggettoPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName22, - _methodParameterTypes22, + returnObj = _invokableLocalService.invokeMethod(_methodName20, + _methodParameterTypes20, new Object[] { companyId, intPraticaId, start, end }); } catch (Throwable t) { @@ -866,8 +775,8 @@ public class StoricoSoggettoPraticaLocalServiceClp Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName23, - _methodParameterTypes23, + returnObj = _invokableLocalService.invokeMethod(_methodName21, + _methodParameterTypes21, new Object[] { companyId, intPraticaId }); } catch (Throwable t) { @@ -932,8 +841,4 @@ public class StoricoSoggettoPraticaLocalServiceClp private String[] _methodParameterTypes20; private String _methodName21; private String[] _methodParameterTypes21; - private String _methodName22; - private String[] _methodParameterTypes22; - private String _methodName23; - private String[] _methodParameterTypes23; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java index 37b697ea..7a7c8c85 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceUtil.java @@ -288,24 +288,6 @@ public class StoricoSoggettoPraticaLocalServiceUtil { codiceFiscale, serviceContext); } - public static it.tref.liferay.portos.bo.model.StoricoSoggettoPratica addStoricoSoggettoPraticaForImport( - long intPraticaId, java.lang.String nome, java.lang.String cognome, - java.lang.String codiceFiscale, long oldStoricoSoggettoPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return getService() - .addStoricoSoggettoPraticaForImport(intPraticaId, nome, - cognome, codiceFiscale, oldStoricoSoggettoPraticaId, serviceContext); - } - - public static it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService() - .fetchByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - } - public static java.util.List findByIntPratica( long companyId, long intPraticaId, int start, int end) throws com.liferay.portal.kernel.exception.SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java index 117e9690..032fe3dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/StoricoSoggettoPraticaLocalServiceWrapper.java @@ -301,25 +301,6 @@ public class StoricoSoggettoPraticaLocalServiceWrapper nome, cognome, codiceFiscale, serviceContext); } - @Override - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica addStoricoSoggettoPraticaForImport( - long intPraticaId, java.lang.String nome, java.lang.String cognome, - java.lang.String codiceFiscale, long oldStoricoSoggettoPraticaId, - com.liferay.portal.service.ServiceContext serviceContext) - throws com.liferay.portal.kernel.exception.PortalException, - com.liferay.portal.kernel.exception.SystemException { - return _storicoSoggettoPraticaLocalService.addStoricoSoggettoPraticaForImport(intPraticaId, - nome, cognome, codiceFiscale, oldStoricoSoggettoPraticaId, - serviceContext); - } - - @Override - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _storicoSoggettoPraticaLocalService.fetchByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - } - @Override public java.util.List findByIntPratica( long companyId, long intPraticaId, int start, int end) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java index 44982c8f..42e67c49 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalService.java @@ -363,11 +363,6 @@ public interface TempisticaLocalService extends BaseLocalService, public int countScadenzeIntegrazioni(long companyId, long groupId) throws com.liferay.portal.kernel.exception.SystemException; - @Transactional(propagation = Propagation.SUPPORTS, readOnly = true) - public it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException; - public java.util.List findByIntPratica_Tipo( long intPraticaId, java.lang.String tipo) throws com.liferay.portal.kernel.exception.SystemException; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java index 9d263804..4b4830a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceClp.java @@ -196,61 +196,57 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { _methodParameterTypes35 = new String[] { "long", "long" }; - _methodName36 = "fetchByOldTempisticaId"; + _methodName36 = "findByIntPratica_Tipo"; - _methodParameterTypes36 = new String[] { "long" }; + _methodParameterTypes36 = new String[] { "long", "java.lang.String" }; - _methodName37 = "findByIntPratica_Tipo"; + _methodName37 = "countPraticheScaduteAutorizzazione"; - _methodParameterTypes37 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes37 = new String[] { "long", "long" }; - _methodName38 = "countPraticheScaduteAutorizzazione"; + _methodName38 = "countPraticheScaduteSorteggiate"; _methodParameterTypes38 = new String[] { "long", "long" }; - _methodName39 = "countPraticheScaduteSorteggiate"; + _methodName39 = "countPraticheScaduteControlloObbligatorio"; _methodParameterTypes39 = new String[] { "long", "long" }; - _methodName40 = "countPraticheScaduteControlloObbligatorio"; + _methodName40 = "countPraticheInScadenzaAutorizzazioni"; _methodParameterTypes40 = new String[] { "long", "long" }; - _methodName41 = "countPraticheInScadenzaAutorizzazioni"; + _methodName41 = "countPraticheInScadenzaSorteggiate"; _methodParameterTypes41 = new String[] { "long", "long" }; - _methodName42 = "countPraticheInScadenzaSorteggiate"; + _methodName42 = "countPraticheInScadenzaControlloObbligatorio"; _methodParameterTypes42 = new String[] { "long", "long" }; - _methodName43 = "countPraticheInScadenzaControlloObbligatorio"; + _methodName43 = "praticheAttiveAutorizzazioni"; _methodParameterTypes43 = new String[] { "long", "long" }; - _methodName44 = "praticheAttiveAutorizzazioni"; + _methodName44 = "praticheAttiveSorteggiate"; _methodParameterTypes44 = new String[] { "long", "long" }; - _methodName45 = "praticheAttiveSorteggiate"; + _methodName45 = "praticheAttiveControlloObbligatorio"; _methodParameterTypes45 = new String[] { "long", "long" }; - _methodName46 = "praticheAttiveControlloObbligatorio"; + _methodName46 = "getDtSottopostaAParere"; - _methodParameterTypes46 = new String[] { "long", "long" }; + _methodParameterTypes46 = new String[] { "long" }; - _methodName47 = "getDtSottopostaAParere"; + _methodName47 = "countPraticheAttivePerDiscriminazione"; - _methodParameterTypes47 = new String[] { "long" }; + _methodParameterTypes47 = new String[] { "long", "long" }; - _methodName48 = "countPraticheAttivePerDiscriminazione"; + _methodName48 = "scadenzePraticheForBackwardCompatibility"; - _methodParameterTypes48 = new String[] { "long", "long" }; - - _methodName49 = "scadenzePraticheForBackwardCompatibility"; - - _methodParameterTypes49 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes48 = new String[] { "long", "long", "int", "int" }; } @Override @@ -1364,35 +1360,6 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { return ((Integer)returnObj).intValue(); } - @Override - public it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException { - Object returnObj = null; - - try { - returnObj = _invokableLocalService.invokeMethod(_methodName36, - _methodParameterTypes36, new Object[] { oldTempisticaId }); - } - catch (Throwable t) { - t = ClpSerializer.translateThrowable(t); - - if (t instanceof com.liferay.portal.kernel.exception.SystemException) { - throw (com.liferay.portal.kernel.exception.SystemException)t; - } - - if (t instanceof RuntimeException) { - throw (RuntimeException)t; - } - else { - throw new RuntimeException(t.getClass().getName() + - " is not a valid exception"); - } - } - - return (it.tref.liferay.portos.bo.model.Tempistica)ClpSerializer.translateOutput(returnObj); - } - @Override public java.util.List findByIntPratica_Tipo( long intPraticaId, java.lang.String tipo) @@ -1400,8 +1367,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName37, - _methodParameterTypes37, + returnObj = _invokableLocalService.invokeMethod(_methodName36, + _methodParameterTypes36, new Object[] { intPraticaId, @@ -1433,8 +1400,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName38, - _methodParameterTypes38, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName37, + _methodParameterTypes37, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1461,8 +1428,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName39, - _methodParameterTypes39, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName38, + _methodParameterTypes38, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1490,8 +1457,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName40, - _methodParameterTypes40, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName39, + _methodParameterTypes39, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1519,8 +1486,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName41, - _methodParameterTypes41, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName40, + _methodParameterTypes40, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1547,8 +1514,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName42, - _methodParameterTypes42, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName41, + _methodParameterTypes41, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1576,8 +1543,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName43, - _methodParameterTypes43, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName42, + _methodParameterTypes42, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1605,8 +1572,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName44, - _methodParameterTypes44, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName43, + _methodParameterTypes43, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1634,8 +1601,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName45, - _methodParameterTypes45, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName44, + _methodParameterTypes44, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1663,8 +1630,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName46, - _methodParameterTypes46, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName45, + _methodParameterTypes45, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1691,8 +1658,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName47, - _methodParameterTypes47, new Object[] { intPraticaId }); + returnObj = _invokableLocalService.invokeMethod(_methodName46, + _methodParameterTypes46, new Object[] { intPraticaId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1719,8 +1686,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName48, - _methodParameterTypes48, new Object[] { companyId, groupId }); + returnObj = _invokableLocalService.invokeMethod(_methodName47, + _methodParameterTypes47, new Object[] { companyId, groupId }); } catch (Throwable t) { t = ClpSerializer.translateThrowable(t); @@ -1743,8 +1710,8 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { Object returnObj = null; try { - returnObj = _invokableLocalService.invokeMethod(_methodName49, - _methodParameterTypes49, + returnObj = _invokableLocalService.invokeMethod(_methodName48, + _methodParameterTypes48, new Object[] { companyId, groupId, start, end }); } catch (Throwable t) { @@ -1859,6 +1826,4 @@ public class TempisticaLocalServiceClp implements TempisticaLocalService { private String[] _methodParameterTypes47; private String _methodName48; private String[] _methodParameterTypes48; - private String _methodName49; - private String[] _methodParameterTypes49; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java index 480ad344..29345304 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceUtil.java @@ -422,12 +422,6 @@ public class TempisticaLocalServiceUtil { return getService().countScadenzeIntegrazioni(companyId, groupId); } - public static it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getService().fetchByOldTempisticaId(oldTempisticaId); - } - public static java.util.List findByIntPratica_Tipo( long intPraticaId, java.lang.String tipo) throws com.liferay.portal.kernel.exception.SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java index 070cdd54..be6a55ce 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/TempisticaLocalServiceWrapper.java @@ -453,13 +453,6 @@ public class TempisticaLocalServiceWrapper implements TempisticaLocalService, groupId); } - @Override - public it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return _tempisticaLocalService.fetchByOldTempisticaId(oldTempisticaId); - } - @Override public java.util.List findByIntPratica_Tipo( long intPraticaId, java.lang.String tipo) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java index dd96f64e..b38fdeff 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistence.java @@ -1255,64 +1255,6 @@ public interface CollaudoPersistence extends BasePersistence { public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws com.liferay.portal.kernel.exception.SystemException; - /** - * Returns the collaudo where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchCollaudoException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching collaudo - * @throws it.tref.liferay.portos.bo.NoSuchCollaudoException if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Collaudo findByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchCollaudoException; - - /** - * Returns the collaudo where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching collaudo, or null if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the collaudo where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching collaudo, or null if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the collaudo where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the collaudo that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Collaudo removeByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchCollaudoException; - - /** - * Returns the number of collaudos where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching collaudos - * @throws SystemException if a system exception occurred - */ - public int countByOldDettPraticaId(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Caches the collaudo in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java index 5a1e40dd..12303223 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/CollaudoUtil.java @@ -1592,75 +1592,6 @@ public class CollaudoUtil { .countByIntPraticaId_Parziale(intPraticaId, parziale); } - /** - * Returns the collaudo where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchCollaudoException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching collaudo - * @throws it.tref.liferay.portos.bo.NoSuchCollaudoException if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Collaudo findByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchCollaudoException { - return getPersistence().findByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the collaudo where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching collaudo, or null if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().fetchByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the collaudo where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching collaudo, or null if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Collaudo fetchByOldDettPraticaId( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldDettPraticaId(oldDettPraticaId, retrieveFromCache); - } - - /** - * Removes the collaudo where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the collaudo that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Collaudo removeByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchCollaudoException { - return getPersistence().removeByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the number of collaudos where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching collaudos - * @throws SystemException if a system exception occurred - */ - public static int countByOldDettPraticaId(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().countByOldDettPraticaId(oldDettPraticaId); - } - /** * Caches the collaudo in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java index 79d089ac..e7c32a55 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistence.java @@ -652,64 +652,6 @@ public interface DettPraticaPersistence extends BasePersistence { java.lang.String protocollo) throws com.liferay.portal.kernel.exception.SystemException; - /** - * Returns the dett pratica where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDettPraticaException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica - * @throws it.tref.liferay.portos.bo.NoSuchDettPraticaException if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica findByOldDettPratica( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException; - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPratica( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPratica( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the dett pratica where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the dett pratica that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica removeByOldDettPratica( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException; - - /** - * Returns the number of dett praticas where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching dett praticas - * @throws SystemException if a system exception occurred - */ - public int countByOldDettPratica(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Returns all the dett praticas where intPraticaId = ? and tipoIntegrazione = ? and completa = ?. * @@ -1025,64 +967,6 @@ public interface DettPraticaPersistence extends BasePersistence { java.lang.String tipoIntegrazione) throws com.liferay.portal.kernel.exception.SystemException; - /** - * Returns the dett pratica where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDettPraticaException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica - * @throws it.tref.liferay.portos.bo.NoSuchDettPraticaException if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica findByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException; - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the dett pratica where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the dett pratica that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DettPratica removeByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException; - - /** - * Returns the number of dett praticas where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching dett praticas - * @throws SystemException if a system exception occurred - */ - public int countByOldDettPraticaId(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Caches the dett pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java index 1073369b..6fcc52c6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DettPraticaUtil.java @@ -838,75 +838,6 @@ public class DettPraticaUtil { .countByC_G_Protocollo(companyId, groupId, protocollo); } - /** - * Returns the dett pratica where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDettPraticaException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica - * @throws it.tref.liferay.portos.bo.NoSuchDettPraticaException if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica findByOldDettPratica( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException { - return getPersistence().findByOldDettPratica(oldDettPraticaId); - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPratica( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().fetchByOldDettPratica(oldDettPraticaId); - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPratica( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldDettPratica(oldDettPraticaId, retrieveFromCache); - } - - /** - * Removes the dett pratica where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the dett pratica that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica removeByOldDettPratica( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException { - return getPersistence().removeByOldDettPratica(oldDettPraticaId); - } - - /** - * Returns the number of dett praticas where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching dett praticas - * @throws SystemException if a system exception occurred - */ - public static int countByOldDettPratica(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().countByOldDettPratica(oldDettPraticaId); - } - /** * Returns all the dett praticas where intPraticaId = ? and tipoIntegrazione = ? and completa = ?. * @@ -1302,75 +1233,6 @@ public class DettPraticaUtil { tipoIntegrazione); } - /** - * Returns the dett pratica where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDettPraticaException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica - * @throws it.tref.liferay.portos.bo.NoSuchDettPraticaException if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica findByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException { - return getPersistence().findByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().fetchByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica fetchByOldDettPraticaId( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldDettPraticaId(oldDettPraticaId, retrieveFromCache); - } - - /** - * Removes the dett pratica where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the dett pratica that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DettPratica removeByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDettPraticaException { - return getPersistence().removeByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the number of dett praticas where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching dett praticas - * @throws SystemException if a system exception occurred - */ - public static int countByOldDettPraticaId(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().countByOldDettPraticaId(oldDettPraticaId); - } - /** * Caches the dett pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java index 46c7ddab..6a7ea34f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistence.java @@ -444,64 +444,6 @@ public interface DocPraticaPersistence extends BasePersistence { public int countByDlFileEntry(long dlFileEntryId) throws com.liferay.portal.kernel.exception.SystemException; - /** - * Returns the doc pratica where oldDocPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDocPraticaException} if it could not be found. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the matching doc pratica - * @throws it.tref.liferay.portos.bo.NoSuchDocPraticaException if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DocPratica findByOldDocPratica( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDocPraticaException; - - /** - * Returns the doc pratica where oldDocPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the matching doc pratica, or null if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPratica( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the doc pratica where oldDocPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDocPraticaId the old doc pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching doc pratica, or null if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPratica( - long oldDocPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the doc pratica where oldDocPraticaId = ? from the database. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the doc pratica that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.DocPratica removeByOldDocPratica( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDocPraticaException; - - /** - * Returns the number of doc praticas where oldDocPraticaId = ?. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the number of matching doc praticas - * @throws SystemException if a system exception occurred - */ - public int countByOldDocPratica(long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Returns all the doc praticas where intPraticaId = ?. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java index d33bd3b5..09c9d79a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/DocPraticaUtil.java @@ -586,75 +586,6 @@ public class DocPraticaUtil { return getPersistence().countByDlFileEntry(dlFileEntryId); } - /** - * Returns the doc pratica where oldDocPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDocPraticaException} if it could not be found. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the matching doc pratica - * @throws it.tref.liferay.portos.bo.NoSuchDocPraticaException if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DocPratica findByOldDocPratica( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDocPraticaException { - return getPersistence().findByOldDocPratica(oldDocPraticaId); - } - - /** - * Returns the doc pratica where oldDocPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the matching doc pratica, or null if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPratica( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().fetchByOldDocPratica(oldDocPraticaId); - } - - /** - * Returns the doc pratica where oldDocPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDocPraticaId the old doc pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching doc pratica, or null if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DocPratica fetchByOldDocPratica( - long oldDocPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldDocPratica(oldDocPraticaId, retrieveFromCache); - } - - /** - * Removes the doc pratica where oldDocPraticaId = ? from the database. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the doc pratica that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.DocPratica removeByOldDocPratica( - long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchDocPraticaException { - return getPersistence().removeByOldDocPratica(oldDocPraticaId); - } - - /** - * Returns the number of doc praticas where oldDocPraticaId = ?. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the number of matching doc praticas - * @throws SystemException if a system exception occurred - */ - public static int countByOldDocPratica(long oldDocPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().countByOldDocPratica(oldDocPraticaId); - } - /** * Returns all the doc praticas where intPraticaId = ?. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java index d52509a0..0a8cffd9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistence.java @@ -1417,64 +1417,6 @@ public interface FineLavoriPersistence extends BasePersistence { boolean parziale, boolean completata) throws com.liferay.portal.kernel.exception.SystemException; - /** - * Returns the fine lavori where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchFineLavoriException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching fine lavori - * @throws it.tref.liferay.portos.bo.NoSuchFineLavoriException if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.FineLavori findByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchFineLavoriException; - - /** - * Returns the fine lavori where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching fine lavori, or null if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the fine lavori where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching fine lavori, or null if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the fine lavori where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the fine lavori that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.FineLavori removeByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchFineLavoriException; - - /** - * Returns the number of fine lavoris where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching fine lavoris - * @throws SystemException if a system exception occurred - */ - public int countByOldDettPraticaId(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Caches the fine lavori in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java index 5c6c8855..5d4dffb1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/FineLavoriUtil.java @@ -1795,75 +1795,6 @@ public class FineLavoriUtil { parziale, completata); } - /** - * Returns the fine lavori where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchFineLavoriException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching fine lavori - * @throws it.tref.liferay.portos.bo.NoSuchFineLavoriException if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.FineLavori findByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchFineLavoriException { - return getPersistence().findByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the fine lavori where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching fine lavori, or null if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().fetchByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the fine lavori where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching fine lavori, or null if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.FineLavori fetchByOldDettPraticaId( - long oldDettPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldDettPraticaId(oldDettPraticaId, retrieveFromCache); - } - - /** - * Removes the fine lavori where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the fine lavori that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.FineLavori removeByOldDettPraticaId( - long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchFineLavoriException { - return getPersistence().removeByOldDettPraticaId(oldDettPraticaId); - } - - /** - * Returns the number of fine lavoris where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching fine lavoris - * @throws SystemException if a system exception occurred - */ - public static int countByOldDettPraticaId(long oldDettPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().countByOldDettPraticaId(oldDettPraticaId); - } - /** * Caches the fine lavori in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java index 622b24de..c1ca83e5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistence.java @@ -386,64 +386,6 @@ public interface SorteggioPersistence extends BasePersistence { public int countByUuid_C(java.lang.String uuid, long companyId) throws com.liferay.portal.kernel.exception.SystemException; - /** - * Returns the sorteggio where oldSorteggioId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchSorteggioException} if it could not be found. - * - * @param oldSorteggioId the old sorteggio ID - * @return the matching sorteggio - * @throws it.tref.liferay.portos.bo.NoSuchSorteggioException if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Sorteggio findByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchSorteggioException; - - /** - * Returns the sorteggio where oldSorteggioId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldSorteggioId the old sorteggio ID - * @return the matching sorteggio, or null if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the sorteggio where oldSorteggioId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldSorteggioId the old sorteggio ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching sorteggio, or null if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the sorteggio where oldSorteggioId = ? from the database. - * - * @param oldSorteggioId the old sorteggio ID - * @return the sorteggio that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Sorteggio removeByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchSorteggioException; - - /** - * Returns the number of sorteggios where oldSorteggioId = ?. - * - * @param oldSorteggioId the old sorteggio ID - * @return the number of matching sorteggios - * @throws SystemException if a system exception occurred - */ - public int countByOldSorteggioId(long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Returns all the sorteggios where companyId = ? and groupId = ?. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java index 5f78851f..77ae8a7d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/SorteggioUtil.java @@ -517,75 +517,6 @@ public class SorteggioUtil { return getPersistence().countByUuid_C(uuid, companyId); } - /** - * Returns the sorteggio where oldSorteggioId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchSorteggioException} if it could not be found. - * - * @param oldSorteggioId the old sorteggio ID - * @return the matching sorteggio - * @throws it.tref.liferay.portos.bo.NoSuchSorteggioException if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Sorteggio findByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchSorteggioException { - return getPersistence().findByOldSorteggioId(oldSorteggioId); - } - - /** - * Returns the sorteggio where oldSorteggioId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldSorteggioId the old sorteggio ID - * @return the matching sorteggio, or null if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().fetchByOldSorteggioId(oldSorteggioId); - } - - /** - * Returns the sorteggio where oldSorteggioId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldSorteggioId the old sorteggio ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching sorteggio, or null if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Sorteggio fetchByOldSorteggioId( - long oldSorteggioId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldSorteggioId(oldSorteggioId, retrieveFromCache); - } - - /** - * Removes the sorteggio where oldSorteggioId = ? from the database. - * - * @param oldSorteggioId the old sorteggio ID - * @return the sorteggio that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Sorteggio removeByOldSorteggioId( - long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchSorteggioException { - return getPersistence().removeByOldSorteggioId(oldSorteggioId); - } - - /** - * Returns the number of sorteggios where oldSorteggioId = ?. - * - * @param oldSorteggioId the old sorteggio ID - * @return the number of matching sorteggios - * @throws SystemException if a system exception occurred - */ - public static int countByOldSorteggioId(long oldSorteggioId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().countByOldSorteggioId(oldSorteggioId); - } - /** * Returns all the sorteggios where companyId = ? and groupId = ?. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java index 98860d7a..c1ac7f6d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistence.java @@ -185,65 +185,6 @@ public interface StoricoSoggettoPraticaPersistence extends BasePersistencenull if it could not be found. Uses the finder cache. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the matching storico soggetto pratica, or null if a matching storico soggetto pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the storico soggetto pratica where oldStoricoSoggettoPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching storico soggetto pratica, or null if a matching storico soggetto pratica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the storico soggetto pratica where oldStoricoSoggettoPraticaId = ? from the database. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the storico soggetto pratica that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.StoricoSoggettoPratica removeByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException; - - /** - * Returns the number of storico soggetto praticas where oldStoricoSoggettoPraticaId = ?. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the number of matching storico soggetto praticas - * @throws SystemException if a system exception occurred - */ - public int countByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Caches the storico soggetto pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java index a2aa7b02..b28783d9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaUtil.java @@ -293,81 +293,6 @@ public class StoricoSoggettoPraticaUtil { return getPersistence().countByC_IntPratica(companyId, intPraticaId); } - /** - * Returns the storico soggetto pratica where oldStoricoSoggettoPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException} if it could not be found. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the matching storico soggetto pratica - * @throws it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException if a matching storico soggetto pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.StoricoSoggettoPratica findByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException { - return getPersistence() - .findByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - } - - /** - * Returns the storico soggetto pratica where oldStoricoSoggettoPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the matching storico soggetto pratica, or null if a matching storico soggetto pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - } - - /** - * Returns the storico soggetto pratica where oldStoricoSoggettoPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching storico soggetto pratica, or null if a matching storico soggetto pratica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId, - retrieveFromCache); - } - - /** - * Removes the storico soggetto pratica where oldStoricoSoggettoPraticaId = ? from the database. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the storico soggetto pratica that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.StoricoSoggettoPratica removeByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchStoricoSoggettoPraticaException { - return getPersistence() - .removeByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - } - - /** - * Returns the number of storico soggetto praticas where oldStoricoSoggettoPraticaId = ?. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the number of matching storico soggetto praticas - * @throws SystemException if a system exception occurred - */ - public static int countByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .countByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - } - /** * Caches the storico soggetto pratica in the entity cache if it is enabled. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java index 094932ee..5da074e1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaPersistence.java @@ -672,64 +672,6 @@ public interface TempisticaPersistence extends BasePersistence { public int countByIntPratica_Tipo(long intPraticaId, java.lang.String tipo) throws com.liferay.portal.kernel.exception.SystemException; - /** - * Returns the tempistica where oldTempisticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchTempisticaException} if it could not be found. - * - * @param oldTempisticaId the old tempistica ID - * @return the matching tempistica - * @throws it.tref.liferay.portos.bo.NoSuchTempisticaException if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Tempistica findByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchTempisticaException; - - /** - * Returns the tempistica where oldTempisticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldTempisticaId the old tempistica ID - * @return the matching tempistica, or null if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Returns the tempistica where oldTempisticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldTempisticaId the old tempistica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching tempistica, or null if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException; - - /** - * Removes the tempistica where oldTempisticaId = ? from the database. - * - * @param oldTempisticaId the old tempistica ID - * @return the tempistica that was removed - * @throws SystemException if a system exception occurred - */ - public it.tref.liferay.portos.bo.model.Tempistica removeByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchTempisticaException; - - /** - * Returns the number of tempisticas where oldTempisticaId = ?. - * - * @param oldTempisticaId the old tempistica ID - * @return the number of matching tempisticas - * @throws SystemException if a system exception occurred - */ - public int countByOldTempisticaId(long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException; - /** * Returns all the tempisticas where companyId = ? and intPraticaId = ? and tipo = ? and completo = ?. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java index cb7c04ba..5fde7b77 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/persistence/TempisticaUtil.java @@ -865,75 +865,6 @@ public class TempisticaUtil { return getPersistence().countByIntPratica_Tipo(intPraticaId, tipo); } - /** - * Returns the tempistica where oldTempisticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchTempisticaException} if it could not be found. - * - * @param oldTempisticaId the old tempistica ID - * @return the matching tempistica - * @throws it.tref.liferay.portos.bo.NoSuchTempisticaException if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Tempistica findByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchTempisticaException { - return getPersistence().findByOldTempisticaId(oldTempisticaId); - } - - /** - * Returns the tempistica where oldTempisticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldTempisticaId the old tempistica ID - * @return the matching tempistica, or null if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().fetchByOldTempisticaId(oldTempisticaId); - } - - /** - * Returns the tempistica where oldTempisticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldTempisticaId the old tempistica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching tempistica, or null if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Tempistica fetchByOldTempisticaId( - long oldTempisticaId, boolean retrieveFromCache) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence() - .fetchByOldTempisticaId(oldTempisticaId, retrieveFromCache); - } - - /** - * Removes the tempistica where oldTempisticaId = ? from the database. - * - * @param oldTempisticaId the old tempistica ID - * @return the tempistica that was removed - * @throws SystemException if a system exception occurred - */ - public static it.tref.liferay.portos.bo.model.Tempistica removeByOldTempisticaId( - long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException, - it.tref.liferay.portos.bo.NoSuchTempisticaException { - return getPersistence().removeByOldTempisticaId(oldTempisticaId); - } - - /** - * Returns the number of tempisticas where oldTempisticaId = ?. - * - * @param oldTempisticaId the old tempistica ID - * @return the number of matching tempisticas - * @throws SystemException if a system exception occurred - */ - public static int countByOldTempisticaId(long oldTempisticaId) - throws com.liferay.portal.kernel.exception.SystemException { - return getPersistence().countByOldTempisticaId(oldTempisticaId); - } - /** * Returns all the tempisticas where companyId = ? and intPraticaId = ? and tipo = ? and completo = ?. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java index a1405ea2..477033e4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/PraticaUtil.java @@ -77,7 +77,6 @@ public class PraticaUtil { hiddens.add("workflowForzato"); hiddens.add("soggettoSostituitoId"); hiddens.add("dtInvioSignal"); - hiddens.add("oldDettPraticaId"); hiddens.add("tipoIntegrazione"); hiddens.add("varianteSostanziale"); hiddens.add("varianteNumero"); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java index 2ab809e1..ed8cf3dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/util/ValidazionePraticaUtil.java @@ -22,7 +22,6 @@ import it.tref.liferay.portos.bo.shared.util.SezioniUtil; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.shared.util.TipoSoggettoUtil; -import it.tref.liferay.portos.bo.util.AsseverazioniUtil; import java.io.IOException; import java.util.ArrayList; @@ -90,15 +89,14 @@ public class ValidazionePraticaUtil { return (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE); } - public static boolean canDeletePratica(long intPraticaId, long userId) throws PortalException, - SystemException { + public static boolean canDeletePratica(long intPraticaId, long userId) throws PortalException, SystemException { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); DettPratica dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); return (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || (dettPratica != null && dettPratica - .getStatus() == WorkflowConstants.STATUS_DRAFT) - && Validator.isNull(dettPratica.getTipoIntegrazione())) && intPratica.getUserId() == userId; + .getStatus() == WorkflowConstants.STATUS_DRAFT) && Validator.isNull(dettPratica.getTipoIntegrazione())) + && intPratica.getUserId() == userId; } public static boolean canEditUsers(long intPraticaId) throws PortalException, SystemException { @@ -106,10 +104,8 @@ public class ValidazionePraticaUtil { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); return !intPratica.isSospesa() && !intPratica.isAnnullata() && !canEditPratica(intPraticaId) - && !praticaHasVarianteInProgress(intPraticaId) - && !praticaHasRichiestaIntegrazioneAttiva(intPraticaId) - && !praticaHasIntegrazioneInProgress(intPraticaId) - && !praticaHasFineLavoriInProgress(intPraticaId) + && !praticaHasVarianteInProgress(intPraticaId) && !praticaHasRichiestaIntegrazioneAttiva(intPraticaId) + && !praticaHasIntegrazioneInProgress(intPraticaId) && !praticaHasFineLavoriInProgress(intPraticaId) && !praticaHasCollaudoInProgress(intPraticaId); } @@ -124,8 +120,7 @@ public class ValidazionePraticaUtil { && TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione()); } - public static boolean canAddPagamento(long intPraticaId, long userId) throws SystemException, - PortalException { + public static boolean canAddPagamento(long intPraticaId, long userId) throws SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getLastEditableByIntPratica(intPraticaId); if (Validator.isNull(dettPratica)) { @@ -139,10 +134,9 @@ public class ValidazionePraticaUtil { public static boolean praticaInProgress(long intPraticaId) throws SystemException, PortalException { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( - intPraticaId, Arrays - .asList(TipoIntegrazioneUtil.VARIANTE, TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, - TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(TipoIntegrazioneUtil.VARIANTE, TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, + TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)); return Validator.isNotNull(dettPratica) || intPratica.getStatus() == WorkflowConstants.STATUS_ANY || intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE; @@ -151,8 +145,8 @@ public class ValidazionePraticaUtil { public static boolean praticaCanAddVariante(long intPraticaId) throws SystemException, PortalException { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( - intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIANTE)); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(TipoIntegrazioneUtil.VARIANTE)); if (Validator.isNotNull(dettPratica)) { return false; } @@ -173,23 +167,21 @@ public class ValidazionePraticaUtil { return praticaHasVarianteInProgress(intPraticaId); } - public static boolean praticaHasVarianteInProgress(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaHasVarianteInProgress(long intPraticaId) throws SystemException, PortalException { - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( - intPraticaId, Arrays.asList(TipoIntegrazioneUtil.VARIANTE)); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(TipoIntegrazioneUtil.VARIANTE)); if (Validator.isNotNull(dettPratica)) { return true; } return false; } - public static boolean praticaCanAddIntegrazione(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaCanAddIntegrazione(long intPraticaId) throws SystemException, PortalException { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( - intPraticaId, Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); if (Validator.isNotNull(dettPratica)) { return false; } @@ -199,14 +191,12 @@ public class ValidazionePraticaUtil { .getStatoPratica().equals(StatoPraticaConstants.PREAVVISO_CONTRARIO)); } - public static boolean praticaCanEditIntegrazione(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaCanEditIntegrazione(long intPraticaId) throws SystemException, PortalException { return praticaHasIntegrazioneInProgress(intPraticaId); } - public static boolean praticaCanDeleteIntegrazione(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaCanDeleteIntegrazione(long intPraticaId) throws SystemException, PortalException { return praticaHasIntegrazioneInProgress(intPraticaId); } @@ -219,11 +209,10 @@ public class ValidazionePraticaUtil { || intPratica.getStatoPratica().equals(StatoPraticaConstants.PREAVVISO_CONTRARIO); } - public static boolean praticaHasIntegrazioneInProgress(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaHasIntegrazioneInProgress(long intPraticaId) throws SystemException, PortalException { - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( - intPraticaId, Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); return Validator.isNotNull(dettPratica); } @@ -233,21 +222,20 @@ public class ValidazionePraticaUtil { return Validator.isNotNull(intPratica) && intPratica.isAnnullata(); } - public static boolean praticaCanAddFineLavori(long intPraticaId, String userScreenName) - throws SystemException, PortalException { + public static boolean praticaCanAddFineLavori(long intPraticaId, String userScreenName) throws SystemException, + PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); return Validator.isNotNull(dettPratica) && userScreenName.equalsIgnoreCase(dettPratica.getCodiceFiscaleDelegatoFineLavori()) - && FineLavoriLocalServiceUtil.countByIntPraticaId_Parziale_Completata(intPraticaId, false, - true) == 0 && !praticaHasFineLavoriInProgress(intPraticaId) - && !praticaHasVarianteInProgress(intPraticaId) + && FineLavoriLocalServiceUtil.countByIntPraticaId_Parziale_Completata(intPraticaId, false, true) == 0 + && !praticaHasFineLavoriInProgress(intPraticaId) && !praticaHasVarianteInProgress(intPraticaId) && !praticaHasIntegrazioneInProgress(intPraticaId); } - public static boolean praticaCanEditFineLavori(long intPraticaId, String userScreenName) - throws SystemException, PortalException { + public static boolean praticaCanEditFineLavori(long intPraticaId, String userScreenName) throws SystemException, + PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); return Validator.isNotNull(dettPratica) @@ -255,8 +243,8 @@ public class ValidazionePraticaUtil { && praticaHasFineLavoriInProgress(intPraticaId); } - public static boolean praticaCanDeleteFineLavori(long intPraticaId, String userScreenName) - throws SystemException, PortalException { + public static boolean praticaCanDeleteFineLavori(long intPraticaId, String userScreenName) throws SystemException, + PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); return Validator.isNotNull(dettPratica) @@ -264,20 +252,13 @@ public class ValidazionePraticaUtil { && praticaHasFineLavoriPaymentPending(intPraticaId); } - public static boolean praticaHasFineLavoriInProgress(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaHasFineLavoriInProgress(long intPraticaId) throws SystemException, PortalException { FineLavori fineLavori = FineLavoriServiceUtil.getLastEditable(intPraticaId); return Validator.isNotNull(fineLavori); - // if (Validator.isNotNull(fineLavori) && - // Validator.isNull(fineLavori.getPagamentoId())) { - // return true; - // } - // return false; } - public static boolean praticaHasFineLavoriPaymentPending(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaHasFineLavoriPaymentPending(long intPraticaId) throws SystemException, PortalException { FineLavori fineLavori = FineLavoriServiceUtil.getLastEditable(intPraticaId); if (Validator.isNotNull(fineLavori) && Validator.isNull(fineLavori.getPagamentoId())) { @@ -286,8 +267,8 @@ public class ValidazionePraticaUtil { return false; } - public static boolean praticaCanAddCollaudo(long intPraticaId, String userScreenName) - throws SystemException, PortalException { + public static boolean praticaCanAddCollaudo(long intPraticaId, String userScreenName) throws SystemException, + PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); @@ -299,8 +280,8 @@ public class ValidazionePraticaUtil { && !praticaHasIntegrazioneInProgress(intPraticaId); } - public static boolean praticaCanEditCollaudo(long intPraticaId, String userScreenName) - throws SystemException, PortalException { + public static boolean praticaCanEditCollaudo(long intPraticaId, String userScreenName) throws SystemException, + PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); return Validator.isNotNull(dettPratica) @@ -308,8 +289,8 @@ public class ValidazionePraticaUtil { && praticaHasCollaudoInProgress(intPraticaId); } - public static boolean praticaCanDeleteCollaudo(long intPraticaId, String userScreenName) - throws SystemException, PortalException { + public static boolean praticaCanDeleteCollaudo(long intPraticaId, String userScreenName) throws SystemException, + PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); return Validator.isNotNull(dettPratica) @@ -317,20 +298,13 @@ public class ValidazionePraticaUtil { && praticaHasCollaudoPaymentPending(intPraticaId); } - public static boolean praticaHasCollaudoInProgress(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaHasCollaudoInProgress(long intPraticaId) throws SystemException, PortalException { Collaudo collaudo = CollaudoServiceUtil.getLastEditable(intPraticaId); return Validator.isNotNull(collaudo); - // if (Validator.isNotNull(collaudo) && - // Validator.isNull(collaudo.getPagamentoId())) { - // return true; - // } - // return false; } - public static boolean praticaHasCollaudoPaymentPending(long intPraticaId) throws SystemException, - PortalException { + public static boolean praticaHasCollaudoPaymentPending(long intPraticaId) throws SystemException, PortalException { Collaudo collaudo = CollaudoServiceUtil.getLastEditable(intPraticaId); if (Validator.isNotNull(collaudo) && Validator.isNull(collaudo.getPagamentoId())) { @@ -345,16 +319,13 @@ public class ValidazionePraticaUtil { return AsseverazioniUtil.hasAsseverazioniAttive(dettPraticaId) || (dettPratica.getStatus() == WorkflowConstants.STATUS_DRAFT && SoggettoLocalServiceUtil.countValidTmpByIntPratica(dettPratica.getIntPraticaId()) > 0 - && praticaIsCompleta(dettPraticaId) && !DelegheUtil - .hasDelegheCompilazioneAttive(dettPraticaId)); + && praticaIsCompleta(dettPraticaId) && !DelegheUtil.hasDelegheCompilazioneAttive(dettPraticaId)); } public static boolean pagamentoIsEnable(long dettPraticaId) throws SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - - // && asseverazioniIsCompleted(dettPraticaId); return praticaIsCompleta(dettPraticaId) && !DelegheUtil.hasDelegheCompilazioneAttive(dettPraticaId) && AsseverazioniUtil.allAsseverazioniCompleted(dettPraticaId) // se è un'integrazione non si paga @@ -362,8 +333,7 @@ public class ValidazionePraticaUtil { && !intPratica.getStatoPratica().equals(StatoPraticaConstants.PREAVVISO_CONTRARIO); } - public static boolean canCompleteDettPraticaEsente(long dettPraticaId) throws SystemException, - PortalException { + public static boolean canCompleteDettPraticaEsente(long dettPraticaId) throws SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); @@ -388,8 +358,7 @@ public class ValidazionePraticaUtil { && dettPratica.getStatus() != WorkflowConstants.STATUS_APPROVED; } - public static boolean praticaCanAbort(long intPraticaId, long userId) throws SystemException, - PortalException { + public static boolean praticaCanAbort(long intPraticaId, long userId) throws SystemException, PortalException { IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(intPraticaId); @@ -400,14 +369,12 @@ public class ValidazionePraticaUtil { && !praticaHasIntegrazioneInProgress(intPraticaId) && !praticaHasAnnullamento(intPraticaId); } - public static boolean pagamentoFineLavoriIsEnable(long fineLavoriId) throws SystemException, - PortalException { + public static boolean pagamentoFineLavoriIsEnable(long fineLavoriId) throws SystemException, PortalException { return isFineLavoriDatiCompleted(fineLavoriId) && isFineLavoriAllegatiCompleted(fineLavoriId); } - public static boolean canCompleteFineLavoriEsente(long fineLavoriId) throws SystemException, - PortalException { + public static boolean canCompleteFineLavoriEsente(long fineLavoriId) throws SystemException, PortalException { FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(fineLavoriId); return pagamentoFineLavoriIsEnable(fineLavoriId) && fineLavori.getNormEsenteBollo(); @@ -424,8 +391,7 @@ public class ValidazionePraticaUtil { return pagamentoCollaudoIsEnable(collaudoId) && collaudo.getNormEsenteBollo(); } - public static boolean delegheCompilazioneIsEnable(long dettPraticaId) throws SystemException, - PortalException { + public static boolean delegheCompilazioneIsEnable(long dettPraticaId) throws SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); return SoggettoLocalServiceUtil.countValidTmpByIntPratica(dettPratica.getIntPraticaId()) > 0 @@ -433,8 +399,8 @@ public class ValidazionePraticaUtil { // && asseverazioniIsCompleted(dettPraticaId); } - public static List notCompletedSection(String section, long dettPraticaId) - throws PortalException, SystemException { + public static List notCompletedSection(String section, long dettPraticaId) throws PortalException, + SystemException { switch (section) { case SezioniUtil.SEZIONE_DETTAGLI_PRINCIPALI: @@ -482,7 +448,7 @@ public class ValidazionePraticaUtil { notCompleted.add("sanatorie-obbligatorie"); } } - + if (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P7)) { if (Validator.isNull(dettPratica.getInterventoVoceP7())) { notCompleted.add("intervento-voce-b"); @@ -493,8 +459,7 @@ public class ValidazionePraticaUtil { notCompleted.add("interv-fin-pub-desc"); } - if (dettPratica.getTcAltriInterventi() - && Validator.isNull(dettPratica.getTcAltriInterventiDesc())) { + if (dettPratica.getTcAltriInterventi() && Validator.isNull(dettPratica.getTcAltriInterventiDesc())) { notCompleted.add("tc-altro-intervento"); } @@ -523,9 +488,8 @@ public class ValidazionePraticaUtil { notCompleted.add("Localizzazione geografica mancante"); } - boolean tipologiaCostruttiva = dettPratica.getDestinazione().equals("3") - || dettPratica.getTcInCA() || dettPratica.getTcInAcciaio() - || dettPratica.getTcInMuratura() || dettPratica.getTcInLegno() + boolean tipologiaCostruttiva = dettPratica.getDestinazione().equals("3") || dettPratica.getTcInCA() + || dettPratica.getTcInAcciaio() || dettPratica.getTcInMuratura() || dettPratica.getTcInLegno() || dettPratica.getTcAltro(); if (!tipologiaCostruttiva && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) && !intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P2)) { @@ -543,7 +507,7 @@ public class ValidazionePraticaUtil { /** * ADT - * + * * @param dettPratica * @return */ @@ -559,21 +523,18 @@ public class ValidazionePraticaUtil { IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); /* - * boolean isRiparazioneLocale = - * dettPratica.getTcRiparazioneInterventoLocale() && + * boolean isRiparazioneLocale = dettPratica.getTcRiparazioneInterventoLocale() && * !dettPratica.getTcNuovaCostruzione(); */ boolean collaudatoreNotRequired = dettPratica.getNoCollaudo() || dettPratica.getCollaudoStatico(); - boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici() - || dettPratica.getNormLavoriNoDirettore(); + boolean direttoreLavoriNotRequired = dettPratica.getLavoriPubblici() || dettPratica.getNormLavoriNoDirettore(); boolean dittaNotRequired = dettPratica.getNormLavoriInProprio() || dettPratica.getLavoriPubblici(); List soggettiRichiesti = new ArrayList<>(); List notCompleted = new ArrayList<>(); /* - * if (!SoggettiUtil.isTitolareInSoggetti(intPraticaId)) { - * notCompleted.add("gc-soggetto-00-not-present"); } + * if (!SoggettiUtil.isTitolareInSoggetti(intPraticaId)) { notCompleted.add("gc-soggetto-00-not-present"); } */ switch (intPratica.getTipoProcedura()) { case Constants.PROCEDURA_P1: @@ -653,46 +614,51 @@ public class ValidazionePraticaUtil { } + private static final List infrastrutture = new ArrayList() { + { + add("1A"); + add("2A"); + add("A4A"); + add("A4B"); + add("A4C"); + add("A4D"); + add("A4E"); + add("A4F"); + add("A5A"); + add("B4A"); + add("B4B"); + add("B4C"); + add("B5A"); + } + }; + private static List notCompletedDescrizioneEdificio(long dettPraticaId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); IntPratica intPratica = IntPraticaServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); List notCompleted = new ArrayList<>(); - - // Se in "Dettagli/Destinazione" è selezionato "altri interventi" - // rendere non obbligatoria la compilazione della sezione - // "descrizione interventi" - - if (dettPratica.getDestinazione().equals("3") - || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) + // Se in "Dettagli/Destinazione" è selezionato "altri interventi" rendere non obbligatoria la compilazione della + // sezione "descrizione interventi" + if (dettPratica.getDestinazione().equals("3") || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P1) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P2) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10)) { return notCompleted; } - - List infrastrutture = Arrays.asList("1A", "2A", "A4A", "A4B", "A4C", "A4D", "A4E", "A4F", - "A5A", "B4A", "B4B", "B4C", "B5A"); // se infrastruttura controllo solo DATI INFRASTRUTTURA - boolean infrastruttura = infrastrutture.contains(dettPratica.getDestinazione()); - if (infrastruttura) { - + if (infrastrutture.contains(dettPratica.getDestinazione())) { boolean isCompleted = dettPratica.getDeInfStradaleStrada() || dettPratica.getDeInfStradalePonte() || dettPratica.getDeInfStradaleAltro() || dettPratica.getDeInfIdraulicaLong() || dettPratica.getDeInfIdraulicaTrasv() || dettPratica.getDeInfIdraulicaAltro() || dettPratica.getDeInfOperaAccStradale() || dettPratica.getDeInfOperaAccIdraulica() || dettPratica.getDeInfOperaAccAltro() || dettPratica.getDeInfAltraInfrastruttura() || Validator.isNotNull(dettPratica.getDeInfAltroDesc()); - if (!isCompleted) { notCompleted.add("de-inf-title"); } return notCompleted; } - // se non infrastruttura controllo il resto - // if (Validator.isNull(dettPratica.getDePiani())) { - // Ma perché generare bruttezza quando non è necessario? if (Validator.isNull(dettPratica.getDePiani())) { notCompleted.add("de-piani"); } @@ -720,19 +686,11 @@ public class ValidazionePraticaUtil { if (Validator.isNull(dettPratica.getDePubblica())) { notCompleted.add("de-pubblica"); } - boolean isComponentiCostruttiveDisabled = !dettPratica.getTcNuovaCostruzione() && dettPratica.getTcRiparazioneInterventoLocale(); - if (isComponentiCostruttiveDisabled) { return notCompleted; } - - /* - * if (Validator.isNull(dettPratica.getDccFondazioni())) { - * notCompleted.add("dcc-fondazioni"); } - */ - boolean elevazioni = (Validator.isNotNull(dettPratica.getDccStruttureEleMuraturePietrame()) || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureLaterizio()) || Validator.isNotNull(dettPratica.getDccStruttureEleMuratureMisto()) || Validator @@ -745,24 +703,21 @@ public class ValidazionePraticaUtil { || Validator.isNotNull(dettPratica.getDccStruttureEleMistoMuratura()) || Validator .isNotNull(dettPratica.getDccStruttureEleMistoLegno())) || Validator.isNotNull(dettPratica.getDccStruttureElePrefabbricato()) - || (Validator.isNotNull(dettPratica.getDccStruttureEleAltro()) && Validator - .isNotNull(dettPratica.getDccStruttureEleAltroDescrizione())); + || (Validator.isNotNull(dettPratica.getDccStruttureEleAltro()) && Validator.isNotNull(dettPratica + .getDccStruttureEleAltroDescrizione())); if (!elevazioni) { notCompleted.add("dcc-strutture-ele"); } - boolean orizzontamenti = Validator.isNotNull(dettPratica.getDccOrizzontamentiCAAcciaio()) || Validator.isNotNull(dettPratica.getDccOrizzontamentiLamieraGrecata()) || Validator.isNotNull(dettPratica.getDccOrizzontamentiLegno()) || Validator.isNotNull(dettPratica.getDccOrizzontamentiLegnoCA()) || Validator.isNotNull(dettPratica.getDccOrizzontamentiVolte()) - || (Validator.isNotNull(dettPratica.getDccOrizzontamentiAltro()) && Validator - .isNotNull(dettPratica.getDccOrizzontamentiAltroDescrizione())); - + || (Validator.isNotNull(dettPratica.getDccOrizzontamentiAltro()) && Validator.isNotNull(dettPratica + .getDccOrizzontamentiAltroDescrizione())); if (!orizzontamenti) { notCompleted.add("dcc-orizzontamenti"); } - boolean coperture = Validator.isNotNull(dettPratica.getDccCopertura()) || Validator.isNotNull(dettPratica.getDccCoperturaCAAcciaio()) || Validator.isNotNull(dettPratica.getDccCoperturaLamieraGrecata()) @@ -771,24 +726,20 @@ public class ValidazionePraticaUtil { || Validator.isNotNull(dettPratica.getDccCoperturaLegnoCA()) || Validator.isNotNull(dettPratica.getDccCoperturaPannelli()) || Validator.isNotNull(dettPratica.getDccCoperturaPVCTelonati()) - || (Validator.isNotNull(dettPratica.getDccCoperturaAltro()) && Validator - .isNotNull(dettPratica.getDccCoperturaAltroDesrizione())); - + || (Validator.isNotNull(dettPratica.getDccCoperturaAltro()) && Validator.isNotNull(dettPratica + .getDccCoperturaAltroDesrizione())); if (!coperture) { notCompleted.add("dcc-copertura"); } - boolean non_strutturali = Validator.isNotNull(dettPratica.getDccElemNonStrutLaterizio()) || Validator.isNotNull(dettPratica.getDccElemNonStrutCalcestruzzo()) || Validator.isNotNull(dettPratica.getDccElemNonStrutCartongesso()) || Validator.isNotNull(dettPratica.getDccElemNonStrutLegno()) - || (Validator.isNotNull(dettPratica.getDccElemNonStrutAltro()) && Validator - .isNotNull(dettPratica.getDccElemNonStrutAltroDescrizione())); - + || (Validator.isNotNull(dettPratica.getDccElemNonStrutAltro()) && Validator.isNotNull(dettPratica + .getDccElemNonStrutAltroDescrizione())); if (!non_strutturali) { notCompleted.add("dcc-non_strutturali"); } - boolean rinforzo = Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsCatene()) || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsCordoli()) || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoIniArmate()) @@ -797,88 +748,71 @@ public class ValidazionePraticaUtil { || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoRinforziFRP()) || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoTelaiECerchiature()) || Validator.isNotNull(dettPratica.getDccOpereDiRinforzoInsRompitratta()) - || (Validator.isNotNull(dettPratica.getDccOpereDiRinforzoAltro()) && Validator - .isNotNull(dettPratica.getDccOpereDiRinforzoAltroDescrizione())); - + || (Validator.isNotNull(dettPratica.getDccOpereDiRinforzoAltro()) && Validator.isNotNull(dettPratica + .getDccOpereDiRinforzoAltroDescrizione())); if (!rinforzo) { notCompleted.add("dcc-opere-di-rinforzo"); } - return notCompleted; } - public static List notCompletedSezioneGeologica(long dettPraticaId) throws PortalException, - SystemException { + public static List notCompletedSezioneGeologica(long dettPraticaId) throws PortalException, SystemException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); List notCompleted = new ArrayList<>(); - // Se check NormArt3com3 sez. geologica non obbligatoria if (dettPratica.getNormArt3com3()) { return Collections.emptyList(); } - notCompleted.addAll(notCompletedDatiSezionGeologica(dettPraticaId)); - String pericolositaGeomorfologicaPai = dettPratica.getGeoPericolositaGeomorfica(); String rischioGeomorfologicoPai = dettPratica.getGeoRischioGeomorfologicoPai(); String pericolositaIdraulicaPai = dettPratica.getGeoPericolositaIdraulicaPai(); String rischioIdraulicoPai = dettPratica.getGeoRischioIdraulicoPai(); - - if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), - "A22", QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { + if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), "A22", + QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { if (Validator.isNotNull(pericolositaGeomorfologicaPai) && pericolositaGeomorfologicaPai.equalsIgnoreCase("NA") - && Validator.isNotNull(rischioGeomorfologicoPai) - && rischioGeomorfologicoPai.equalsIgnoreCase("NA") - && Validator.isNotNull(pericolositaIdraulicaPai) - && pericolositaIdraulicaPai.equalsIgnoreCase("NA") + && Validator.isNotNull(rischioGeomorfologicoPai) && rischioGeomorfologicoPai.equalsIgnoreCase("NA") + && Validator.isNotNull(pericolositaIdraulicaPai) && pericolositaIdraulicaPai.equalsIgnoreCase("NA") && Validator.isNotNull(rischioIdraulicoPai) && rischioIdraulicoPai.equalsIgnoreCase("NA")) { notCompleted.add("Nessun allegato per " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A22")); } } - - if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), - "A23", QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { + if (DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(dettPratica.getIntPraticaId(), "A23", + QueryUtil.ALL_POS, QueryUtil.ALL_POS).isEmpty()) { if ((Validator.isNotNull(pericolositaGeomorfologicaPai) && !pericolositaGeomorfologicaPai .equalsIgnoreCase("NA")) || (Validator.isNotNull(rischioGeomorfologicoPai) && !rischioGeomorfologicoPai .equalsIgnoreCase("NA")) || (Validator.isNotNull(pericolositaIdraulicaPai) && !pericolositaIdraulicaPai .equalsIgnoreCase("NA")) - || (Validator.isNotNull(rischioIdraulicoPai) && !rischioIdraulicoPai - .equalsIgnoreCase("NA"))) { + || (Validator.isNotNull(rischioIdraulicoPai) && !rischioIdraulicoPai.equalsIgnoreCase("NA"))) { notCompleted.add("Nessun allegato per " + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-A23")); } } - int indaginiGeologiche = DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologie( - dettPratica.getIntPraticaId(), - DocumentiPraticaUtil.getIndaginiGeologiche().toArray(new String[0])); + dettPratica.getIntPraticaId(), DocumentiPraticaUtil.getIndaginiGeologiche().toArray(new String[0])); if (indaginiGeologiche == 0) { notCompleted.add("Indagini Geologiche non presenti"); } - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - notCompleted.addAll(firmeMancanti(intPratica, dettPratica, DocumentiPraticaUtil.getDocGeologo())); - return notCompleted; } - private static List firmeMancanti(IntPratica intPratica, DettPratica dettPratica, - List tipologie) throws SystemException, PortalException { + private static List firmeMancanti(IntPratica intPratica, DettPratica dettPratica, List tipologie) + throws SystemException, PortalException { List notCompleted = new ArrayList<>(); - List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica(intPratica - .getIntPraticaId()); + List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica(intPratica.getIntPraticaId()); String cfTitolare = intPratica.getUserName(); long intPraticaId = intPratica.getIntPraticaId(); for (String tipologia : tipologie) { - List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - intPraticaId, tipologia, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId, + tipologia, QueryUtil.ALL_POS, QueryUtil.ALL_POS); Set firmeMancanti = new HashSet<>(); for (DocPratica doc : docs) { List firmeObbligatorie = getFirmeObbligatorie(tipologia, dettPratica); @@ -899,17 +833,13 @@ public class ValidazionePraticaUtil { if (!firmeMancanti.isEmpty()) { List tipologieMancanti = new ArrayList<>(); for (String firmaMancante : firmeMancanti) { - tipologieMancanti.add(LanguageUtil.get(Locale.getDefault(), "gc-soggetto-" - + firmaMancante)); + tipologieMancanti.add(LanguageUtil.get(Locale.getDefault(), "gc-soggetto-" + firmaMancante)); } - notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" - + tipologia) - + ", firme mancanti: " + StringUtils.join(tipologieMancanti, ", ")); + notCompleted.add(LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + tipologia) + + ", firme mancanti: " + StringUtils.join(tipologieMancanti, StringPool.COMMA_AND_SPACE)); } } - return notCompleted; - } private static List notCompletedDatiSezionGeologica(long dettPraticaId) throws PortalException, @@ -917,61 +847,16 @@ public class ValidazionePraticaUtil { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); List notCompleted = new ArrayList<>(); - - /* - * if (Validator.isNull(dettPratica.getGeoDtRelazione())) { - * notCompleted.add("geo-dt-relazione"); } if - * (Validator.isNull(dettPratica.getGeoClasseIndagine())) { - * notCompleted.add("geo-classe-indagine"); } if - * (Validator.isNull(dettPratica.getGeoOperaRilevante())) { - * notCompleted.add("geo-opera-rilevante"); } if - * (Validator.isNull(dettPratica.getGeoCategoriaSottosuolo())) { - * notCompleted.add("geo-categoria-sottosuolo"); } if - * (Validator.isNull(dettPratica.getGeoCategoriaTopografica())) { - * notCompleted.add("geo-categoria-topografica"); } if - * (Validator.isNull(dettPratica.getGeoOpereDiSostegno())) { - * notCompleted.add("geo-opere-di-sostegno"); } if - * (Validator.isNull(dettPratica.getGeoConsolidamento())) { - * notCompleted.add("geo-consolidamento"); } if - * (Validator.isNull(dettPratica.getGeoOpereInSotterranea())) { - * notCompleted.add("geo-opere-in-sotterranea"); } if - * (Validator.isNull(dettPratica.getGeoPericolositaGeologica())) { - * notCompleted.add("geo-pericolosita-geologica"); } if - * (Validator.isNull(dettPratica.getGeoPericolositaGeomorfica())) { - * notCompleted.add("geo-pericolosita-geomorfica"); } if - * (Validator.isNull(dettPratica.getGeoRischioGeomorfologicoPai())) { - * notCompleted.add("geo-rischio-geomorfologico"); } - */ if (Validator.isNull(dettPratica.getGeoPericolositaIdraulicaPai())) { notCompleted.add("geo-pericolosita-idraulica-pai"); } if (Validator.isNull(dettPratica.getGeoRischioIdraulicoPai())) { notCompleted.add("geo-rischio-idraulico-pai"); } - /* - * if (Validator.isNull(dettPratica.getGeoPericolositaSismica())) { - * notCompleted.add("geo-pericolosita-sismica"); } if - * (Validator.isNull(dettPratica.getGeoFattibilitaSismica())) { - * notCompleted.add("geo-fattibilita-sismica"); } if - * (Validator.isNull(dettPratica.getGeoPericolositaIdraulica())) { - * notCompleted.add("geo-pericolosita-idraulica"); } if - * (Validator.isNull(dettPratica.getGeoFattibilitaIdraulica())) { - * notCompleted.add("geo-fattibilita-idraulica"); } if - * (Validator.isNull(dettPratica.getGeoFattibilitaGeologica())) { - * notCompleted.add("geo-fattibilita-geologica"); } if - * (Validator.isNull(dettPratica.getGeoPresenzaPrescrizioni())) { - * notCompleted.add("geo-presenza-prescrizioni"); } if - * (Validator.isNull(dettPratica.getGeoEvidenzeGeologiche())) { - * notCompleted.add("geo-evidenze-geologiche-short"); } if - * (Validator.isNull(dettPratica.getGeoEvidenzeGeomorfiche())) { - * notCompleted.add("geo-evidenze-geomorfiche-short"); } - */ - return notCompleted; } - private static List notCompletedSezioneAllegati(long dettPraticaId) throws PortalException, - SystemException { + private static List notCompletedSezioneAllegati(long dettPraticaId) throws PortalException, SystemException { List notCompleted = new ArrayList<>(); DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); long intPraticaId = dettPratica.getIntPraticaId(); @@ -980,12 +865,11 @@ public class ValidazionePraticaUtil { List docObbligatori = DocumentiPraticaUtil.getDocObbligatoriDomanda(intPratica, dettPratica); for (String docObbligatorio : docObbligatori) { - List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - intPraticaId, docObbligatorio, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId, + docObbligatorio, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docs.isEmpty()) { notCompleted.add("Nessun allegato per " - + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" - + docObbligatorio)); + + LanguageUtil.get(LocaleUtil.getDefault(), "label-documenti-tipologia-" + docObbligatorio)); } } @@ -994,16 +878,15 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static List getSignaturePerSubject(long intPraticaId, List signatures, - String tipoSoggetto, long docPraticaClassPk) throws SystemException { + private static List getSignaturePerSubject(long intPraticaId, List signatures, String tipoSoggetto, + long docPraticaClassPk) throws SystemException { List signaturesPerSubject = new ArrayList(); for (String sign : signatures) { - List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale( - intPraticaId, sign, docPraticaClassPk); + List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica_CodiceFiscale(intPraticaId, + sign, docPraticaClassPk); for (Soggetto soggetto : soggetti) { - if (soggetto.getTipologiaSoggetto().equals(tipoSoggetto) - && !signaturesPerSubject.contains(sign)) { + if (soggetto.getTipologiaSoggetto().equals(tipoSoggetto) && !signaturesPerSubject.contains(sign)) { signaturesPerSubject.add(sign); } } @@ -1015,11 +898,10 @@ public class ValidazionePraticaUtil { List tipologiaSoggetti, DocPratica docPratica) throws SystemException { for (String tipoSoggetto : tipologiaSoggetti) { - boolean isRequired = AsseverazioniUtil - .isAsseverazioneRequiredByCodiceDoc(codiceDoc, tipoSoggetto); + boolean isRequired = AsseverazioniUtil.isAsseverazioneRequiredByCodiceDoc(codiceDoc, tipoSoggetto); if (isRequired) { - List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, - tipoSoggetto, docPratica.getClassPk()); + List signaturesPerSubject = getSignaturePerSubject(intPraticaId, signatures, tipoSoggetto, + docPratica.getClassPk()); if (signaturesPerSubject.isEmpty()) { return false; } @@ -1028,13 +910,11 @@ public class ValidazionePraticaUtil { return true; } - public static boolean isFineLavoriDatiCompleted(long fineLavoriId) throws PortalException, - SystemException { + public static boolean isFineLavoriDatiCompleted(long fineLavoriId) throws PortalException, SystemException { return notCompletedFineLavoriDati(fineLavoriId).isEmpty(); } - public static List notCompletedFineLavoriDati(long fineLavoriId) throws PortalException, - SystemException { + public static List notCompletedFineLavoriDati(long fineLavoriId) throws PortalException, SystemException { FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(fineLavoriId); List notCompleted = new ArrayList<>(); @@ -1043,8 +923,7 @@ public class ValidazionePraticaUtil { notCompleted.add("fl-tipo"); } if (fineLavori.getParziale() - && FineLavoriLocalServiceUtil.countByIntPraticaId_Parziale(fineLavori.getIntPraticaId(), - false) > 0) { + && FineLavoriLocalServiceUtil.countByIntPraticaId_Parziale(fineLavori.getIntPraticaId(), false) > 0) { notCompleted.add("fl-parziale-not-possibile"); } if (Validator.isNull(fineLavori.getDataFineLavori())) { @@ -1064,8 +943,7 @@ public class ValidazionePraticaUtil { return notCompleted; } - private static boolean isFineLavoriAllegatiCompleted(long fineLavoriId) throws PortalException, - SystemException { + private static boolean isFineLavoriAllegatiCompleted(long fineLavoriId) throws PortalException, SystemException { FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(fineLavoriId); long intPraticaId = fineLavori.getIntPraticaId(); @@ -1074,31 +952,20 @@ public class ValidazionePraticaUtil { List tipologiaSoggetti = TipoSoggettoUtil.getAllSubjects(); for (String codiceDoc : tipologiaAllegati) { - - // List docs = - // DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId, - // codiceDoc, QueryUtil.ALL_POS, - // QueryUtil.ALL_POS); - // ADT BUG FE ID = 13 - List docs = DocPraticaLocalServiceUtil.findByClassPk_Tipologia(fineLavoriId, - codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + List docs = DocPraticaLocalServiceUtil.findByClassPk_Tipologia(fineLavoriId, codiceDoc, + QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docs.isEmpty()) { - return false; // Ci dev'essere almeno un allegato per tipo - // obbligatorio + return false; // Ci dev'essere almeno un allegato per tipo obbligatorio } for (DocPratica doc : docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); List signatures = firme.allSignatures(); if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, tipologiaSoggetti, doc)) { - return false; // Return false if is required per this - // subjectType but it is not present + return false; // Return false if is required per this subjectType but it is not present } } - } - return true; } @@ -1107,12 +974,10 @@ public class ValidazionePraticaUtil { return notCompletedCollaudoDati(collaudoId).isEmpty(); } - public static List notCompletedCollaudoDati(long collaudoId) throws PortalException, - SystemException { + public static List notCompletedCollaudoDati(long collaudoId) throws PortalException, SystemException { Collaudo collaudo = CollaudoServiceUtil.getCollaudo(collaudoId); List notCompleted = new ArrayList<>(); - if (Validator.isNull(collaudo.getParziale())) { notCompleted.add("col-tipo"); } @@ -1121,8 +986,8 @@ public class ValidazionePraticaUtil { notCompleted.add("col-parziale-not-possibile"); } if (!collaudo.getParziale() - && FineLavoriLocalServiceUtil.countByIntPraticaId_Parziale_Completata( - collaudo.getIntPraticaId(), false, true) == 0) { + && FineLavoriLocalServiceUtil.countByIntPraticaId_Parziale_Completata(collaudo.getIntPraticaId(), + false, true) == 0) { notCompleted.add("col-totale-not-possibile"); } if (Validator.isNull(collaudo.getDataCollaudo())) { @@ -1131,40 +996,30 @@ public class ValidazionePraticaUtil { if (Validator.isNull(collaudo.getCodiceFiscaleDelegato())) { notCompleted.add("col-collaudatore"); } - return notCompleted; } - private static boolean isCollaudoAllegatiCompleted(long collaudoId) throws PortalException, - SystemException { + private static boolean isCollaudoAllegatiCompleted(long collaudoId) throws PortalException, SystemException { Collaudo collaudo = CollaudoServiceUtil.getCollaudo(collaudoId); long intPraticaId = collaudo.getIntPraticaId(); - List tipologiaAllegati = DocumentiPraticaUtil.getDocObbligatoriCollaudo(); List tipologiaSoggetti = TipoSoggettoUtil.getAllSubjects(); - for (String codiceDoc : tipologiaAllegati) { - - List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia( - intPraticaId, codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); + List docs = DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(intPraticaId, + codiceDoc, QueryUtil.ALL_POS, QueryUtil.ALL_POS); if (docs.isEmpty()) { - return false; // Ci dev'essere almeno un allegato per tipo - // obbligatorio + return false; // Ci dev'essere almeno un allegato per tipo obbligatorio } for (DocPratica doc : docs) { - FirmeBean firme = FirmeUtil.deserialize(doc.getJsonFirmatari()); List signatures = firme.allSignatures(); if (!isAllRequiredValid(codiceDoc, intPraticaId, signatures, tipologiaSoggetti, doc)) { - return false; // Return false if is required per this - // subjectType but it is not present + return false; // Return false if is required per this subjectType but it is not present } } - } - return true; } @@ -1172,13 +1027,11 @@ public class ValidazionePraticaUtil { String codiceFiscaleOwner, String jsonFirmatariApplicativo) throws Exception { List signatures = gatherSignatures(fileName, fileBytes, companyId, jsonFirmatariApplicativo); - for (String cfSoggetto : signatures) { if (cfSoggetto.equalsIgnoreCase(codiceFiscaleOwner)) { return true; } } - return false; } @@ -1186,7 +1039,6 @@ public class ValidazionePraticaUtil { List cfSoggetti, String jsonFirmatariApplicativo) throws Exception { List signatures = gatherSignatures(fileName, fileBytes, companyId, jsonFirmatariApplicativo); - for (String cfSign : signatures) { for (String cfSoggetto : cfSoggetti) { if (cfSign.equalsIgnoreCase(cfSoggetto)) { @@ -1194,19 +1046,15 @@ public class ValidazionePraticaUtil { } } } - return false; } - public static boolean isAllegatoSignedBySubjectsAndPerson(String fileName, byte[] fileBytes, - long companyId, List cfSoggetti, String codiceFiscalePersona, - String jsonFirmatariApplicativo) throws Exception { + public static boolean isAllegatoSignedBySubjectsAndPerson(String fileName, byte[] fileBytes, long companyId, + List cfSoggetti, String codiceFiscalePersona, String jsonFirmatariApplicativo) throws Exception { List signatures = gatherSignatures(fileName, fileBytes, companyId, jsonFirmatariApplicativo); - boolean isSignedPersona = false; boolean isSignedSoggetti = false; - for (String cfPersona : signatures) { if (cfPersona.equalsIgnoreCase(codiceFiscalePersona)) { isSignedPersona = true; @@ -1221,7 +1069,6 @@ public class ValidazionePraticaUtil { } } } - return isSignedPersona && isSignedSoggetti; } @@ -1233,20 +1080,17 @@ public class ValidazionePraticaUtil { FirmeBean firme = FirmeUtil.deserialize(jsonFirmatariApplicativo); signatures = firme.allSignatures(); } - if (Validator.isNotNull(fileBytes)) { signatures.addAll(extractSigns(companyId, fileName, fileBytes)); } - return signatures; } - private static Set extractSigns(long companyId, String fileName, byte[] fileBytes) - throws IOException, PortalException, SystemException { + private static Set extractSigns(long companyId, String fileName, byte[] fileBytes) throws IOException, + PortalException, SystemException { Company company = CompanyLocalServiceUtil.getCompany(companyId); String urlPdfExtractor = (String) company.getExpandoBridge().getAttribute("url_pdf_extractor", false); - HttpPost request = new HttpPost(urlPdfExtractor); MultipartEntityBuilder builder = MultipartEntityBuilder.create(); builder.setMode(HttpMultipartMode.BROWSER_COMPATIBLE); @@ -1257,7 +1101,6 @@ public class ValidazionePraticaUtil { int statusCode = httpResponse.getStatusLine().getStatusCode(); String responseBody = EntityUtils.toString(httpResponse.getEntity(), StringPool.UTF8); client.close(); - if (statusCode == HttpServletResponse.SC_OK || statusCode == HttpServletResponse.SC_CREATED) { JSONArray arrayFirme = JSONFactoryUtil.createJSONObject(responseBody).getJSONArray("cf"); Set cf = new HashSet<>(); @@ -1265,38 +1108,32 @@ public class ValidazionePraticaUtil { cf.add(arrayFirme.getString(i)); } return cf; - } else { _log.warn("P7M REST extractor error. Response: " + new String(responseBody)); } - return Collections.emptySet(); } private static List getFirmeObbligatorie(String tipologiaAllegato, DettPratica dettPratica) throws PortalException, SystemException { + List firme = new ArrayList<>(); if (firmeObbligatorie.containsKey(tipologiaAllegato)) { firme.addAll(firmeObbligatorie.get(tipologiaAllegato)); } - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - if (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P8) || intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9) || dettPratica.getNormLavoriNoDirettore()) { firme.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); } - if (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P9)) { firme.remove(TipoSoggettoUtil.PROGETTISTA); } - if (intPratica.getTipoProcedura().equals(Constants.PROCEDURA_P10)) { firme.remove(TipoSoggettoUtil.PROGETTISTA); firme.remove(TipoSoggettoUtil.DIRETTORE_LAVORI); } - return firme; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql index 1c2ac072..26a90794 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql @@ -107,8 +107,7 @@ create table portos_bo_Collaudo ( causalePagamento VARCHAR(75) null, mezzoPagamento VARCHAR(75) null, normEsenteBollo BOOLEAN, - importoBolli VARCHAR(75) null, - oldDettPraticaId LONG + importoBolli VARCHAR(75) null ); create table portos_bo_Comune ( @@ -230,7 +229,6 @@ create table portos_bo_DettPratica ( workflowForzato BOOLEAN, soggettoSostituitoId LONG, dtInvioSignal DATE null, - oldDettPraticaId LONG, destinazione VARCHAR(10) null, ag VARCHAR(10) null, descLongIntervento STRING null, @@ -510,7 +508,6 @@ create table portos_bo_DocPratica ( jsonFirmatari TEXT null, status LONG, errorCode VARCHAR(75) null, - oldDocPraticaId LONG, rimosso BOOLEAN, dettPraticaIdRimozione LONG, dtDataRimozione DATE null @@ -542,8 +539,7 @@ create table portos_bo_FineLavori ( codicePagamento VARCHAR(75) null, causalePagamento VARCHAR(75) null, mezzoPagamento VARCHAR(75) null, - importoBolli VARCHAR(75) null, - oldDettPraticaId LONG + importoBolli VARCHAR(75) null ); create table portos_bo_HistoryWorkflowAction ( @@ -783,8 +779,7 @@ create table portos_bo_Sorteggio ( tecnico VARCHAR(75) null, mesePrecedente VARCHAR(75) null, esterna BOOLEAN, - praticaEsternaId LONG, - oldSorteggioId LONG + praticaEsternaId LONG ); create table portos_bo_StoricoSoggettoPratica ( @@ -798,8 +793,7 @@ create table portos_bo_StoricoSoggettoPratica ( intPraticaId LONG, nome VARCHAR(75) null, cognome VARCHAR(75) null, - codiceFiscale VARCHAR(75) null, - oldStoricoSoggettoPraticaId LONG + codiceFiscale VARCHAR(75) null ); create table portos_bo_Tempistica ( @@ -817,8 +811,7 @@ create table portos_bo_Tempistica ( start_ LONG, stop LONG, wait LONG, - completo BOOLEAN, - oldTempisticaId LONG + completo BOOLEAN ); create table portos_bo_Territorio ( diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml index 6770b874..df8be1b7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml @@ -146,7 +146,6 @@ - @@ -279,7 +278,6 @@ - @@ -563,7 +561,6 @@ - @@ -598,7 +595,6 @@ - @@ -857,7 +853,6 @@ - @@ -874,7 +869,6 @@ - @@ -895,7 +889,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml index 589abeb5..1073f959 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml @@ -124,7 +124,6 @@ - @@ -256,7 +255,6 @@ - 10 @@ -616,7 +614,6 @@ - @@ -650,7 +647,6 @@ - @@ -931,7 +927,6 @@ - @@ -945,7 +940,6 @@ - @@ -963,7 +957,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml index 34eb8b02..77102106 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml @@ -179,7 +179,6 @@ - @@ -382,7 +381,6 @@ TIMESTAMP - @@ -693,7 +691,6 @@ - @@ -745,7 +742,6 @@ - @@ -1109,7 +1105,6 @@ - @@ -1134,7 +1129,6 @@ - @@ -1166,7 +1160,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java index bffb0367..45aa493b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AsseverazioneImpl.java @@ -1,14 +1,12 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. */ @@ -25,17 +23,16 @@ import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONDeserializer; import com.liferay.portal.kernel.json.JSONFactoryUtil; +import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; /** - * The extended model implementation for the Asseverazione service. Represents a - * row in the "portos_bo_Asseverazione" database table, with each - * column mapped to a property of this class. + * The extended model implementation for the Asseverazione service. Represents a row in the + * "portos_bo_Asseverazione" database table, with each column mapped to a property of this class. * *

- * Helper methods and all application logic should be put in this class. - * Whenever methods are added, rerun ServiceBuilder to copy their definitions - * into the {@link it.tref.liferay.portos.bo.model.Asseverazione} interface. + * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Asseverazione} interface. *

* * @author Davide Barbagallo, 3F Consulting @@ -43,14 +40,14 @@ import com.liferay.portal.kernel.util.Validator; public class AsseverazioneImpl extends AsseverazioneBaseImpl { /* * NOTE FOR DEVELOPERS: - * - * Never reference this class directly. All methods that expect a - * asseverazione model instance should use the {@link + * + * Never reference this class directly. All methods that expect a asseverazione model instance should use the {@link * it.tref.liferay.portos.bo.model.Asseverazione} interface instead. */ public AsseverazioneImpl() { } + @Override public Map getDichiarazioniMap() { JSONDeserializer> deserializer = JSONFactoryUtil.createJSONDeserializer(); String dichiarazioni = getDichiarazioni(); @@ -60,8 +57,9 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { return deserializer.deserialize(dichiarazioni); } + @Override public String getModello() throws PortalException, SystemException { - String modello = ""; + String modello = StringPool.BLANK; switch (this.getTipologia()) { case TipoSoggettoUtil.COLLAUDATORE: modello = "AS-COL"; @@ -79,9 +77,8 @@ public class AsseverazioneImpl extends AsseverazioneBaseImpl { modello = "AS-GEO"; break; case TipoSoggettoUtil.PROGETTISTA: - Soggetto soggetto = SoggettoLocalServiceUtil - .getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(this.getIntPraticaId(), - this.getCodiceFiscale(), this.getTipologia()); + Soggetto soggetto = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto( + this.getIntPraticaId(), this.getCodiceFiscale(), this.getTipologia()); if (soggetto.getAmbitoProfessione().equals("architettonico")) { modello = "AS-PRA"; } else { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java index daa06d41..5e98ee6b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/AvvisoImpl.java @@ -61,10 +61,6 @@ public class AvvisoImpl extends AvvisoBaseImpl { * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a avviso model instance should * use the {@link it.tref.liferay.portos.bo.model.Avviso} interface instead. */ - public AvvisoImpl() { - - } - @Override public String getFullDescription() throws PortalException, SystemException { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java index 0376f6f6..abad7ca5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoCacheModel.java @@ -37,7 +37,7 @@ import java.util.Date; public class CollaudoCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(53); + StringBundler sb = new StringBundler(51); sb.append("{uuid="); sb.append(uuid); @@ -89,8 +89,6 @@ public class CollaudoCacheModel implements CacheModel, Externalizable sb.append(normEsenteBollo); sb.append(", importoBolli="); sb.append(importoBolli); - sb.append(", oldDettPraticaId="); - sb.append(oldDettPraticaId); sb.append("}"); return sb.toString(); @@ -214,8 +212,6 @@ public class CollaudoCacheModel implements CacheModel, Externalizable collaudoImpl.setImportoBolli(importoBolli); } - collaudoImpl.setOldDettPraticaId(oldDettPraticaId); - collaudoImpl.resetOriginalValues(); return collaudoImpl; @@ -248,7 +244,6 @@ public class CollaudoCacheModel implements CacheModel, Externalizable mezzoPagamento = objectInput.readUTF(); normEsenteBollo = objectInput.readBoolean(); importoBolli = objectInput.readUTF(); - oldDettPraticaId = objectInput.readLong(); } @Override @@ -338,8 +333,6 @@ public class CollaudoCacheModel implements CacheModel, Externalizable else { objectOutput.writeUTF(importoBolli); } - - objectOutput.writeLong(oldDettPraticaId); } public String uuid; @@ -367,5 +360,4 @@ public class CollaudoCacheModel implements CacheModel, Externalizable public String mezzoPagamento; public boolean normEsenteBollo; public String importoBolli; - public long oldDettPraticaId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java index eee4601e..fe2fe6e6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.model.impl; @@ -28,14 +28,12 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; /** - * The extended model implementation for the Collaudo service. Represents a row - * in the "portos_bo_Collaudo" database table, with each column mapped - * to a property of this class. + * The extended model implementation for the Collaudo service. Represents a row in the "portos_bo_Collaudo" + * database table, with each column mapped to a property of this class. * *

- * Helper methods and all application logic should be put in this class. - * Whenever methods are added, rerun ServiceBuilder to copy their definitions - * into the {@link it.tref.liferay.portos.bo.model.Collaudo} interface. + * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Collaudo} interface. *

* * @author Davide Barbagallo, 3F Consulting @@ -43,75 +41,52 @@ import com.liferay.portal.kernel.util.Validator; public class CollaudoImpl extends CollaudoBaseImpl { /* * NOTE FOR DEVELOPERS: - * - * Never reference this class directly. All methods that expect a collaudo - * model instance should use the {@link + * + * Never reference this class directly. All methods that expect a collaudo model instance should use the {@link * it.tref.liferay.portos.bo.model.Collaudo} interface instead. */ - /** - * - */ private static final long serialVersionUID = -6015747485641141721L; private static final Log _log = LogFactoryUtil.getLog(CollaudoImpl.class); - public CollaudoImpl() { - } - + @Override public String getTitle(Locale locale) { StringBuilder sb = new StringBuilder(); - try { - IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(getIntPraticaId()); - // sb.append("Progetto "); if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) { sb.append("Deposito "); } else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) { sb.append("Autorizzazione "); } sb.append("n. "); - if (Validator.isNotNull(getProtocollo())) { sb.append(intPratica.getNumeroProgetto()); - - // TODO da decidere che data, per adesso si mette quella di - // creazione il numero protocollo sbagliato dovrebbe essere il - // primo - sb.append(" del "); - sb.append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica())); - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); - sb.append(" id "); - sb.append(intPratica.getIntPraticaId()); - + // TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato + // dovrebbe essere il primo + sb.append(" del ").append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica())) + .append(" - id ").append(intPratica.getIntPraticaId()); } else { if (Validator.isNotNull(intPratica.getNumeroProgetto())) { - sb.append(intPratica.getNumeroProgetto()); - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); + sb.append(intPratica.getNumeroProgetto()).append(StringPool.SPACE).append(StringPool.DASH) + .append(StringPool.SPACE); } - sb.append(getCollaudoId()); - sb.append(" (Temporaneo) "); - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); - sb.append(" id "); - sb.append(intPratica.getIntPraticaId()); + sb.append(getCollaudoId()).append(" (Temporaneo) - id ").append(intPratica.getIntPraticaId()); } - - } catch (PortalException e) { - _log.error(e, e); - } catch (SystemException e) { + } catch (PortalException | SystemException e) { _log.error(e, e); } - return sb.toString(); - } + @Override public String getTitle() { return getTitle(LocaleUtil.getSiteDefault()); } + @Override public String getFullDescription() { return getTitle(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java index cd49c204..db45f3a9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/CollaudoModelImpl.java @@ -91,10 +91,9 @@ public class CollaudoModelImpl extends BaseModelImpl { "causalePagamento", Types.VARCHAR }, { "mezzoPagamento", Types.VARCHAR }, { "normEsenteBollo", Types.BOOLEAN }, - { "importoBolli", Types.VARCHAR }, - { "oldDettPraticaId", Types.BIGINT } + { "importoBolli", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_Collaudo (uuid_ VARCHAR(75) null,collaudoId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,parziale BOOLEAN,completata BOOLEAN,gestita BOOLEAN,numero LONG,codiceFiscaleDelegato VARCHAR(75) null,dataEffettuazione DATE null,dataCollaudo DATE null,noteCollaudo STRING null,pagamentoId LONG,codicePagamento VARCHAR(75) null,causalePagamento VARCHAR(75) null,mezzoPagamento VARCHAR(75) null,normEsenteBollo BOOLEAN,importoBolli VARCHAR(75) null,oldDettPraticaId LONG)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_Collaudo (uuid_ VARCHAR(75) null,collaudoId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,parziale BOOLEAN,completata BOOLEAN,gestita BOOLEAN,numero LONG,codiceFiscaleDelegato VARCHAR(75) null,dataEffettuazione DATE null,dataCollaudo DATE null,noteCollaudo STRING null,pagamentoId LONG,codicePagamento VARCHAR(75) null,causalePagamento VARCHAR(75) null,mezzoPagamento VARCHAR(75) null,normEsenteBollo BOOLEAN,importoBolli VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_Collaudo"; public static final String ORDER_BY_JPQL = " ORDER BY collaudo.collaudoId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_Collaudo.collaudoId ASC"; @@ -115,11 +114,10 @@ public class CollaudoModelImpl extends BaseModelImpl public static long COMPLETATA_COLUMN_BITMASK = 4L; public static long GROUPID_COLUMN_BITMASK = 8L; public static long INTPRATICAID_COLUMN_BITMASK = 16L; - public static long OLDDETTPRATICAID_COLUMN_BITMASK = 32L; - public static long PARZIALE_COLUMN_BITMASK = 64L; - public static long PROTOCOLLO_COLUMN_BITMASK = 128L; - public static long UUID_COLUMN_BITMASK = 256L; - public static long COLLAUDOID_COLUMN_BITMASK = 512L; + public static long PARZIALE_COLUMN_BITMASK = 32L; + public static long PROTOCOLLO_COLUMN_BITMASK = 64L; + public static long UUID_COLUMN_BITMASK = 128L; + public static long COLLAUDOID_COLUMN_BITMASK = 256L; /** * Converts the soap model instance into a normal model instance. @@ -159,7 +157,6 @@ public class CollaudoModelImpl extends BaseModelImpl model.setMezzoPagamento(soapModel.getMezzoPagamento()); model.setNormEsenteBollo(soapModel.getNormEsenteBollo()); model.setImportoBolli(soapModel.getImportoBolli()); - model.setOldDettPraticaId(soapModel.getOldDettPraticaId()); return model; } @@ -249,7 +246,6 @@ public class CollaudoModelImpl extends BaseModelImpl attributes.put("mezzoPagamento", getMezzoPagamento()); attributes.put("normEsenteBollo", getNormEsenteBollo()); attributes.put("importoBolli", getImportoBolli()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); return attributes; } @@ -406,12 +402,6 @@ public class CollaudoModelImpl extends BaseModelImpl if (importoBolli != null) { setImportoBolli(importoBolli); } - - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } } @JSON @@ -852,29 +842,6 @@ public class CollaudoModelImpl extends BaseModelImpl _importoBolli = importoBolli; } - @JSON - @Override - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _columnBitmask |= OLDDETTPRATICAID_COLUMN_BITMASK; - - if (!_setOriginalOldDettPraticaId) { - _setOriginalOldDettPraticaId = true; - - _originalOldDettPraticaId = _oldDettPraticaId; - } - - _oldDettPraticaId = oldDettPraticaId; - } - - public long getOriginalOldDettPraticaId() { - return _originalOldDettPraticaId; - } - @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -937,7 +904,6 @@ public class CollaudoModelImpl extends BaseModelImpl collaudoImpl.setMezzoPagamento(getMezzoPagamento()); collaudoImpl.setNormEsenteBollo(getNormEsenteBollo()); collaudoImpl.setImportoBolli(getImportoBolli()); - collaudoImpl.setOldDettPraticaId(getOldDettPraticaId()); collaudoImpl.resetOriginalValues(); @@ -1016,10 +982,6 @@ public class CollaudoModelImpl extends BaseModelImpl collaudoModelImpl._originalCodiceFiscaleDelegato = collaudoModelImpl._codiceFiscaleDelegato; - collaudoModelImpl._originalOldDettPraticaId = collaudoModelImpl._oldDettPraticaId; - - collaudoModelImpl._setOriginalOldDettPraticaId = false; - collaudoModelImpl._columnBitmask = 0; } @@ -1167,14 +1129,12 @@ public class CollaudoModelImpl extends BaseModelImpl collaudoCacheModel.importoBolli = null; } - collaudoCacheModel.oldDettPraticaId = getOldDettPraticaId(); - return collaudoCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(53); + StringBundler sb = new StringBundler(51); sb.append("{uuid="); sb.append(getUuid()); @@ -1226,8 +1186,6 @@ public class CollaudoModelImpl extends BaseModelImpl sb.append(getNormEsenteBollo()); sb.append(", importoBolli="); sb.append(getImportoBolli()); - sb.append(", oldDettPraticaId="); - sb.append(getOldDettPraticaId()); sb.append("}"); return sb.toString(); @@ -1235,7 +1193,7 @@ public class CollaudoModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(82); + StringBundler sb = new StringBundler(79); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Collaudo"); @@ -1341,10 +1299,6 @@ public class CollaudoModelImpl extends BaseModelImpl "importoBolli"); - sb.append( - "oldDettPraticaId"); sb.append(""); @@ -1394,9 +1348,6 @@ public class CollaudoModelImpl extends BaseModelImpl private String _mezzoPagamento; private boolean _normEsenteBollo; private String _importoBolli; - private long _oldDettPraticaId; - private long _originalOldDettPraticaId; - private boolean _setOriginalOldDettPraticaId; private long _columnBitmask; private Collaudo _escapedModel; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java index f8b7bacb..d192bc74 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaCacheModel.java @@ -38,7 +38,7 @@ public class DettPraticaCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(543); + StringBundler sb = new StringBundler(541); sb.append("{uuid="); sb.append(uuid); @@ -108,8 +108,6 @@ public class DettPraticaCacheModel implements CacheModel, sb.append(soggettoSostituitoId); sb.append(", dtInvioSignal="); sb.append(dtInvioSignal); - sb.append(", oldDettPraticaId="); - sb.append(oldDettPraticaId); sb.append(", destinazione="); sb.append(destinazione); sb.append(", ag="); @@ -744,8 +742,6 @@ public class DettPraticaCacheModel implements CacheModel, dettPraticaImpl.setDtInvioSignal(new Date(dtInvioSignal)); } - dettPraticaImpl.setOldDettPraticaId(oldDettPraticaId); - if (destinazione == null) { dettPraticaImpl.setDestinazione(StringPool.BLANK); } @@ -1607,7 +1603,6 @@ public class DettPraticaCacheModel implements CacheModel, workflowForzato = objectInput.readBoolean(); soggettoSostituitoId = objectInput.readLong(); dtInvioSignal = objectInput.readLong(); - oldDettPraticaId = objectInput.readLong(); destinazione = objectInput.readUTF(); ag = objectInput.readUTF(); descLongIntervento = objectInput.readUTF(); @@ -1966,7 +1961,6 @@ public class DettPraticaCacheModel implements CacheModel, objectOutput.writeBoolean(workflowForzato); objectOutput.writeLong(soggettoSostituitoId); objectOutput.writeLong(dtInvioSignal); - objectOutput.writeLong(oldDettPraticaId); if (destinazione == null) { objectOutput.writeUTF(StringPool.BLANK); @@ -2796,7 +2790,6 @@ public class DettPraticaCacheModel implements CacheModel, public boolean workflowForzato; public long soggettoSostituitoId; public long dtInvioSignal; - public long oldDettPraticaId; public String destinazione; public String ag; public String descLongIntervento; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java index f9611d99..f98dd201 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.model.impl; @@ -40,88 +40,73 @@ import com.liferay.portal.kernel.util.TimeZoneUtil; import com.liferay.portal.kernel.util.Validator; /** - * The extended model implementation for the DettPratica service. Represents a - * row in the "portos_bo_DettPratica" database table, with each column - * mapped to a property of this class. + * The extended model implementation for the DettPratica service. Represents a row in the + * "portos_bo_DettPratica" database table, with each column mapped to a property of this class. * *

- * Helper methods and all application logic should be put in this class. - * Whenever methods are added, rerun ServiceBuilder to copy their definitions - * into the {@link it.tref.liferay.portos.bo.model.DettPratica} interface. + * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.DettPratica} interface. *

* * @author Davide Barbagallo, 3F Consulting */ public class DettPraticaImpl extends DettPraticaBaseImpl { - /** - * - */ - private static final long serialVersionUID = 7101706124058496133L; /* - * NOTE FOR DEVELOPERS: Never reference this class directly. All methods - * that expect a dett pratica model instance should use the {@link - * it.tref.liferay.portos.bo.model.DettPratica} interface instead. + * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a dett pratica model instance + * should use the {@link it.tref.liferay.portos.bo.model.DettPratica} interface instead. */ + private static final long serialVersionUID = 7101706124058496133L; + + private static final SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); private static final Log _log = LogFactoryUtil.getLog(DettPraticaImpl.class); public DettPraticaImpl() { - } + @Override public String getTitle(Locale locale) { StringBuilder sb = new StringBuilder(); IntPratica intPratica = null; - try { - intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(getIntPraticaId()); - // sb.append("Progetto "); if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) { sb.append("Deposito "); } else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) { sb.append("Autorizzazione "); } sb.append("n. "); - if (Validator.isNotNull(getProtocollo())) { - sb.append(intPratica.getNumeroProgetto()); - - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - // TODO da decidere che data, per adesso si mette quella di - // creazione il numero protocollo sbagliato dovrebbe essere il - // primo - sb.append(" del "); - sb.append(sdf.format(intPratica.getDtPratica())); + // TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato + // dovrebbe essere il primo + sb.append(intPratica.getNumeroProgetto()).append(" del ").append(sdf.format(intPratica.getDtPratica())); } else { if (Validator.isNotNull(intPratica.getNumeroProgetto())) { - sb.append(intPratica.getNumeroProgetto()); - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); + sb.append(intPratica.getNumeroProgetto()).append(StringPool.SPACE).append(StringPool.DASH) + .append(StringPool.SPACE); } - sb.append(getDettPraticaId()); - sb.append(" (Temporaneo) "); + sb.append(getDettPraticaId()).append(" (Temporaneo) "); } - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); - sb.append(" id "); - sb.append(intPratica.getIntPraticaId()); + sb.append(" - id ").append(intPratica.getIntPraticaId()); } catch (PortalException | SystemException e) { _log.error("Error on IntPratidaId=" + intPratica.getIntPraticaId(), e); } return sb.toString(); } + @Override public String getTitle() { return getTitle(LocaleUtil.getSiteDefault()); } + @Override public String getFullDescription() { StringBuilder sb = new StringBuilder(); if (Validator.isNotNull(getTipoIntegrazione())) { - sb.append(LanguageUtil.get(LocaleUtil.getSiteDefault(), "label-integrazione-" - + getTipoIntegrazione())); + sb.append(LanguageUtil.get(LocaleUtil.getSiteDefault(), "label-integrazione-" + getTipoIntegrazione())); } else { sb.append("Pratica"); } @@ -131,26 +116,23 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { sb.append(LanguageUtil.get(LocaleUtil.getSiteDefault(), " #" + getIntegrazione())); } if (Validator.isNotNull(getProtocollo())) { - sb.append(" protocollo "); - sb.append(getProtocollo()); - sb.append(" del "); - sb.append(FastDateFormatFactoryUtil.getDate(LocaleUtil.getSiteDefault()).format( - getDataEffettuazione())); - + sb.append(" protocollo ") + .append(getProtocollo()) + .append(" del ") + .append(FastDateFormatFactoryUtil.getDate(LocaleUtil.getSiteDefault()).format( + getDataEffettuazione())); } - sb.append(" ("); - sb.append(getTitle()); - sb.append(")"); + sb.append(StringPool.SPACE).append(StringPool.OPEN_PARENTHESIS).append(getTitle()) + .append(StringPool.CLOSE_PARENTHESIS); return sb.toString(); } - // ADT BUG BO ID = 18 + @Override public String getMiddleDescription() { StringBuilder sb = new StringBuilder(); if (Validator.isNotNull(getTipoIntegrazione())) { - sb.append(LanguageUtil.get(LocaleUtil.getSiteDefault(), "label-integrazione-" - + getTipoIntegrazione())); + sb.append(LanguageUtil.get(LocaleUtil.getSiteDefault(), "label-integrazione-" + getTipoIntegrazione())); } else { sb.append("Pratica"); } @@ -159,38 +141,18 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { } else if (Validator.isNotNull(getIntegrazione())) { sb.append(LanguageUtil.get(LocaleUtil.getSiteDefault(), " #" + getIntegrazione())); } - sb.append(" ("); - sb.append(getTitle()); - sb.append(")"); + sb.append(StringPool.SPACE).append(StringPool.OPEN_PARENTHESIS).append(getTitle()) + .append(StringPool.CLOSE_PARENTHESIS); return sb.toString(); } + @Override public String serializeToVersioning() throws NoSuchFieldException, SecurityException { StringBuilder sb = new StringBuilder(); - - sb.append(StringPool.OPEN_CURLY_BRACE); - sb.append(StringPool.QUOTE + "version" + StringPool.QUOTE + StringPool.COLON) - .append(StringPool.QUOTE + Constants.DETTPRATICA_VERSION_IMPL + StringPool.QUOTE - + StringPool.COMMA) - .append(StringPool.QUOTE + "fields" + StringPool.QUOTE + StringPool.COLON) - .append(StringPool.OPEN_BRACKET); - - // sb.append(StringPool.OPEN_CURLY_BRACE); - // sb.append(StringPool.QUOTE + "name" + StringPool.QUOTE + - // StringPool.COLON) - // .append(StringPool.QUOTE + "id" + - // StringPool.QUOTE).append(StringPool.COMMA) - // .append(StringPool.QUOTE + "class" + StringPool.QUOTE + - // StringPool.COLON) - // .append(StringPool.QUOTE + "java.lang.Long" + - // StringPool.QUOTE).append(StringPool.COMMA) - // .append(StringPool.QUOTE + "value" + StringPool.QUOTE + - // StringPool.COLON) - // .append(StringPool.QUOTE + getDettPraticaId() + StringPool.QUOTE); - // sb.append(StringPool.CLOSE_CURLY_BRACE); - // sb.append(StringPool.COMMA); - + sb.append(StringPool.OPEN_CURLY_BRACE).append("\"version\":").append(StringPool.QUOTE) + .append(Constants.DETTPRATICA_VERSION_IMPL).append(StringPool.QUOTE).append(StringPool.COMMA) + .append("\"fields\":").append(StringPool.OPEN_BRACKET); Map modelAttributes = getModelValues(); String privateUuid = "uuid_"; Object[][] columns = DettPraticaModelImpl.TABLE_COLUMNS; @@ -199,90 +161,49 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { if (privateUuid.equals(property)) { property = "uuid"; } - int type = (int) column_x[1]; String className = StringPool.BLANK; - switch (type) { - case Types.VARCHAR: - className = String.class.getCanonicalName(); - break; - case Types.BOOLEAN: - // className = Boolean.class.getCanonicalName(); - className = String.class.getCanonicalName(); - break; - case Types.INTEGER: - className = Integer.class.getCanonicalName(); - break; case Types.BIGINT: className = Long.class.getCanonicalName(); break; + case Types.BOOLEAN: case Types.TIMESTAMP: - // className = Date.class.getCanonicalName(); + case Types.VARCHAR: className = String.class.getCanonicalName(); break; - - default: + case Types.INTEGER: + className = Integer.class.getCanonicalName(); break; } - Object value = modelAttributes.get(property); - // if (Date.class.getName().equals(className)) { - // if (Validator.isNotNull(value)) { - // value = ((Date) value).getTime(); - // } - // } - - sb.append(StringPool.OPEN_CURLY_BRACE); - sb.append(StringPool.QUOTE + "name" + StringPool.QUOTE + StringPool.COLON) - .append(StringPool.QUOTE + property + StringPool.QUOTE) - .append(StringPool.COMMA) - .append(StringPool.QUOTE + "class" + StringPool.QUOTE + StringPool.COLON) - .append(StringPool.QUOTE + className + StringPool.QUOTE) - .append(StringPool.COMMA) - .append(StringPool.QUOTE + "value" + StringPool.QUOTE + StringPool.COLON) - .append(JSONObject.quote(String.valueOf(value)).replaceAll("(\n|\r|\r\n|\n\r)", - StringPool.SPACE)); - - // Vecchio Utilizzo - // HtmlUtil.escapeXPathAttribute(String.valueOf(value)).replaceAll("(\n|\r|\r\n|\n\r)", - // StringPool.SPACE)); - - sb.append(StringPool.CLOSE_CURLY_BRACE); - sb.append(StringPool.COMMA); - + sb.append(StringPool.OPEN_CURLY_BRACE).append("\"name\":").append(StringPool.QUOTE).append(property) + .append(StringPool.QUOTE).append(StringPool.COMMA).append("\"class\":").append(StringPool.QUOTE) + .append(className).append(StringPool.QUOTE).append(StringPool.COMMA).append("\"value\":") + .append(JSONObject.quote(String.valueOf(value)).replaceAll("(\n|\r|\r\n|\n\r)", StringPool.SPACE)) + .append(StringPool.CLOSE_CURLY_BRACE).append(StringPool.COMMA); } - sb.setLength(sb.length() - 1); - sb.append(StringPool.CLOSE_BRACKET); sb.append(StringPool.CLOSE_CURLY_BRACE); - return sb.toString(); } + @Override public String serializeToVersioningPage() throws NoSuchFieldException, SecurityException { StringBuilder sb = new StringBuilder(); - - sb.append(StringPool.OPEN_CURLY_BRACE) - .append(StringPool.QUOTE + "fields" + StringPool.QUOTE + StringPool.COLON) - .append(StringPool.OPEN_BRACKET); - + sb.append(StringPool.OPEN_CURLY_BRACE).append("\"fields\":").append(StringPool.OPEN_BRACKET); Object[][] columns = DettPraticaModelImpl.TABLE_COLUMNS; for (Object[] column_x : columns) { - String property = (String) column_x[0]; if (!PraticaUtil.getDettPraticaHiddenFields().contains(property)) { - sb.append(StringPool.QUOTE + property + StringPool.QUOTE).append(StringPool.COMMA); + sb.append(StringPool.QUOTE).append(property).append(StringPool.QUOTE).append(StringPool.COMMA); } } - sb.setLength(sb.length() - 1); - sb.append(StringPool.CLOSE_BRACKET); sb.append(StringPool.CLOSE_CURLY_BRACE); - return sb.toString(); } @@ -291,7 +212,6 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { Map attributes = new HashMap(); Format dateFormatDateTime = FastDateFormatFactoryUtil.getDateTime(LocaleUtil.getSiteDefault(), TimeZoneUtil.getDefault()); - attributes.put("uuid", getUuid()); attributes.put("dettPraticaId", getDettPraticaId()); attributes.put("companyId", getCompanyId()); @@ -304,8 +224,8 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { attributes.put("integrazione", getIntegrazione()); attributes.put("protocollo", getProtocollo()); attributes.put("tipoIntegrazione", getTipoIntegrazione()); - attributes.put("completa", getCompleta() ? "true" : "false"); - attributes.put("gestita", getGestita() ? "true" : "false"); + attributes.put("completa", getCompleta() ? StringPool.TRUE : StringPool.FALSE); + attributes.put("gestita", getGestita() ? StringPool.TRUE : StringPool.FALSE); attributes.put("importoSpeseIstruttoria", Validator.isNotNull(getImportoSpeseIstruttoria()) ? getImportoSpeseIstruttoria() + "€" : StringPool.BLANK); @@ -323,30 +243,26 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { "mezzoPagamentoBolli", Validator.isNotNull(getMezzoPagamentoBolli()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "mezzo-pagamento-" + getMezzoPagamentoBolli()) : StringPool.BLANK); - - attributes.put( - "dataEffettuazione", - Validator.isNotNull(getDataEffettuazione()) ? dateFormatDateTime - .format(getDataEffettuazione()) : StringPool.BLANK); + attributes.put("dataEffettuazione", + Validator.isNotNull(getDataEffettuazione()) ? dateFormatDateTime.format(getDataEffettuazione()) + : StringPool.BLANK); attributes.put("version", getVersion()); - attributes.put("versionata", getVersionata() ? "true" : "false"); + attributes.put("versionata", getVersionata() ? StringPool.TRUE : StringPool.FALSE); attributes.put("status", getStatus()); attributes.put("statusByUserId", getStatusByUserId()); attributes.put("statusByUserName", getStatusByUserName()); - attributes.put("statusDate", - Validator.isNotNull(getStatusDate()) ? dateFormatDateTime.format(getStatusDate()) - : StringPool.BLANK); + attributes.put("statusDate", Validator.isNotNull(getStatusDate()) ? dateFormatDateTime.format(getStatusDate()) + : StringPool.BLANK); attributes.put("statusTask", getStatusTask()); - attributes.put("workflowForzato", getWorkflowForzato() ? "true" : "false"); + attributes.put("workflowForzato", getWorkflowForzato() ? StringPool.TRUE : StringPool.FALSE); attributes.put("soggettoSostituitoId", getSoggettoSostituitoId()); attributes.put("dtInvioSignal", Validator.isNotNull(getDtInvioSignal()) ? dateFormatDateTime.format(getDtInvioSignal()) : StringPool.BLANK); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); attributes.put( "destinazione", - Validator.isNotNull(getDestinazione()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), - "destinazione-" + getDestinazione()) : StringPool.BLANK); + Validator.isNotNull(getDestinazione()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "destinazione-" + + getDestinazione()) : StringPool.BLANK); attributes.put("ag", getAg()); attributes.put("descLongIntervento", getDescLongIntervento()); attributes.put("via", getVia()); @@ -355,13 +271,15 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { attributes.put("estremiPratCom", getEstremiPratCom()); attributes.put("variataDa", getVariataDa()); attributes.put("varianteNumero", getVarianteNumero()); - attributes.put("varianteSostanziale", getVarianteSostanziale() ? "true" : "false"); - attributes.put("operaConforme", - getOperaConforme() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("collaudoStatico", - getCollaudoStatico() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); + attributes.put("varianteSostanziale", getVarianteSostanziale() ? StringPool.TRUE : StringPool.FALSE); + attributes.put( + "operaConforme", + getOperaConforme() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); + attributes.put( + "collaudoStatico", + getCollaudoStatico() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); attributes.put("codiceFiscaleDelegato", getCodiceFiscaleDelegato()); attributes.put("codiceRuoloDelegato", getCodiceRuoloDelegato()); attributes.put("codiceFiscaleDelegatoCommittente", getCodiceFiscaleDelegatoCommittente()); @@ -373,12 +291,13 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { attributes.put("codiceFiscalePrincipaleDirettoreLavori", getCodiceFiscalePrincipaleDirettoreLavori()); attributes.put("codiceFiscalePrincipaleDitta", getCodiceFiscalePrincipaleDitta()); attributes.put("codiceFiscalePrincipaleGeologo", getCodiceFiscalePrincipaleGeologo()); - attributes.put("lavoriInEconomiaCommittente", getLavoriInEconomiaCommittente() ? "true" : "false"); - attributes.put("inizioLavoriContestualeOpera", getInizioLavoriContestualeOpera() ? "true" : "false"); - attributes.put( - "dataInizioLavoriOpera", - Validator.isNotNull(getDataInizioLavoriOpera()) ? dateFormatDateTime - .format(getDataInizioLavoriOpera()) : StringPool.BLANK); + attributes.put("lavoriInEconomiaCommittente", getLavoriInEconomiaCommittente() ? StringPool.TRUE + : StringPool.FALSE); + attributes.put("inizioLavoriContestualeOpera", getInizioLavoriContestualeOpera() ? StringPool.TRUE + : StringPool.FALSE); + attributes.put("dataInizioLavoriOpera", + Validator.isNotNull(getDataInizioLavoriOpera()) ? dateFormatDateTime.format(getDataInizioLavoriOpera()) + : StringPool.BLANK); attributes.put( "dataInizioEsecuzioneOpera", Validator.isNotNull(getDataInizioEsecuzioneOpera()) ? dateFormatDateTime @@ -388,7 +307,7 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { Validator.isNotNull(getDataFineEsecuzioneOpera()) ? dateFormatDateTime .format(getDataFineEsecuzioneOpera()) : StringPool.BLANK); attributes.put("metratura", getMetratura()); - attributes.put("lavoriPubblici", getLavoriPubblici() ? "true" : "false"); + attributes.put("lavoriPubblici", getLavoriPubblici() ? StringPool.TRUE : StringPool.FALSE); attributes.put("pagamentoIdOneri", getPagamentoIdOneri()); attributes.put("pagamentoIdBolli", getPagamentoIdBolli()); attributes.put("lavoriPubbliciPercentuale", getLavoriPubbliciPercentuale()); @@ -403,16 +322,16 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { + getDePiani()) : StringPool.BLANK); attributes.put( "deAltezza", - Validator.isNotNull(getDeAltezza()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), - "de-altezza-" + getDeAltezza()) : StringPool.BLANK); + Validator.isNotNull(getDeAltezza()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "de-altezza-" + + getDeAltezza()) : StringPool.BLANK); attributes.put( "deInterrati", - Validator.isNotNull(getDeInterrati()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), - "de-interrati-" + getDeInterrati()) : StringPool.BLANK); + Validator.isNotNull(getDeInterrati()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "de-interrati-" + + getDeInterrati()) : StringPool.BLANK); attributes.put( "deSuperficie", - Validator.isNotNull(getDeSuperficie()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), - "de-superficie-" + getDeSuperficie()) : StringPool.BLANK); + Validator.isNotNull(getDeSuperficie()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "de-superficie-" + + getDeSuperficie()) : StringPool.BLANK); attributes.put( "deCostruzione", Validator.isNotNull(getDeCostruzione()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), @@ -421,10 +340,9 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { "deRistrutturazione", Validator.isNotNull(getDeRistrutturazione()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "de-ristrutturazione-" + getDeRistrutturazione()) : StringPool.BLANK); - attributes.put( - "deUso", - Validator.isNotNull(getDeUso()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "de-uso-" - + getDeUso()) : StringPool.BLANK); + attributes.put("deUso", + Validator.isNotNull(getDeUso()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "de-uso-" + getDeUso()) + : StringPool.BLANK); attributes.put("dePubblica", getDePubblica()); attributes.put("dePrivata", getDePrivata()); attributes.put( @@ -435,43 +353,44 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { "dePosizioneEdificio", Validator.isNotNull(getDePosizioneEdificio()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "de-posizione-edificio-" + getDePosizioneEdificio()) : StringPool.BLANK); - attributes.put("deInfStradalePonte", - getDeInfStradalePonte() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("deInfStradaleStrada", - getDeInfStradaleStrada() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("deInfStradaleAltro", - getDeInfStradaleAltro() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("deInfIdraulicaLong", - getDeInfIdraulicaLong() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("deInfIdraulicaTrasv", - getDeInfIdraulicaTrasv() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("deInfIdraulicaAltro", - getDeInfIdraulicaAltro() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); attributes.put( - "deInfOperaAccStradale", - getDeInfOperaAccStradale() ? HtmlUtil - .escape("") : HtmlUtil + "deInfStradalePonte", + getDeInfStradalePonte() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "deInfOperaAccIdraulica", - getDeInfOperaAccIdraulica() ? HtmlUtil - .escape("") : HtmlUtil + "deInfStradaleStrada", + getDeInfStradaleStrada() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); + attributes.put( + "deInfStradaleAltro", + getDeInfStradaleAltro() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("deInfOperaAccAltro", - getDeInfOperaAccAltro() ? HtmlUtil.escape("") + attributes.put( + "deInfIdraulicaLong", + getDeInfIdraulicaLong() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); + attributes.put( + "deInfIdraulicaTrasv", + getDeInfIdraulicaTrasv() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); + attributes.put( + "deInfIdraulicaAltro", + getDeInfIdraulicaAltro() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); + attributes.put("deInfOperaAccStradale", + getDeInfOperaAccStradale() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("deInfOperaAccIdraulica", + getDeInfOperaAccIdraulica() ? HtmlUtil.escape("") : HtmlUtil.escape("")); attributes.put( - "deInfAltraInfrastruttura", - getDeInfAltraInfrastruttura() ? HtmlUtil - .escape("") : HtmlUtil + "deInfOperaAccAltro", + getDeInfOperaAccAltro() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("deInfAltro", getDeInfAltro() ? "true" : "false"); + attributes.put("deInfAltraInfrastruttura", + getDeInfAltraInfrastruttura() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("deInfAltro", getDeInfAltro() ? StringPool.TRUE : StringPool.FALSE); attributes.put( "deInfAltroDesc", Validator.isNotNull(getDeInfAltroDesc()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), @@ -490,11 +409,9 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { getDccStruttureEleMuratureLaterizio() ? HtmlUtil .escape("") : HtmlUtil .escape("")); - attributes.put( - "dccStruttureEleMuratureMisto", - getDccStruttureEleMuratureMisto() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); + attributes.put("dccStruttureEleMuratureMisto", + getDccStruttureEleMuratureMisto() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( "dccStruttureEleMuratureStoriche", getDccStruttureEleMuratureStoriche() ? HtmlUtil @@ -502,131 +419,100 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { .escape("")); attributes.put( "dccStruttureEleAcciaio", - Validator.isNotNull(getDccStruttureEleAcciaio()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "dcc-strutture-ele-acciaio-" - + getDccStruttureEleAcciaio()) : StringPool.BLANK); + Validator.isNotNull(getDccStruttureEleAcciaio()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "dcc-strutture-ele-acciaio-" + getDccStruttureEleAcciaio()) : StringPool.BLANK); attributes.put( "dccStruttureEleCA", Validator.isNotNull(getDccStruttureEleCA()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "dcc-strutture-ele-c-a-" + getDccStruttureEleCA()) : StringPool.BLANK); attributes.put( "dccStruttureEleLegno", - Validator.isNotNull(getDccStruttureEleLegno()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "dcc-strutture-ele-legno-" + getDccStruttureEleLegno()) - : StringPool.BLANK); - attributes.put( - "dccStruttureEleMistoCA", - getDccStruttureEleMistoCA() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccStruttureEleMistoAcciaio", - getDccStruttureEleMistoAcciaio() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccStruttureEleMistoMuratura", - getDccStruttureEleMistoMuratura() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccStruttureEleMistoLegno", - getDccStruttureEleMistoLegno() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccStruttureElePrefabbricato", - getDccStruttureElePrefabbricato() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); + Validator.isNotNull(getDccStruttureEleLegno()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "dcc-strutture-ele-legno-" + getDccStruttureEleLegno()) : StringPool.BLANK); + attributes.put("dccStruttureEleMistoCA", + getDccStruttureEleMistoCA() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccStruttureEleMistoAcciaio", + getDccStruttureEleMistoAcciaio() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccStruttureEleMistoMuratura", + getDccStruttureEleMistoMuratura() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccStruttureEleMistoLegno", + getDccStruttureEleMistoLegno() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccStruttureElePrefabbricato", + getDccStruttureElePrefabbricato() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put("dccStruttureEleAltro", getDccStruttureEleAltro() ? HtmlUtil.escape("") : HtmlUtil.escape("")); attributes.put("dccStruttureEleAltroDescrizione", getDccStruttureEleAltroDescrizione()); - attributes.put( - "dccOrizzontamentiCAAcciaio", - getDccOrizzontamentiCAAcciaio() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOrizzontamentiLegno", - getDccOrizzontamentiLegno() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOrizzontamentiLegnoCA", - getDccOrizzontamentiLegnoCA() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); + attributes.put("dccOrizzontamentiCAAcciaio", + getDccOrizzontamentiCAAcciaio() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOrizzontamentiLegno", + getDccOrizzontamentiLegno() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOrizzontamentiLegnoCA", + getDccOrizzontamentiLegnoCA() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( "dccOrizzontamentiLamieraGrecata", getDccOrizzontamentiLamieraGrecata() ? HtmlUtil .escape("") : HtmlUtil .escape("")); - attributes.put( - "dccOrizzontamentiVolte", - getDccOrizzontamentiVolte() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOrizzontamentiAltro", - getDccOrizzontamentiAltro() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes - .put("dccOrizzontamenti", - Validator.isNotNull(getDccOrizzontamentiAltroDescrizione()) ? getDccOrizzontamentiAltroDescrizione() - : StringPool.BLANK); + attributes.put("dccOrizzontamentiVolte", + getDccOrizzontamentiVolte() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOrizzontamentiAltro", + getDccOrizzontamentiAltro() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOrizzontamenti", + Validator.isNotNull(getDccOrizzontamentiAltroDescrizione()) ? getDccOrizzontamentiAltroDescrizione() + : StringPool.BLANK); attributes.put( "dccCopertura", - Validator.isNotNull(getDccCopertura()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), - "dcc-copertura-" + getDccCopertura()) : StringPool.BLANK); + Validator.isNotNull(getDccCopertura()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "dcc-copertura-" + + getDccCopertura()) : StringPool.BLANK); + attributes.put("dccCoperturaCAAcciaio", + getDccCoperturaCAAcciaio() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( - "dccCoperturaCAAcciaio", - getDccCoperturaCAAcciaio() ? HtmlUtil - .escape("") : HtmlUtil + "dccCoperturaLegno", + getDccCoperturaLegno() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("dccCoperturaLegno", - getDccCoperturaLegno() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("dccCoperturaLegnoCA", - getDccCoperturaLegnoCA() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); attributes.put( - "dccCoperturaLamieraGrecata", - getDccCoperturaLamieraGrecata() ? HtmlUtil - .escape("") : HtmlUtil + "dccCoperturaLegnoCA", + getDccCoperturaLegnoCA() ? HtmlUtil.escape("") : HtmlUtil .escape("")); + attributes.put("dccCoperturaLamieraGrecata", + getDccCoperturaLamieraGrecata() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put("dccCoperturaPannelli", getDccCoperturaPannelli() ? HtmlUtil.escape("") : HtmlUtil.escape("")); - attributes.put( - "dccCoperturaPVCTelonati", - getDccCoperturaPVCTelonati() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put("dccCoperturaLeggere", - getDccCoperturaLeggere() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("dccCoperturaAltro", - getDccCoperturaAltro() ? HtmlUtil.escape("") + attributes.put("dccCoperturaPVCTelonati", + getDccCoperturaPVCTelonati() ? HtmlUtil.escape("") : HtmlUtil.escape("")); - attributes.put("dccCoperturaAltroDesrizione", getDccCoperturaAltroDesrizione()); attributes.put( - "dccElemNonStrutLaterizio", - getDccElemNonStrutLaterizio() ? HtmlUtil - .escape("") : HtmlUtil + "dccCoperturaLeggere", + getDccCoperturaLeggere() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "dccElemNonStrutCartongesso", - getDccElemNonStrutCartongesso() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccElemNonStrutCalcestruzzo", - getDccElemNonStrutCalcestruzzo() ? HtmlUtil - .escape("") : HtmlUtil + "dccCoperturaAltro", + getDccCoperturaAltro() ? HtmlUtil.escape("") : HtmlUtil .escape("")); + attributes.put("dccCoperturaAltroDesrizione", getDccCoperturaAltroDesrizione()); + attributes.put("dccElemNonStrutLaterizio", + getDccElemNonStrutLaterizio() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccElemNonStrutCartongesso", + getDccElemNonStrutCartongesso() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccElemNonStrutCalcestruzzo", + getDccElemNonStrutCalcestruzzo() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put("dccElemNonStrutLegno", getDccElemNonStrutLegno() ? HtmlUtil.escape("") : HtmlUtil.escape("")); @@ -634,36 +520,24 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { getDccElemNonStrutAltro() ? HtmlUtil.escape("") : HtmlUtil.escape("")); attributes.put("dccElemNonStrutAltroDescrizione", getDccElemNonStrutAltroDescrizione()); - attributes.put( - "dccOpereDiRinforzoInsCatene", - getDccOpereDiRinforzoInsCatene() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOpereDiRinforzoInsCordoli", - getDccOpereDiRinforzoInsCordoli() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOpereDiRinforzoIniArmate", - getDccOpereDiRinforzoIniArmate() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOpereDiRinforzoPlaccaggi", - getDccOpereDiRinforzoPlaccaggi() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOpereDiRinforzoIrrSolai", - getDccOpereDiRinforzoIrrSolai() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "dccOpereDiRinforzoRinforziFRP", - getDccOpereDiRinforzoRinforziFRP() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); + attributes.put("dccOpereDiRinforzoInsCatene", + getDccOpereDiRinforzoInsCatene() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOpereDiRinforzoInsCordoli", + getDccOpereDiRinforzoInsCordoli() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOpereDiRinforzoIniArmate", + getDccOpereDiRinforzoIniArmate() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOpereDiRinforzoPlaccaggi", + getDccOpereDiRinforzoPlaccaggi() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOpereDiRinforzoIrrSolai", + getDccOpereDiRinforzoIrrSolai() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("dccOpereDiRinforzoRinforziFRP", + getDccOpereDiRinforzoRinforziFRP() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( "dccOpereDiRinforzoTelaiECerchiature", getDccOpereDiRinforzoTelaiECerchiature() ? HtmlUtil @@ -674,11 +548,9 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { getDccOpereDiRinforzoInsRompitratta() ? HtmlUtil .escape("") : HtmlUtil .escape("")); - attributes.put( - "dccOpereDiRinforzoAltro", - getDccOpereDiRinforzoAltro() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); + attributes.put("dccOpereDiRinforzoAltro", + getDccOpereDiRinforzoAltro() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put("dccOpereDiRinforzoAltroDescrizione", getDccOpereDiRinforzoAltroDescrizione()); attributes.put( "geoClasseIndagine", @@ -686,68 +558,56 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { "geo-classe-indagine-" + getGeoClasseIndagine()) : StringPool.BLANK); attributes.put( "geoCategoriaSottosuolo", - Validator.isNotNull(getGeoCategoriaSottosuolo()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-categoria-sottosuolo-" - + getGeoCategoriaSottosuolo()) : StringPool.BLANK); + Validator.isNotNull(getGeoCategoriaSottosuolo()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-categoria-sottosuolo-" + getGeoCategoriaSottosuolo()) : StringPool.BLANK); attributes.put( "geoCategoriaTopografica", - Validator.isNotNull(getGeoCategoriaTopografica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-categoria-topografica-" - + getGeoCategoriaTopografica()) : StringPool.BLANK); + Validator.isNotNull(getGeoCategoriaTopografica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-categoria-topografica-" + getGeoCategoriaTopografica()) : StringPool.BLANK); attributes.put( "geoConsolidamento", Validator.isNotNull(getGeoConsolidamento()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "geo-consolidamento-" + getGeoConsolidamento()) : StringPool.BLANK); attributes.put( "geoPericolositaGeologica", - Validator.isNotNull(getGeoPericolositaGeologica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-pericolosita-geologica-" - + getGeoPericolositaGeologica()) : StringPool.BLANK); + Validator.isNotNull(getGeoPericolositaGeologica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-pericolosita-geologica-" + getGeoPericolositaGeologica()) : StringPool.BLANK); attributes.put( "geoRischioGeomorfologicoPai", - Validator.isNotNull(getGeoRischioGeomorfologicoPai()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-rischio-geomorfologico-" - + getGeoRischioGeomorfologicoPai()) : StringPool.BLANK); + Validator.isNotNull(getGeoRischioGeomorfologicoPai()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-rischio-geomorfologico-" + getGeoRischioGeomorfologicoPai()) : StringPool.BLANK); attributes.put( "geoPericolositaIdraulicaPai", - Validator.isNotNull(getGeoPericolositaIdraulicaPai()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-pericolosita-idraulica-pai-" - + getGeoPericolositaIdraulicaPai()) : StringPool.BLANK); + Validator.isNotNull(getGeoPericolositaIdraulicaPai()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-pericolosita-idraulica-pai-" + getGeoPericolositaIdraulicaPai()) : StringPool.BLANK); attributes.put( "geoRischioIdraulicoPai", - Validator.isNotNull(getGeoRischioIdraulicoPai()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-rischio-idraulico-pai-" - + getGeoRischioIdraulicoPai()) : StringPool.BLANK); + Validator.isNotNull(getGeoRischioIdraulicoPai()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-rischio-idraulico-pai-" + getGeoRischioIdraulicoPai()) : StringPool.BLANK); attributes.put( "geoPericolositaSismica", - Validator.isNotNull(getGeoPericolositaSismica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-pericolosita-sismica-" - + getGeoPericolositaSismica()) : StringPool.BLANK); + Validator.isNotNull(getGeoPericolositaSismica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-pericolosita-sismica-" + getGeoPericolositaSismica()) : StringPool.BLANK); attributes.put( "geoPericolositaIdraulica", - Validator.isNotNull(getGeoPericolositaIdraulica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-pericolosita-idraulica-" - + getGeoPericolositaIdraulica()) : StringPool.BLANK); + Validator.isNotNull(getGeoPericolositaIdraulica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-pericolosita-idraulica-" + getGeoPericolositaIdraulica()) : StringPool.BLANK); attributes.put( "geoPericolositaGeomorfica", - Validator.isNotNull(getGeoPericolositaGeomorfica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-pericolosita-geomorfica-" - + getGeoPericolositaGeomorfica()) : StringPool.BLANK); + Validator.isNotNull(getGeoPericolositaGeomorfica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-pericolosita-geomorfica-" + getGeoPericolositaGeomorfica()) : StringPool.BLANK); attributes.put( "geoFattibilitaGeologica", - Validator.isNotNull(getGeoFattibilitaGeologica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-fattibilita-geologica-" - + getGeoFattibilitaGeologica()) : StringPool.BLANK); + Validator.isNotNull(getGeoFattibilitaGeologica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-fattibilita-geologica-" + getGeoFattibilitaGeologica()) : StringPool.BLANK); attributes.put( "geoFattibilitaSismica", - Validator.isNotNull(getGeoFattibilitaSismica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-fattibilita-sismica-" + getGeoFattibilitaSismica()) - : StringPool.BLANK); + Validator.isNotNull(getGeoFattibilitaSismica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-fattibilita-sismica-" + getGeoFattibilitaSismica()) : StringPool.BLANK); attributes.put( "geoFattibilitaIdraulica", - Validator.isNotNull(getGeoFattibilitaIdraulica()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-fattibilita-idraulica-" - + getGeoFattibilitaIdraulica()) : StringPool.BLANK); + Validator.isNotNull(getGeoFattibilitaIdraulica()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-fattibilita-idraulica-" + getGeoFattibilitaIdraulica()) : StringPool.BLANK); attributes.put( "geoOperaRilevante", Validator.isNotNull(getGeoOperaRilevante()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), @@ -756,193 +616,168 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { "geoOpereDiSostegno", Validator.isNotNull(getGeoOpereDiSostegno()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "geo-opere-di-sostegno-" + getGeoOpereDiSostegno()) : StringPool.BLANK); - attributes - .put("geoOpereInSotterranea", - Validator.isNotNull(getGeoOpereInSotterranea()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-opere-in-sotterranea-" - + getGeoOpereInSotterranea()) : StringPool.BLANK); + attributes.put( + "geoOpereInSotterranea", + Validator.isNotNull(getGeoOpereInSotterranea()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-opere-in-sotterranea-" + getGeoOpereInSotterranea()) : StringPool.BLANK); attributes.put( "geoPresenzaPrescrizioni", - Validator.isNotNull(getGeoPresenzaPrescrizioni()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-presenza-prescrizioni-" - + getGeoPresenzaPrescrizioni()) : StringPool.BLANK); + Validator.isNotNull(getGeoPresenzaPrescrizioni()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-presenza-prescrizioni-" + getGeoPresenzaPrescrizioni()) : StringPool.BLANK); attributes.put("geoNotePrescrizioni", getGeoNotePrescrizioni()); attributes.put("geoNoteIndagini", getGeoNoteIndagini()); attributes.put( "geoEvidenzeGeomorfiche", - Validator.isNotNull(getGeoEvidenzeGeomorfiche()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-evidenze-geomorfiche-" - + getGeoEvidenzeGeomorfiche()) : StringPool.BLANK); + Validator.isNotNull(getGeoEvidenzeGeomorfiche()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-evidenze-geomorfiche-" + getGeoEvidenzeGeomorfiche()) : StringPool.BLANK); attributes.put( "geoEvidenzeGeologiche", - Validator.isNotNull(getGeoEvidenzeGeologiche()) ? LanguageUtil.get( - LocaleUtil.getSiteDefault(), "geo-evidenze-geologiche-" + getGeoEvidenzeGeologiche()) - : StringPool.BLANK); + Validator.isNotNull(getGeoEvidenzeGeologiche()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), + "geo-evidenze-geologiche-" + getGeoEvidenzeGeologiche()) : StringPool.BLANK); attributes.put("geoDtRelazione", Validator.isNotNull(getGeoDtRelazione()) ? dateFormatDateTime.format(getGeoDtRelazione()) : StringPool.BLANK); - attributes.put("pagNuoveCostruzioni", - getPagNuoveCostruzioni() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); + attributes.put( + "pagNuoveCostruzioni", + getPagNuoveCostruzioni() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); attributes.put("pagAdeguamentoSismico", getPagAdeguamentoSismico()); attributes.put("pagMiglioramentoSismico", getPagMiglioramentoSismico()); + attributes.put("pagRiparazioneInterventoLocale", + getPagRiparazioneInterventoLocale() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("pagNuovaCostruzione", getPagNuovaCostruzione()); attributes.put( - "pagRiparazioneInterventoLocale", - getPagRiparazioneInterventoLocale() ? HtmlUtil - .escape("") : HtmlUtil + "pagVarianti", + getPagVarianti() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("pagNuovaCostruzione", getPagNuovaCostruzione()); - attributes.put("pagVarianti", - getPagVarianti() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); attributes.put("pagAltro", getPagAltro()); attributes.put("note", getNote()); attributes.put("noteUfficio", getNoteUfficio()); attributes.put("localizzazioneGeografica", getLocalizzazioneGeografica()); - attributes.put("tcNuovaCostruzione", - getTcNuovaCostruzione() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); + attributes.put( + "tcNuovaCostruzione", + getTcNuovaCostruzione() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); attributes.put("tcAdeguamentoSismico", getTcAdeguamentoSismico() ? HtmlUtil.escape("") : HtmlUtil.escape("")); + attributes.put("tcMiglioramentoSismico", + getTcMiglioramentoSismico() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("tcRiparazioneInterventoLocale", + getTcRiparazioneInterventoLocale() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("tcInCA", getTcInCA() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("tcInOpera", getTcInOpera() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( - "tcMiglioramentoSismico", - getTcMiglioramentoSismico() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "tcRiparazioneInterventoLocale", - getTcRiparazioneInterventoLocale() ? HtmlUtil - .escape("") : HtmlUtil - .escape("")); - attributes.put( - "tcInCA", - getTcInCA() ? HtmlUtil.escape("") : HtmlUtil + "tcPrefabbricato", + getTcPrefabbricato() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "tcInOpera", - getTcInOpera() ? HtmlUtil.escape("") : HtmlUtil + "tcInAcciaio", + getTcInAcciaio() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("tcPrefabbricato", - getTcPrefabbricato() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("tcInAcciaio", - getTcInAcciaio() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); + attributes.put("tcMista", getTcMista() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( - "tcMista", - getTcMista() ? HtmlUtil.escape("") : HtmlUtil + "tcInMuratura", + getTcInMuratura() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("tcInMuratura", - getTcInMuratura() ? HtmlUtil.escape("") + attributes.put("tcInMuraturaOrdinaria", + getTcInMuraturaOrdinaria() ? HtmlUtil.escape("") : HtmlUtil.escape("")); attributes.put( - "tcInMuraturaOrdinaria", - getTcInMuraturaOrdinaria() ? HtmlUtil - .escape("") : HtmlUtil + "tcInMuraturaArmata", + getTcInMuraturaArmata() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("tcInMuraturaArmata", - getTcInMuraturaArmata() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("tcInMuraturaMista", - getTcInMuraturaMista() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); attributes.put( - "tcInLegno", - getTcInLegno() ? HtmlUtil.escape("") : HtmlUtil + "tcInMuraturaMista", + getTcInMuraturaMista() ? HtmlUtil.escape("") : HtmlUtil .escape("")); + attributes.put("tcInLegno", getTcInLegno() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("tcAltro", getTcAltro() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("tcAltroDescrizione", getTcAltroDescrizione()); attributes.put( - "tcAltro", - getTcAltro() ? HtmlUtil.escape("") : HtmlUtil + "tcConDispositivi", + getTcConDispositivi() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("tcAltroDescrizione", getTcAltroDescrizione()); - attributes.put("tcConDispositivi", - getTcConDispositivi() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normLavoriInProprio", - getNormLavoriInProprio() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normEsenteBollo", - getNormEsenteBollo() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normEsenteSpese", - getNormEsenteSpese() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normDpr01Dep", - getNormDpr01Dep() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normDpr02Dep", - getNormDpr02Dep() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normDpr01Aut", - getNormDpr01Aut() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normDpr02Aut", - getNormDpr02Aut() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); attributes.put( - "normDpr03", - getNormDpr03() ? HtmlUtil.escape("") : HtmlUtil + "normLavoriInProprio", + getNormLavoriInProprio() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normDpr04", - getNormDpr04() ? HtmlUtil.escape("") : HtmlUtil + "normEsenteBollo", + getNormEsenteBollo() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normDpr05", - getNormDpr05() ? HtmlUtil.escape("") : HtmlUtil + "normEsenteSpese", + getNormEsenteSpese() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normDm01", - getNormDm01() ? HtmlUtil.escape("") : HtmlUtil + "normDpr01Dep", + getNormDpr01Dep() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normDm02", - getNormDm02() ? HtmlUtil.escape("") : HtmlUtil + "normDpr02Dep", + getNormDpr02Dep() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normDm03", - getNormDm03() ? HtmlUtil.escape("") : HtmlUtil + "normDpr01Aut", + getNormDpr01Aut() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normDm04", - getNormDm04() ? HtmlUtil.escape("") : HtmlUtil + "normDpr02Aut", + getNormDpr02Aut() ? HtmlUtil.escape("") : HtmlUtil .escape("")); + attributes.put("normDpr03", getNormDpr03() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normDpr04", getNormDpr04() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normDpr05", getNormDpr05() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normDm01", getNormDm01() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normDm02", getNormDm02() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normDm03", getNormDm03() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normDm04", getNormDm04() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normDm05", getNormDm05() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( - "normDm05", - getNormDm05() ? HtmlUtil.escape("") : HtmlUtil + "normDprg01", + getNormDprg01() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("normDprg01", - getNormDprg01() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normDprg02", - getNormDprg02() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); attributes.put( - "normAnr", - getNormAnr() ? HtmlUtil.escape("") : HtmlUtil + "normDprg02", + getNormDprg02() ? HtmlUtil.escape("") : HtmlUtil .escape("")); + attributes.put("normAnr", getNormAnr() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normOrd01", getNormOrd01() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normCI01", getNormCI01() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); + attributes.put("normLTC01", getNormLTC01() ? HtmlUtil.escape("") + : HtmlUtil.escape("")); attributes.put( - "normOrd01", - getNormOrd01() ? HtmlUtil.escape("") : HtmlUtil + "normArt3com3", + getNormArt3com3() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normCI01", - getNormCI01() ? HtmlUtil.escape("") : HtmlUtil + "normArt3com4", + getNormArt3com4() ? HtmlUtil.escape("") : HtmlUtil .escape("")); attributes.put( - "normLTC01", - getNormLTC01() ? HtmlUtil.escape("") : HtmlUtil + "normSismaBonus", + getNormSismaBonus() ? HtmlUtil.escape("") : HtmlUtil .escape("")); - attributes.put("normArt3com3", - getNormArt3com3() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normArt3com4", - getNormArt3com4() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); - attributes.put("normSismaBonus", - getNormSismaBonus() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); attributes.put( "clRischioPreInt", Validator.isNotNull(getClRischioPreInt()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), @@ -951,15 +786,15 @@ public class DettPraticaImpl extends DettPraticaBaseImpl { "clRischioPosInt", Validator.isNotNull(getClRischioPostInt()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "cl-rischio-post-int-" + getClRischioPostInt()) : StringPool.BLANK); - attributes.put("intervFinPub", - getIntervFinPub() ? HtmlUtil.escape("") - : HtmlUtil.escape("")); + attributes.put( + "intervFinPub", + getIntervFinPub() ? HtmlUtil.escape("") : HtmlUtil + .escape("")); attributes.put( "intervFinPubDesc", Validator.isNotNull(getIntervFinPubDesc()) ? LanguageUtil.get(LocaleUtil.getSiteDefault(), "interv-fin-pub-desc") : StringPool.BLANK); - attributes.put("dpdc", getDpdc() ? "true" : "false"); - + attributes.put("dpdc", getDpdc() ? StringPool.TRUE : StringPool.FALSE); return attributes; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java index ac2a1fa4..26cb7b15 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DettPraticaModelImpl.java @@ -102,7 +102,6 @@ public class DettPraticaModelImpl extends BaseModelImpl { "workflowForzato", Types.BOOLEAN }, { "soggettoSostituitoId", Types.BIGINT }, { "dtInvioSignal", Types.TIMESTAMP }, - { "oldDettPraticaId", Types.BIGINT }, { "destinazione", Types.VARCHAR }, { "ag", Types.VARCHAR }, { "descLongIntervento", Types.VARCHAR }, @@ -340,7 +339,7 @@ public class DettPraticaModelImpl extends BaseModelImpl { "intervFinPubDesc", Types.VARCHAR }, { "suap", Types.BOOLEAN } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_DettPratica (uuid_ VARCHAR(75) null,dettPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,integrazione LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,tipoIntegrazione VARCHAR(10) null,completa BOOLEAN,gestita BOOLEAN,importoSpeseIstruttoria VARCHAR(75) null,codicePagamentoOneri VARCHAR(75) null,causalePagamentoOneri VARCHAR(75) null,mezzoPagamentoOneri VARCHAR(75) null,importoBolli VARCHAR(75) null,codicePagamentoBolli VARCHAR(75) null,causalePagamentoBolli VARCHAR(75) null,mezzoPagamentoBolli VARCHAR(75) null,dataEffettuazione DATE null,version INTEGER,versionata BOOLEAN,status INTEGER,statusByUserId LONG,statusByUserName VARCHAR(75) null,statusDate DATE null,statusTask INTEGER,workflowForzato BOOLEAN,soggettoSostituitoId LONG,dtInvioSignal DATE null,oldDettPraticaId LONG,destinazione VARCHAR(10) null,ag VARCHAR(10) null,descLongIntervento STRING null,paesaggioLocale STRING null,livelloDiTutela STRING null,vincoli STRING null,via VARCHAR(75) null,localita VARCHAR(75) null,estremiCatastali STRING null,estremiPratCom STRING null,variataDa LONG,varianteNumero LONG,varianteSostanziale BOOLEAN,operaConforme BOOLEAN,collaudoStatico BOOLEAN,noCollaudo BOOLEAN,codiceFiscaleDelegato VARCHAR(16) null,codiceRuoloDelegato VARCHAR(75) null,codiceFiscaleDelegatoCommittente VARCHAR(75) null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,codiceFiscalePrincipaleCommittente VARCHAR(75) null,codiceFiscalePrincipaleCollaudatore VARCHAR(75) null,codiceFiscalePrincipaleProgettista VARCHAR(75) null,codiceFiscalePrincipaleDirettoreLavori VARCHAR(75) null,codiceFiscalePrincipaleDitta VARCHAR(75) null,codiceFiscalePrincipaleGeologo VARCHAR(75) null,codiceFiscalePrincipaleArcheologo VARCHAR(75) null,sanatoriaEdilizia47 BOOLEAN,sanatoriaEdilizia724 BOOLEAN,sanatoriaEdilizia326 BOOLEAN,lavoriInEconomiaCommittente BOOLEAN,inizioLavoriContestualeOpera BOOLEAN,dataInizioLavoriOpera DATE null,dataInizioEsecuzioneOpera DATE null,dataFineEsecuzioneOpera DATE null,metratura VARCHAR(75) null,lavoriPubblici BOOLEAN,pagamentoIdOneri LONG,pagamentoIdBolli LONG,lavoriPubbliciPercentuale INTEGER,numeroCivico VARCHAR(75) null,dcParticelle VARCHAR(75) null,dcFoglio VARCHAR(75) null,dcAllegato VARCHAR(75) null,dePiani VARCHAR(75) null,deAltezza VARCHAR(75) null,deInterrati VARCHAR(75) null,deSuperficie VARCHAR(75) null,deCostruzione VARCHAR(75) null,deRistrutturazione VARCHAR(75) null,deUso VARCHAR(75) null,dePubblica VARCHAR(75) null,dePrivata VARCHAR(75) null,deUtilizzazione VARCHAR(75) null,dePosizioneEdificio VARCHAR(75) null,deInfStradalePonte BOOLEAN,deInfStradaleStrada BOOLEAN,deInfStradaleAltro BOOLEAN,deInfIdraulicaLong BOOLEAN,deInfIdraulicaTrasv BOOLEAN,deInfIdraulicaAltro BOOLEAN,deInfOperaAccStradale BOOLEAN,deInfOperaAccIdraulica BOOLEAN,deInfOperaAccAltro BOOLEAN,deInfAltraInfrastruttura BOOLEAN,deInfAltro BOOLEAN,deInfAltroDesc STRING null,dccFondazioni VARCHAR(75) null,destinazioneAltroIntervento VARCHAR(75) null,dccStruttureEleMuraturePietrame BOOLEAN,dccStruttureEleMuratureLaterizio BOOLEAN,dccStruttureEleMuratureMisto BOOLEAN,dccStruttureEleMuratureStoriche BOOLEAN,dccStruttureEleAcciaio VARCHAR(75) null,dccStruttureEleCA VARCHAR(75) null,dccStruttureEleLegno VARCHAR(75) null,dccStruttureEleMistoCA BOOLEAN,dccStruttureEleMistoAcciaio BOOLEAN,dccStruttureEleMistoMuratura BOOLEAN,dccStruttureEleMistoLegno BOOLEAN,dccStruttureElePrefabbricato BOOLEAN,dccStruttureEleAltro BOOLEAN,dccStruttureEleAltroDescrizione STRING null,dccOrizzontamentiCAAcciaio BOOLEAN,dccOrizzontamentiLegno BOOLEAN,dccOrizzontamentiLegnoCA BOOLEAN,dccOrizzontamentiLamieraGrecata BOOLEAN,dccOrizzontamentiVolte BOOLEAN,dccOrizzontamentiAltro BOOLEAN,dccOrizzontamentiAltroDescrizione STRING null,dccCopertura VARCHAR(75) null,dccCoperturaCAAcciaio BOOLEAN,dccCoperturaLegno BOOLEAN,dccCoperturaLegnoCA BOOLEAN,dccCoperturaLamieraGrecata BOOLEAN,dccCoperturaPannelli BOOLEAN,dccCoperturaPVCTelonati BOOLEAN,dccCoperturaLeggere BOOLEAN,dccCoperturaAltro BOOLEAN,dccCoperturaAltroDesrizione STRING null,dccElemNonStrutLaterizio BOOLEAN,dccElemNonStrutCartongesso BOOLEAN,dccElemNonStrutCalcestruzzo BOOLEAN,dccElemNonStrutLegno BOOLEAN,dccElemNonStrutAltro BOOLEAN,dccElemNonStrutAltroDescrizione STRING null,dccOpereDiRinforzoInsCatene BOOLEAN,dccOpereDiRinforzoInsCordoli BOOLEAN,dccOpereDiRinforzoIniArmate BOOLEAN,dccOpereDiRinforzoPlaccaggi BOOLEAN,dccOpereDiRinforzoIrrSolai BOOLEAN,dccOpereDiRinforzoRinforziFRP BOOLEAN,dccOpereDiRinforzoTelaiECerchiature BOOLEAN,dccOpereDiRinforzoInsRompitratta BOOLEAN,dccOpereDiRinforzoAltro BOOLEAN,dccOpereDiRinforzoAltroDescrizione STRING null,geoClasseIndagine VARCHAR(75) null,geoCategoriaSottosuolo VARCHAR(75) null,geoCategoriaTopografica VARCHAR(75) null,geoConsolidamento VARCHAR(75) null,geoPericolositaGeologica VARCHAR(75) null,geoPericolositaSismica VARCHAR(75) null,geoPericolositaIdraulica VARCHAR(75) null,geoPericolositaGeomorfica VARCHAR(75) null,geoRischioGeomorfologicoPai VARCHAR(75) null,geoPericolositaIdraulicaPai VARCHAR(75) null,geoRischioIdraulicoPai VARCHAR(75) null,geoFattibilitaGeologica VARCHAR(75) null,geoFattibilitaSismica VARCHAR(75) null,geoFattibilitaIdraulica VARCHAR(75) null,geoOperaRilevante VARCHAR(75) null,geoOpereDiSostegno VARCHAR(75) null,geoOpereInSotterranea VARCHAR(75) null,geoPresenzaPrescrizioni VARCHAR(75) null,geoNotePrescrizioni STRING null,geoNoteIndagini STRING null,geoEvidenzeGeomorfiche VARCHAR(75) null,geoEvidenzeGeologiche VARCHAR(75) null,geoDtRelazione DATE null,pagSoggettiAdAutorizzazione DOUBLE,pagInterventiRestauroManufatti DOUBLE,pagAltriCasiCulturali DOUBLE,pagLottizzazioni DOUBLE,pagGrandiStrutture DOUBLE,pagCondotte DOUBLE,pagPalificazioni DOUBLE,pagImpiantiEolici DOUBLE,pagNuoveRealizzazioni DOUBLE,pagImmobiliPreesistenti DOUBLE,pagManifestiPubblicitari DOUBLE,pagPareriDiMassima DOUBLE,pagAltriCasiPaesaggistici DOUBLE,pagVariantiPareriResi DOUBLE,pagRilascioAttestazioni DOUBLE,pagConsultazioniArchivio DOUBLE,pagNuoveCostruzioni BOOLEAN,pagAdeguamentoSismico INTEGER,pagMiglioramentoSismico INTEGER,pagMiglioramentoSismicoSicilia BOOLEAN,pagRiparazioneInterventoLocale BOOLEAN,pagOperaNonQuantificabile BOOLEAN,pagNuovaCostruzione INTEGER,pagVarianti BOOLEAN,pagAltro INTEGER,pagCalcolatoAdeguamentoSismico VARCHAR(75) null,pagCalcolatoMiglioramentoSismico VARCHAR(75) null,pagCalcolatoRiparazioneInterventoLocale VARCHAR(75) null,pagCalcolatoOperaNonQuantificabile VARCHAR(75) null,pagEffettivoAdeguamentoSismico VARCHAR(75) null,pagEffettivoMiglioramentoSismico VARCHAR(75) null,pagEffettivoRiparazioneInterventoLocale VARCHAR(75) null,pagEffettivoOperaNonQuantificabile VARCHAR(75) null,pagNoteUtente TEXT null,note STRING null,noteUfficio STRING null,localizzazioneGeografica VARCHAR(75) null,tcNuovaCostruzione BOOLEAN,tcNuovaCostruzioneComplessa BOOLEAN,tcAdeguamentoSismico BOOLEAN,tcMiglioramentoSismico BOOLEAN,tcRiparazioneInterventoLocale BOOLEAN,tcCostruzioniEsistenti BOOLEAN,tcManutOrdStraord BOOLEAN,tcNuovaCostruzionePertinenza BOOLEAN,tcInterventoOpereEscavazione BOOLEAN,tcViarch BOOLEAN,tcOperaA25 BOOLEAN,tcAltriInterventi BOOLEAN,tcAltriInterventiDesc VARCHAR(75) null,tcInCA BOOLEAN,tcInOpera BOOLEAN,tcPrefabbricato BOOLEAN,tcInAcciaio BOOLEAN,tcMista BOOLEAN,tcInMuratura BOOLEAN,tcInMuraturaOrdinaria BOOLEAN,tcInMuraturaArmata BOOLEAN,tcInMuraturaMista BOOLEAN,tcInLegno BOOLEAN,tcAltro BOOLEAN,tcAltroDescrizione STRING null,tcConDispositivi BOOLEAN,interventoVoceP7 VARCHAR(75) null,normLavoriInProprio BOOLEAN,normLavoriNoDirettore BOOLEAN,normEsenteBollo BOOLEAN,normEsenteSpese BOOLEAN,normDpr01Dep BOOLEAN,normDpr02Dep BOOLEAN,normDpr01Aut BOOLEAN,normDpr02Aut BOOLEAN,normDpr03 BOOLEAN,normDpr04 BOOLEAN,normDpr05 BOOLEAN,normDm01 BOOLEAN,normDm02 BOOLEAN,normDm03 BOOLEAN,normDm2018 BOOLEAN,normDm04 BOOLEAN,normDm05 BOOLEAN,normDprg01 BOOLEAN,normDprg02 BOOLEAN,normAnr BOOLEAN,normOrd01 BOOLEAN,normCI01 BOOLEAN,normLTC01 BOOLEAN,normArt3com3 BOOLEAN,normArt3com4 BOOLEAN,dpdc BOOLEAN,normSismaBonus BOOLEAN,clRischioPreInt VARCHAR(75) null,clRischioPostInt VARCHAR(75) null,intervFinPub BOOLEAN,intervFinPubDesc STRING null,suap BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_DettPratica (uuid_ VARCHAR(75) null,dettPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,integrazione LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,tipoIntegrazione VARCHAR(10) null,completa BOOLEAN,gestita BOOLEAN,importoSpeseIstruttoria VARCHAR(75) null,codicePagamentoOneri VARCHAR(75) null,causalePagamentoOneri VARCHAR(75) null,mezzoPagamentoOneri VARCHAR(75) null,importoBolli VARCHAR(75) null,codicePagamentoBolli VARCHAR(75) null,causalePagamentoBolli VARCHAR(75) null,mezzoPagamentoBolli VARCHAR(75) null,dataEffettuazione DATE null,version INTEGER,versionata BOOLEAN,status INTEGER,statusByUserId LONG,statusByUserName VARCHAR(75) null,statusDate DATE null,statusTask INTEGER,workflowForzato BOOLEAN,soggettoSostituitoId LONG,dtInvioSignal DATE null,destinazione VARCHAR(10) null,ag VARCHAR(10) null,descLongIntervento STRING null,paesaggioLocale STRING null,livelloDiTutela STRING null,vincoli STRING null,via VARCHAR(75) null,localita VARCHAR(75) null,estremiCatastali STRING null,estremiPratCom STRING null,variataDa LONG,varianteNumero LONG,varianteSostanziale BOOLEAN,operaConforme BOOLEAN,collaudoStatico BOOLEAN,noCollaudo BOOLEAN,codiceFiscaleDelegato VARCHAR(16) null,codiceRuoloDelegato VARCHAR(75) null,codiceFiscaleDelegatoCommittente VARCHAR(75) null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,codiceFiscalePrincipaleCommittente VARCHAR(75) null,codiceFiscalePrincipaleCollaudatore VARCHAR(75) null,codiceFiscalePrincipaleProgettista VARCHAR(75) null,codiceFiscalePrincipaleDirettoreLavori VARCHAR(75) null,codiceFiscalePrincipaleDitta VARCHAR(75) null,codiceFiscalePrincipaleGeologo VARCHAR(75) null,codiceFiscalePrincipaleArcheologo VARCHAR(75) null,sanatoriaEdilizia47 BOOLEAN,sanatoriaEdilizia724 BOOLEAN,sanatoriaEdilizia326 BOOLEAN,lavoriInEconomiaCommittente BOOLEAN,inizioLavoriContestualeOpera BOOLEAN,dataInizioLavoriOpera DATE null,dataInizioEsecuzioneOpera DATE null,dataFineEsecuzioneOpera DATE null,metratura VARCHAR(75) null,lavoriPubblici BOOLEAN,pagamentoIdOneri LONG,pagamentoIdBolli LONG,lavoriPubbliciPercentuale INTEGER,numeroCivico VARCHAR(75) null,dcParticelle VARCHAR(75) null,dcFoglio VARCHAR(75) null,dcAllegato VARCHAR(75) null,dePiani VARCHAR(75) null,deAltezza VARCHAR(75) null,deInterrati VARCHAR(75) null,deSuperficie VARCHAR(75) null,deCostruzione VARCHAR(75) null,deRistrutturazione VARCHAR(75) null,deUso VARCHAR(75) null,dePubblica VARCHAR(75) null,dePrivata VARCHAR(75) null,deUtilizzazione VARCHAR(75) null,dePosizioneEdificio VARCHAR(75) null,deInfStradalePonte BOOLEAN,deInfStradaleStrada BOOLEAN,deInfStradaleAltro BOOLEAN,deInfIdraulicaLong BOOLEAN,deInfIdraulicaTrasv BOOLEAN,deInfIdraulicaAltro BOOLEAN,deInfOperaAccStradale BOOLEAN,deInfOperaAccIdraulica BOOLEAN,deInfOperaAccAltro BOOLEAN,deInfAltraInfrastruttura BOOLEAN,deInfAltro BOOLEAN,deInfAltroDesc STRING null,dccFondazioni VARCHAR(75) null,destinazioneAltroIntervento VARCHAR(75) null,dccStruttureEleMuraturePietrame BOOLEAN,dccStruttureEleMuratureLaterizio BOOLEAN,dccStruttureEleMuratureMisto BOOLEAN,dccStruttureEleMuratureStoriche BOOLEAN,dccStruttureEleAcciaio VARCHAR(75) null,dccStruttureEleCA VARCHAR(75) null,dccStruttureEleLegno VARCHAR(75) null,dccStruttureEleMistoCA BOOLEAN,dccStruttureEleMistoAcciaio BOOLEAN,dccStruttureEleMistoMuratura BOOLEAN,dccStruttureEleMistoLegno BOOLEAN,dccStruttureElePrefabbricato BOOLEAN,dccStruttureEleAltro BOOLEAN,dccStruttureEleAltroDescrizione STRING null,dccOrizzontamentiCAAcciaio BOOLEAN,dccOrizzontamentiLegno BOOLEAN,dccOrizzontamentiLegnoCA BOOLEAN,dccOrizzontamentiLamieraGrecata BOOLEAN,dccOrizzontamentiVolte BOOLEAN,dccOrizzontamentiAltro BOOLEAN,dccOrizzontamentiAltroDescrizione STRING null,dccCopertura VARCHAR(75) null,dccCoperturaCAAcciaio BOOLEAN,dccCoperturaLegno BOOLEAN,dccCoperturaLegnoCA BOOLEAN,dccCoperturaLamieraGrecata BOOLEAN,dccCoperturaPannelli BOOLEAN,dccCoperturaPVCTelonati BOOLEAN,dccCoperturaLeggere BOOLEAN,dccCoperturaAltro BOOLEAN,dccCoperturaAltroDesrizione STRING null,dccElemNonStrutLaterizio BOOLEAN,dccElemNonStrutCartongesso BOOLEAN,dccElemNonStrutCalcestruzzo BOOLEAN,dccElemNonStrutLegno BOOLEAN,dccElemNonStrutAltro BOOLEAN,dccElemNonStrutAltroDescrizione STRING null,dccOpereDiRinforzoInsCatene BOOLEAN,dccOpereDiRinforzoInsCordoli BOOLEAN,dccOpereDiRinforzoIniArmate BOOLEAN,dccOpereDiRinforzoPlaccaggi BOOLEAN,dccOpereDiRinforzoIrrSolai BOOLEAN,dccOpereDiRinforzoRinforziFRP BOOLEAN,dccOpereDiRinforzoTelaiECerchiature BOOLEAN,dccOpereDiRinforzoInsRompitratta BOOLEAN,dccOpereDiRinforzoAltro BOOLEAN,dccOpereDiRinforzoAltroDescrizione STRING null,geoClasseIndagine VARCHAR(75) null,geoCategoriaSottosuolo VARCHAR(75) null,geoCategoriaTopografica VARCHAR(75) null,geoConsolidamento VARCHAR(75) null,geoPericolositaGeologica VARCHAR(75) null,geoPericolositaSismica VARCHAR(75) null,geoPericolositaIdraulica VARCHAR(75) null,geoPericolositaGeomorfica VARCHAR(75) null,geoRischioGeomorfologicoPai VARCHAR(75) null,geoPericolositaIdraulicaPai VARCHAR(75) null,geoRischioIdraulicoPai VARCHAR(75) null,geoFattibilitaGeologica VARCHAR(75) null,geoFattibilitaSismica VARCHAR(75) null,geoFattibilitaIdraulica VARCHAR(75) null,geoOperaRilevante VARCHAR(75) null,geoOpereDiSostegno VARCHAR(75) null,geoOpereInSotterranea VARCHAR(75) null,geoPresenzaPrescrizioni VARCHAR(75) null,geoNotePrescrizioni STRING null,geoNoteIndagini STRING null,geoEvidenzeGeomorfiche VARCHAR(75) null,geoEvidenzeGeologiche VARCHAR(75) null,geoDtRelazione DATE null,pagSoggettiAdAutorizzazione DOUBLE,pagInterventiRestauroManufatti DOUBLE,pagAltriCasiCulturali DOUBLE,pagLottizzazioni DOUBLE,pagGrandiStrutture DOUBLE,pagCondotte DOUBLE,pagPalificazioni DOUBLE,pagImpiantiEolici DOUBLE,pagNuoveRealizzazioni DOUBLE,pagImmobiliPreesistenti DOUBLE,pagManifestiPubblicitari DOUBLE,pagPareriDiMassima DOUBLE,pagAltriCasiPaesaggistici DOUBLE,pagVariantiPareriResi DOUBLE,pagRilascioAttestazioni DOUBLE,pagConsultazioniArchivio DOUBLE,pagNuoveCostruzioni BOOLEAN,pagAdeguamentoSismico INTEGER,pagMiglioramentoSismico INTEGER,pagMiglioramentoSismicoSicilia BOOLEAN,pagRiparazioneInterventoLocale BOOLEAN,pagOperaNonQuantificabile BOOLEAN,pagNuovaCostruzione INTEGER,pagVarianti BOOLEAN,pagAltro INTEGER,pagCalcolatoAdeguamentoSismico VARCHAR(75) null,pagCalcolatoMiglioramentoSismico VARCHAR(75) null,pagCalcolatoRiparazioneInterventoLocale VARCHAR(75) null,pagCalcolatoOperaNonQuantificabile VARCHAR(75) null,pagEffettivoAdeguamentoSismico VARCHAR(75) null,pagEffettivoMiglioramentoSismico VARCHAR(75) null,pagEffettivoRiparazioneInterventoLocale VARCHAR(75) null,pagEffettivoOperaNonQuantificabile VARCHAR(75) null,pagNoteUtente TEXT null,note STRING null,noteUfficio STRING null,localizzazioneGeografica VARCHAR(75) null,tcNuovaCostruzione BOOLEAN,tcNuovaCostruzioneComplessa BOOLEAN,tcAdeguamentoSismico BOOLEAN,tcMiglioramentoSismico BOOLEAN,tcRiparazioneInterventoLocale BOOLEAN,tcCostruzioniEsistenti BOOLEAN,tcManutOrdStraord BOOLEAN,tcNuovaCostruzionePertinenza BOOLEAN,tcInterventoOpereEscavazione BOOLEAN,tcViarch BOOLEAN,tcOperaA25 BOOLEAN,tcAltriInterventi BOOLEAN,tcAltriInterventiDesc VARCHAR(75) null,tcInCA BOOLEAN,tcInOpera BOOLEAN,tcPrefabbricato BOOLEAN,tcInAcciaio BOOLEAN,tcMista BOOLEAN,tcInMuratura BOOLEAN,tcInMuraturaOrdinaria BOOLEAN,tcInMuraturaArmata BOOLEAN,tcInMuraturaMista BOOLEAN,tcInLegno BOOLEAN,tcAltro BOOLEAN,tcAltroDescrizione STRING null,tcConDispositivi BOOLEAN,interventoVoceP7 VARCHAR(75) null,normLavoriInProprio BOOLEAN,normLavoriNoDirettore BOOLEAN,normEsenteBollo BOOLEAN,normEsenteSpese BOOLEAN,normDpr01Dep BOOLEAN,normDpr02Dep BOOLEAN,normDpr01Aut BOOLEAN,normDpr02Aut BOOLEAN,normDpr03 BOOLEAN,normDpr04 BOOLEAN,normDpr05 BOOLEAN,normDm01 BOOLEAN,normDm02 BOOLEAN,normDm03 BOOLEAN,normDm2018 BOOLEAN,normDm04 BOOLEAN,normDm05 BOOLEAN,normDprg01 BOOLEAN,normDprg02 BOOLEAN,normAnr BOOLEAN,normOrd01 BOOLEAN,normCI01 BOOLEAN,normLTC01 BOOLEAN,normArt3com3 BOOLEAN,normArt3com4 BOOLEAN,dpdc BOOLEAN,normSismaBonus BOOLEAN,clRischioPreInt VARCHAR(75) null,clRischioPostInt VARCHAR(75) null,intervFinPub BOOLEAN,intervFinPubDesc STRING null,suap BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_DettPratica"; public static final String ORDER_BY_JPQL = " ORDER BY dettPratica.dettPraticaId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_DettPratica.dettPraticaId ASC"; @@ -360,11 +359,10 @@ public class DettPraticaModelImpl extends BaseModelImpl public static long COMPLETA_COLUMN_BITMASK = 2L; public static long GROUPID_COLUMN_BITMASK = 4L; public static long INTPRATICAID_COLUMN_BITMASK = 8L; - public static long OLDDETTPRATICAID_COLUMN_BITMASK = 16L; - public static long PROTOCOLLO_COLUMN_BITMASK = 32L; - public static long TIPOINTEGRAZIONE_COLUMN_BITMASK = 64L; - public static long UUID_COLUMN_BITMASK = 128L; - public static long DETTPRATICAID_COLUMN_BITMASK = 256L; + public static long PROTOCOLLO_COLUMN_BITMASK = 16L; + public static long TIPOINTEGRAZIONE_COLUMN_BITMASK = 32L; + public static long UUID_COLUMN_BITMASK = 64L; + public static long DETTPRATICAID_COLUMN_BITMASK = 128L; /** * Converts the soap model instance into a normal model instance. @@ -413,7 +411,6 @@ public class DettPraticaModelImpl extends BaseModelImpl model.setWorkflowForzato(soapModel.getWorkflowForzato()); model.setSoggettoSostituitoId(soapModel.getSoggettoSostituitoId()); model.setDtInvioSignal(soapModel.getDtInvioSignal()); - model.setOldDettPraticaId(soapModel.getOldDettPraticaId()); model.setDestinazione(soapModel.getDestinazione()); model.setAg(soapModel.getAg()); model.setDescLongIntervento(soapModel.getDescLongIntervento()); @@ -748,7 +745,6 @@ public class DettPraticaModelImpl extends BaseModelImpl attributes.put("workflowForzato", getWorkflowForzato()); attributes.put("soggettoSostituitoId", getSoggettoSostituitoId()); attributes.put("dtInvioSignal", getDtInvioSignal()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); attributes.put("destinazione", getDestinazione()); attributes.put("ag", getAg()); attributes.put("descLongIntervento", getDescLongIntervento()); @@ -1264,12 +1260,6 @@ public class DettPraticaModelImpl extends BaseModelImpl setDtInvioSignal(dtInvioSignal); } - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } - String destinazione = (String)attributes.get("destinazione"); if (destinazione != null) { @@ -3376,29 +3366,6 @@ public class DettPraticaModelImpl extends BaseModelImpl _dtInvioSignal = dtInvioSignal; } - @JSON - @Override - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _columnBitmask |= OLDDETTPRATICAID_COLUMN_BITMASK; - - if (!_setOriginalOldDettPraticaId) { - _setOriginalOldDettPraticaId = true; - - _originalOldDettPraticaId = _oldDettPraticaId; - } - - _oldDettPraticaId = oldDettPraticaId; - } - - public long getOriginalOldDettPraticaId() { - return _originalOldDettPraticaId; - } - @JSON @Override public String getDestinazione() { @@ -7245,7 +7212,6 @@ public class DettPraticaModelImpl extends BaseModelImpl dettPraticaImpl.setWorkflowForzato(getWorkflowForzato()); dettPraticaImpl.setSoggettoSostituitoId(getSoggettoSostituitoId()); dettPraticaImpl.setDtInvioSignal(getDtInvioSignal()); - dettPraticaImpl.setOldDettPraticaId(getOldDettPraticaId()); dettPraticaImpl.setDestinazione(getDestinazione()); dettPraticaImpl.setAg(getAg()); dettPraticaImpl.setDescLongIntervento(getDescLongIntervento()); @@ -7556,10 +7522,6 @@ public class DettPraticaModelImpl extends BaseModelImpl dettPraticaModelImpl._setOriginalCompleta = false; - dettPraticaModelImpl._originalOldDettPraticaId = dettPraticaModelImpl._oldDettPraticaId; - - dettPraticaModelImpl._setOriginalOldDettPraticaId = false; - dettPraticaModelImpl._columnBitmask = 0; } @@ -7762,8 +7724,6 @@ public class DettPraticaModelImpl extends BaseModelImpl dettPraticaCacheModel.dtInvioSignal = Long.MIN_VALUE; } - dettPraticaCacheModel.oldDettPraticaId = getOldDettPraticaId(); - dettPraticaCacheModel.destinazione = getDestinazione(); String destinazione = dettPraticaCacheModel.destinazione; @@ -8857,7 +8817,7 @@ public class DettPraticaModelImpl extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(543); + StringBundler sb = new StringBundler(541); sb.append("{uuid="); sb.append(getUuid()); @@ -8927,8 +8887,6 @@ public class DettPraticaModelImpl extends BaseModelImpl sb.append(getSoggettoSostituitoId()); sb.append(", dtInvioSignal="); sb.append(getDtInvioSignal()); - sb.append(", oldDettPraticaId="); - sb.append(getOldDettPraticaId()); sb.append(", destinazione="); sb.append(getDestinazione()); sb.append(", ag="); @@ -9408,7 +9366,7 @@ public class DettPraticaModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(817); + StringBundler sb = new StringBundler(814); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.DettPratica"); @@ -9550,10 +9508,6 @@ public class DettPraticaModelImpl extends BaseModelImpl "dtInvioSignal"); - sb.append( - "oldDettPraticaId"); sb.append( "destinazione private boolean _workflowForzato; private long _soggettoSostituitoId; private Date _dtInvioSignal; - private long _oldDettPraticaId; - private long _originalOldDettPraticaId; - private boolean _setOriginalOldDettPraticaId; private String _destinazione; private String _ag; private String _descLongIntervento; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java index a695adb8..b212da0b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocAggiuntivaImpl.java @@ -33,7 +33,7 @@ import com.liferay.portlet.documentlibrary.service.DLFileEntryServiceUtil; public class DocAggiuntivaImpl extends DocAggiuntivaBaseImpl { /* * NOTE FOR DEVELOPERS: - * + * * Never reference this class directly. All methods that expect a doc * aggiuntiva model instance should use the {@link * it.tref.liferay.portos.bo.model.DocAggiuntiva} interface instead. @@ -41,7 +41,9 @@ public class DocAggiuntivaImpl extends DocAggiuntivaBaseImpl { public DocAggiuntivaImpl() { } + @Override public String getFileName() throws PortalException, SystemException { + DLFileEntry file = DLFileEntryServiceUtil.getFileEntry(getFileEntryId()); return file.getDescription(); } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java index 6a7265da..363a381b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaCacheModel.java @@ -38,7 +38,7 @@ public class DocPraticaCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(55); + StringBundler sb = new StringBundler(53); sb.append("{uuid="); sb.append(uuid); @@ -86,8 +86,6 @@ public class DocPraticaCacheModel implements CacheModel, sb.append(status); sb.append(", errorCode="); sb.append(errorCode); - sb.append(", oldDocPraticaId="); - sb.append(oldDocPraticaId); sb.append(", rimosso="); sb.append(rimosso); sb.append(", dettPraticaIdRimozione="); @@ -204,7 +202,6 @@ public class DocPraticaCacheModel implements CacheModel, docPraticaImpl.setErrorCode(errorCode); } - docPraticaImpl.setOldDocPraticaId(oldDocPraticaId); docPraticaImpl.setRimosso(rimosso); docPraticaImpl.setDettPraticaIdRimozione(dettPraticaIdRimozione); @@ -245,7 +242,6 @@ public class DocPraticaCacheModel implements CacheModel, jsonFirmatari = objectInput.readUTF(); status = objectInput.readLong(); errorCode = objectInput.readUTF(); - oldDocPraticaId = objectInput.readLong(); rimosso = objectInput.readBoolean(); dettPraticaIdRimozione = objectInput.readLong(); dtDataRimozione = objectInput.readLong(); @@ -343,7 +339,6 @@ public class DocPraticaCacheModel implements CacheModel, objectOutput.writeUTF(errorCode); } - objectOutput.writeLong(oldDocPraticaId); objectOutput.writeBoolean(rimosso); objectOutput.writeLong(dettPraticaIdRimozione); objectOutput.writeLong(dtDataRimozione); @@ -372,7 +367,6 @@ public class DocPraticaCacheModel implements CacheModel, public String jsonFirmatari; public long status; public String errorCode; - public long oldDocPraticaId; public boolean rimosso; public long dettPraticaIdRimozione; public long dtDataRimozione; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java index 8ca8e2d2..2730a03b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.model.impl; @@ -24,41 +24,42 @@ import com.liferay.portlet.documentlibrary.util.DLUtil; /** * The extended model implementation for the DocPratica service. Represents a row in the - * "portos_bo_DocPratica" database table, with each column mapped to a property of this - * class. + * "portos_bo_DocPratica" database table, with each column mapped to a property of this class. * *

- * Helper methods and all application logic should be put in this class. Whenever methods are added, - * rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.model.DocPratica} interface. + * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.DocPratica} interface. *

* * @author Davide Barbagallo, 3F Consulting */ public class DocPraticaImpl extends DocPraticaBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this class directly. All methods that expect a doc pratica model instance - * should use the {@link it.tref.liferay.portos.bo.model.DocPratica} interface instead. - */ - public DocPraticaImpl() {} + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this class directly. All methods that expect a doc pratica model instance should use the {@link + * it.tref.liferay.portos.bo.model.DocPratica} interface instead. + */ + public DocPraticaImpl() { + } - @Override - public String getFileName() throws PortalException, SystemException { - if (Validator.isNull(getDlFileEntryId())) { - return "Da importare"; - } - DLFileEntry file = DLFileEntryServiceUtil.getFileEntry(getDlFileEntryId()); - return file.getTitle(); - } + @Override + public String getFileName() throws PortalException, SystemException { - public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException { - if (Validator.isNull(getDlFileEntryId())) { - return "Da importare"; - } - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getDlFileEntryId()); - return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true"); - } + if (Validator.isNull(getDlFileEntryId())) { + return "Da importare"; + } + DLFileEntry file = DLFileEntryServiceUtil.getFileEntry(getDlFileEntryId()); + return file.getTitle(); + } + @Override + public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException { + + if (Validator.isNull(getDlFileEntryId())) { + return "Da importare"; + } + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getDlFileEntryId()); + return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true"); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java index 8ba381cf..bb3be53e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/DocPraticaModelImpl.java @@ -90,12 +90,11 @@ public class DocPraticaModelImpl extends BaseModelImpl { "jsonFirmatari", Types.CLOB }, { "status", Types.BIGINT }, { "errorCode", Types.VARCHAR }, - { "oldDocPraticaId", Types.BIGINT }, { "rimosso", Types.BOOLEAN }, { "dettPraticaIdRimozione", Types.BIGINT }, { "dtDataRimozione", Types.TIMESTAMP } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_DocPratica (uuid_ VARCHAR(75) null,docPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,classPk LONG,className VARCHAR(75) null,intPraticaId LONG,dlFileEntryId LONG,oldDlFileEntryId LONG,version VARCHAR(75) null,praticaValidata BOOLEAN,descLong VARCHAR(500) null,tipologia VARCHAR(10) null,sha256 VARCHAR(75) null,md5 VARCHAR(75) null,aggiornato BOOLEAN,jsonFirmatari TEXT null,status LONG,errorCode VARCHAR(75) null,oldDocPraticaId LONG,rimosso BOOLEAN,dettPraticaIdRimozione LONG,dtDataRimozione DATE null)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_DocPratica (uuid_ VARCHAR(75) null,docPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,classPk LONG,className VARCHAR(75) null,intPraticaId LONG,dlFileEntryId LONG,oldDlFileEntryId LONG,version VARCHAR(75) null,praticaValidata BOOLEAN,descLong VARCHAR(500) null,tipologia VARCHAR(10) null,sha256 VARCHAR(75) null,md5 VARCHAR(75) null,aggiornato BOOLEAN,jsonFirmatari TEXT null,status LONG,errorCode VARCHAR(75) null,rimosso BOOLEAN,dettPraticaIdRimozione LONG,dtDataRimozione DATE null)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_DocPratica"; public static final String ORDER_BY_JPQL = " ORDER BY docPratica.docPraticaId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_DocPratica.docPraticaId ASC"; @@ -116,12 +115,11 @@ public class DocPraticaModelImpl extends BaseModelImpl public static long DLFILEENTRYID_COLUMN_BITMASK = 4L; public static long GROUPID_COLUMN_BITMASK = 8L; public static long INTPRATICAID_COLUMN_BITMASK = 16L; - public static long OLDDOCPRATICAID_COLUMN_BITMASK = 32L; - public static long STATUS_COLUMN_BITMASK = 64L; - public static long TIPOLOGIA_COLUMN_BITMASK = 128L; - public static long UUID_COLUMN_BITMASK = 256L; - public static long VERSION_COLUMN_BITMASK = 512L; - public static long DOCPRATICAID_COLUMN_BITMASK = 1024L; + public static long STATUS_COLUMN_BITMASK = 32L; + public static long TIPOLOGIA_COLUMN_BITMASK = 64L; + public static long UUID_COLUMN_BITMASK = 128L; + public static long VERSION_COLUMN_BITMASK = 256L; + public static long DOCPRATICAID_COLUMN_BITMASK = 512L; /** * Converts the soap model instance into a normal model instance. @@ -159,7 +157,6 @@ public class DocPraticaModelImpl extends BaseModelImpl model.setJsonFirmatari(soapModel.getJsonFirmatari()); model.setStatus(soapModel.getStatus()); model.setErrorCode(soapModel.getErrorCode()); - model.setOldDocPraticaId(soapModel.getOldDocPraticaId()); model.setRimosso(soapModel.getRimosso()); model.setDettPraticaIdRimozione(soapModel.getDettPraticaIdRimozione()); model.setDtDataRimozione(soapModel.getDtDataRimozione()); @@ -250,7 +247,6 @@ public class DocPraticaModelImpl extends BaseModelImpl attributes.put("jsonFirmatari", getJsonFirmatari()); attributes.put("status", getStatus()); attributes.put("errorCode", getErrorCode()); - attributes.put("oldDocPraticaId", getOldDocPraticaId()); attributes.put("rimosso", getRimosso()); attributes.put("dettPraticaIdRimozione", getDettPraticaIdRimozione()); attributes.put("dtDataRimozione", getDtDataRimozione()); @@ -398,12 +394,6 @@ public class DocPraticaModelImpl extends BaseModelImpl setErrorCode(errorCode); } - Long oldDocPraticaId = (Long)attributes.get("oldDocPraticaId"); - - if (oldDocPraticaId != null) { - setOldDocPraticaId(oldDocPraticaId); - } - Boolean rimosso = (Boolean)attributes.get("rimosso"); if (rimosso != null) { @@ -847,29 +837,6 @@ public class DocPraticaModelImpl extends BaseModelImpl _errorCode = errorCode; } - @JSON - @Override - public long getOldDocPraticaId() { - return _oldDocPraticaId; - } - - @Override - public void setOldDocPraticaId(long oldDocPraticaId) { - _columnBitmask |= OLDDOCPRATICAID_COLUMN_BITMASK; - - if (!_setOriginalOldDocPraticaId) { - _setOriginalOldDocPraticaId = true; - - _originalOldDocPraticaId = _oldDocPraticaId; - } - - _oldDocPraticaId = oldDocPraticaId; - } - - public long getOriginalOldDocPraticaId() { - return _originalOldDocPraticaId; - } - @JSON @Override public boolean getRimosso() { @@ -968,7 +935,6 @@ public class DocPraticaModelImpl extends BaseModelImpl docPraticaImpl.setJsonFirmatari(getJsonFirmatari()); docPraticaImpl.setStatus(getStatus()); docPraticaImpl.setErrorCode(getErrorCode()); - docPraticaImpl.setOldDocPraticaId(getOldDocPraticaId()); docPraticaImpl.setRimosso(getRimosso()); docPraticaImpl.setDettPraticaIdRimozione(getDettPraticaIdRimozione()); docPraticaImpl.setDtDataRimozione(getDtDataRimozione()); @@ -1054,10 +1020,6 @@ public class DocPraticaModelImpl extends BaseModelImpl docPraticaModelImpl._setOriginalStatus = false; - docPraticaModelImpl._originalOldDocPraticaId = docPraticaModelImpl._oldDocPraticaId; - - docPraticaModelImpl._setOriginalOldDocPraticaId = false; - docPraticaModelImpl._columnBitmask = 0; } @@ -1185,8 +1147,6 @@ public class DocPraticaModelImpl extends BaseModelImpl docPraticaCacheModel.errorCode = null; } - docPraticaCacheModel.oldDocPraticaId = getOldDocPraticaId(); - docPraticaCacheModel.rimosso = getRimosso(); docPraticaCacheModel.dettPraticaIdRimozione = getDettPraticaIdRimozione(); @@ -1205,7 +1165,7 @@ public class DocPraticaModelImpl extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(55); + StringBundler sb = new StringBundler(53); sb.append("{uuid="); sb.append(getUuid()); @@ -1253,8 +1213,6 @@ public class DocPraticaModelImpl extends BaseModelImpl sb.append(getStatus()); sb.append(", errorCode="); sb.append(getErrorCode()); - sb.append(", oldDocPraticaId="); - sb.append(getOldDocPraticaId()); sb.append(", rimosso="); sb.append(getRimosso()); sb.append(", dettPraticaIdRimozione="); @@ -1268,7 +1226,7 @@ public class DocPraticaModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(85); + StringBundler sb = new StringBundler(82); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.DocPratica"); @@ -1366,10 +1324,6 @@ public class DocPraticaModelImpl extends BaseModelImpl "errorCode"); - sb.append( - "oldDocPraticaId"); sb.append( "rimosso private long _originalStatus; private boolean _setOriginalStatus; private String _errorCode; - private long _oldDocPraticaId; - private long _originalOldDocPraticaId; - private boolean _setOriginalOldDocPraticaId; private boolean _rimosso; private long _dettPraticaIdRimozione; private Date _dtDataRimozione; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java index 52c3ac6e..ff18c98d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriCacheModel.java @@ -38,7 +38,7 @@ public class FineLavoriCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(55); + StringBundler sb = new StringBundler(53); sb.append("{uuid="); sb.append(uuid); @@ -92,8 +92,6 @@ public class FineLavoriCacheModel implements CacheModel, sb.append(mezzoPagamento); sb.append(", importoBolli="); sb.append(importoBolli); - sb.append(", oldDettPraticaId="); - sb.append(oldDettPraticaId); sb.append("}"); return sb.toString(); @@ -218,8 +216,6 @@ public class FineLavoriCacheModel implements CacheModel, fineLavoriImpl.setImportoBolli(importoBolli); } - fineLavoriImpl.setOldDettPraticaId(oldDettPraticaId); - fineLavoriImpl.resetOriginalValues(); return fineLavoriImpl; @@ -253,7 +249,6 @@ public class FineLavoriCacheModel implements CacheModel, causalePagamento = objectInput.readUTF(); mezzoPagamento = objectInput.readUTF(); importoBolli = objectInput.readUTF(); - oldDettPraticaId = objectInput.readLong(); } @Override @@ -343,8 +338,6 @@ public class FineLavoriCacheModel implements CacheModel, else { objectOutput.writeUTF(importoBolli); } - - objectOutput.writeLong(oldDettPraticaId); } public String uuid; @@ -373,5 +366,4 @@ public class FineLavoriCacheModel implements CacheModel, public String causalePagamento; public String mezzoPagamento; public String importoBolli; - public long oldDettPraticaId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java index bc4f817c..4ed9a124 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.model.impl; @@ -28,14 +28,12 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; /** - * The extended model implementation for the FineLavori service. Represents a - * row in the "portos_bo_FineLavori" database table, with each column - * mapped to a property of this class. + * The extended model implementation for the FineLavori service. Represents a row in the + * "portos_bo_FineLavori" database table, with each column mapped to a property of this class. * *

- * Helper methods and all application logic should be put in this class. - * Whenever methods are added, rerun ServiceBuilder to copy their definitions - * into the {@link it.tref.liferay.portos.bo.model.FineLavori} interface. + * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.FineLavori} interface. *

* * @author Davide Barbagallo, 3F Consulting @@ -43,9 +41,8 @@ import com.liferay.portal.kernel.util.Validator; public class FineLavoriImpl extends FineLavoriBaseImpl { /* * NOTE FOR DEVELOPERS: - * - * Never reference this class directly. All methods that expect a fine - * lavori model instance should use the {@link + * + * Never reference this class directly. All methods that expect a fine lavori model instance should use the {@link * it.tref.liferay.portos.bo.model.FineLavori} interface instead. */ @@ -54,60 +51,44 @@ public class FineLavoriImpl extends FineLavoriBaseImpl { public FineLavoriImpl() { } + @Override public String getTitle(Locale locale) { StringBuilder sb = new StringBuilder(); - try { - IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(getIntPraticaId()); - // sb.append("Progetto "); if (AzioniPraticheUtil.isDeposito(intPratica.getIntPraticaId())) { sb.append("Deposito "); } else if (AzioniPraticheUtil.isAutorizzazione(intPratica.getIntPraticaId())) { sb.append("Autorizzazione "); } sb.append("n. "); - if (Validator.isNotNull(getProtocollo())) { - sb.append(intPratica.getNumeroProgetto()); - - // TODO da decidere che data, per adesso si mette quella di - // creazione il numero protocollo sbagliato dovrebbe essere il - // primo - sb.append(" del "); - sb.append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica())); - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); - sb.append(" id "); - sb.append(intPratica.getIntPraticaId()); - + // TODO da decidere che data, per adesso si mette quella di creazione il numero protocollo sbagliato + // dovrebbe essere il primo + sb.append(intPratica.getNumeroProgetto()).append(" del ") + .append(FastDateFormatFactoryUtil.getDate(locale).format(intPratica.getDtPratica())) + .append(" - id ").append(intPratica.getIntPraticaId()); } else { if (Validator.isNotNull(intPratica.getNumeroProgetto())) { - sb.append(intPratica.getNumeroProgetto()); - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); + sb.append(intPratica.getNumeroProgetto()).append(StringPool.SPACE).append(StringPool.DASH) + .append(StringPool.SPACE); } - sb.append(getFineLavoriId()); - sb.append(" (Temporaneo) "); - sb.append(StringPool.SPACE + StringPool.DASH + StringPool.SPACE); - sb.append(" id "); - sb.append(intPratica.getIntPraticaId()); + sb.append(getFineLavoriId()).append(" (Temporaneo) - id ").append(intPratica.getIntPraticaId()); } - - } catch (PortalException e) { - _log.error(e, e); - } catch (SystemException e) { + } catch (PortalException | SystemException e) { _log.error(e, e); } - return sb.toString(); - } + @Override public String getTitle() { return getTitle(LocaleUtil.getSiteDefault()); } + @Override public String getFullDescription() { return getTitle(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java index f5a3ec43..ad5d3d95 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/FineLavoriModelImpl.java @@ -92,10 +92,9 @@ public class FineLavoriModelImpl extends BaseModelImpl { "codicePagamento", Types.VARCHAR }, { "causalePagamento", Types.VARCHAR }, { "mezzoPagamento", Types.VARCHAR }, - { "importoBolli", Types.VARCHAR }, - { "oldDettPraticaId", Types.BIGINT } + { "importoBolli", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_FineLavori (uuid_ VARCHAR(75) null,fineLavoriId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,parziale BOOLEAN,completata BOOLEAN,gestita BOOLEAN,numero LONG,codiceFiscaleDelegato VARCHAR(75) null,dataEffettuazione DATE null,dataFineLavori DATE null,normEsenteBollo BOOLEAN,normEsenteCollaudo BOOLEAN,comunicazioneDirettoreLavori STRING null,pagamentoId LONG,codicePagamento VARCHAR(75) null,causalePagamento VARCHAR(75) null,mezzoPagamento VARCHAR(75) null,importoBolli VARCHAR(75) null,oldDettPraticaId LONG)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_FineLavori (uuid_ VARCHAR(75) null,fineLavoriId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,protocollo VARCHAR(75) null,dtProtocollo DATE null,parziale BOOLEAN,completata BOOLEAN,gestita BOOLEAN,numero LONG,codiceFiscaleDelegato VARCHAR(75) null,dataEffettuazione DATE null,dataFineLavori DATE null,normEsenteBollo BOOLEAN,normEsenteCollaudo BOOLEAN,comunicazioneDirettoreLavori STRING null,pagamentoId LONG,codicePagamento VARCHAR(75) null,causalePagamento VARCHAR(75) null,mezzoPagamento VARCHAR(75) null,importoBolli VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_FineLavori"; public static final String ORDER_BY_JPQL = " ORDER BY fineLavori.fineLavoriId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_FineLavori.fineLavoriId ASC"; @@ -116,11 +115,10 @@ public class FineLavoriModelImpl extends BaseModelImpl public static long COMPLETATA_COLUMN_BITMASK = 4L; public static long GROUPID_COLUMN_BITMASK = 8L; public static long INTPRATICAID_COLUMN_BITMASK = 16L; - public static long OLDDETTPRATICAID_COLUMN_BITMASK = 32L; - public static long PARZIALE_COLUMN_BITMASK = 64L; - public static long PROTOCOLLO_COLUMN_BITMASK = 128L; - public static long UUID_COLUMN_BITMASK = 256L; - public static long FINELAVORIID_COLUMN_BITMASK = 512L; + public static long PARZIALE_COLUMN_BITMASK = 32L; + public static long PROTOCOLLO_COLUMN_BITMASK = 64L; + public static long UUID_COLUMN_BITMASK = 128L; + public static long FINELAVORIID_COLUMN_BITMASK = 256L; /** * Converts the soap model instance into a normal model instance. @@ -161,7 +159,6 @@ public class FineLavoriModelImpl extends BaseModelImpl model.setCausalePagamento(soapModel.getCausalePagamento()); model.setMezzoPagamento(soapModel.getMezzoPagamento()); model.setImportoBolli(soapModel.getImportoBolli()); - model.setOldDettPraticaId(soapModel.getOldDettPraticaId()); return model; } @@ -253,7 +250,6 @@ public class FineLavoriModelImpl extends BaseModelImpl attributes.put("causalePagamento", getCausalePagamento()); attributes.put("mezzoPagamento", getMezzoPagamento()); attributes.put("importoBolli", getImportoBolli()); - attributes.put("oldDettPraticaId", getOldDettPraticaId()); return attributes; } @@ -418,12 +414,6 @@ public class FineLavoriModelImpl extends BaseModelImpl if (importoBolli != null) { setImportoBolli(importoBolli); } - - Long oldDettPraticaId = (Long)attributes.get("oldDettPraticaId"); - - if (oldDettPraticaId != null) { - setOldDettPraticaId(oldDettPraticaId); - } } @JSON @@ -881,29 +871,6 @@ public class FineLavoriModelImpl extends BaseModelImpl _importoBolli = importoBolli; } - @JSON - @Override - public long getOldDettPraticaId() { - return _oldDettPraticaId; - } - - @Override - public void setOldDettPraticaId(long oldDettPraticaId) { - _columnBitmask |= OLDDETTPRATICAID_COLUMN_BITMASK; - - if (!_setOriginalOldDettPraticaId) { - _setOriginalOldDettPraticaId = true; - - _originalOldDettPraticaId = _oldDettPraticaId; - } - - _oldDettPraticaId = oldDettPraticaId; - } - - public long getOriginalOldDettPraticaId() { - return _originalOldDettPraticaId; - } - @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -967,7 +934,6 @@ public class FineLavoriModelImpl extends BaseModelImpl fineLavoriImpl.setCausalePagamento(getCausalePagamento()); fineLavoriImpl.setMezzoPagamento(getMezzoPagamento()); fineLavoriImpl.setImportoBolli(getImportoBolli()); - fineLavoriImpl.setOldDettPraticaId(getOldDettPraticaId()); fineLavoriImpl.resetOriginalValues(); @@ -1046,10 +1012,6 @@ public class FineLavoriModelImpl extends BaseModelImpl fineLavoriModelImpl._originalCodiceFiscaleDelegato = fineLavoriModelImpl._codiceFiscaleDelegato; - fineLavoriModelImpl._originalOldDettPraticaId = fineLavoriModelImpl._oldDettPraticaId; - - fineLavoriModelImpl._setOriginalOldDettPraticaId = false; - fineLavoriModelImpl._columnBitmask = 0; } @@ -1200,14 +1162,12 @@ public class FineLavoriModelImpl extends BaseModelImpl fineLavoriCacheModel.importoBolli = null; } - fineLavoriCacheModel.oldDettPraticaId = getOldDettPraticaId(); - return fineLavoriCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(55); + StringBundler sb = new StringBundler(53); sb.append("{uuid="); sb.append(getUuid()); @@ -1261,8 +1221,6 @@ public class FineLavoriModelImpl extends BaseModelImpl sb.append(getMezzoPagamento()); sb.append(", importoBolli="); sb.append(getImportoBolli()); - sb.append(", oldDettPraticaId="); - sb.append(getOldDettPraticaId()); sb.append("}"); return sb.toString(); @@ -1270,7 +1228,7 @@ public class FineLavoriModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(85); + StringBundler sb = new StringBundler(82); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.FineLavori"); @@ -1380,10 +1338,6 @@ public class FineLavoriModelImpl extends BaseModelImpl "importoBolli"); - sb.append( - "oldDettPraticaId"); sb.append(""); @@ -1434,9 +1388,6 @@ public class FineLavoriModelImpl extends BaseModelImpl private String _causalePagamento; private String _mezzoPagamento; private String _importoBolli; - private long _oldDettPraticaId; - private long _originalOldDettPraticaId; - private boolean _setOriginalOldDettPraticaId; private long _columnBitmask; private FineLavori _escapedModel; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java index 8f30f9ac..ef2e3dcf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaImpl.java @@ -48,6 +48,7 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { @Override public String getTitle(Locale locale, boolean completed) { + DettPratica dettPratica = null; try { if (completed) { @@ -67,16 +68,19 @@ public class IntPraticaImpl extends IntPraticaBaseImpl { @Override public String getTitle(boolean completed) { + return getTitle(LocaleUtil.getSiteDefault(), completed); } @Override public boolean isAnnullata() { + return Validator.isNotNull(this.getDtAnnullamento()); } @Override public boolean isChiusa() throws SystemException { + boolean completata = false; DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(getIntPraticaId()); if (getCollaudoTotale()) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java index 569f3b0d..fb3da18d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.model.impl; @@ -25,45 +25,47 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; import com.liferay.portlet.documentlibrary.util.DLUtil; /** - * The extended model implementation for the Pagamento service. Represents a row in the - * "portos_bo_Pagamento" database table, with each column mapped to a property of this - * class. + * The extended model implementation for the Pagamento service. Represents a row in the "portos_bo_Pagamento" + * database table, with each column mapped to a property of this class. * *

- * Helper methods and all application logic should be put in this class. Whenever methods are added, - * rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.model.Pagamento} interface. + * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Pagamento} interface. *

* * @author Davide Barbagallo, 3F Consulting */ public class PagamentoImpl extends PagamentoBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this class directly. All methods that expect a pagamento model instance should - * use the {@link it.tref.liferay.portos.bo.model.Pagamento} interface instead. - */ - public PagamentoImpl() {} + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this class directly. All methods that expect a pagamento model instance should use the {@link + * it.tref.liferay.portos.bo.model.Pagamento} interface instead. + */ + public PagamentoImpl() { + } - public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException { - if (Validator.isNull(getFileEntryId())) { - return null; - } + @Override + public String getDownloadUrl(ThemeDisplay themeDisplay) throws PortalException, SystemException { - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getFileEntryId()); - return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true"); + if (Validator.isNull(getFileEntryId())) { + return null; + } + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(getFileEntryId()); + return DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, "&download=true"); - } + } - public String getImportoString() { - String importo = getImporto(); - BigDecimal importoVal; - if (Validator.isNotNull(importo)) { - importoVal = new BigDecimal(importo); - } else { - importoVal = new BigDecimal(0.00); - } - return NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoVal); - } + @Override + public String getImportoString() { + + String importo = getImporto(); + BigDecimal importoVal; + if (Validator.isNotNull(importo)) { + importoVal = new BigDecimal(importo); + } else { + importoVal = new BigDecimal(0.00); + } + return NumberFormat.getCurrencyInstance(Locale.ITALY).format(importoVal); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java index 3ef47a8b..b1497d60 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SoggettoImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.model.impl; @@ -18,33 +18,29 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; /** - * The extended model implementation for the Soggetto service. Represents a row in the - * "portos_bo_Soggetto" database table, with each column mapped to a property of this - * class. + * The extended model implementation for the Soggetto service. Represents a row in the "portos_bo_Soggetto" + * database table, with each column mapped to a property of this class. * *

- * Helper methods and all application logic should be put in this class. Whenever methods are added, - * rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.model.Soggetto} interface. + * Helper methods and all application logic should be put in this class. Whenever methods are added, rerun + * ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.model.Soggetto} interface. *

* * @author Davide Barbagallo, 3F Consulting */ public class SoggettoImpl extends SoggettoBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a soggetto - * model instance should use the {@link it.tref.liferay.portos.bo.model.Soggetto} interface - * instead. + * NOTE FOR DEVELOPERS: Never reference this class directly. All methods that expect a soggetto model instance + * should use the {@link it.tref.liferay.portos.bo.model.Soggetto} interface instead. */ public SoggettoImpl() { } + @Override public String getFullTipologiaSoggetto() { String tipologia = LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-" + getTipologiaSoggetto()); - - String ambito = StringPool.BLANK; if (Validator.isNotNull(getAmbitoProfessione())) { ambito = StringPool.SPACE + StringPool.DASH + StringPool.SPACE; @@ -57,39 +53,43 @@ public class SoggettoImpl extends SoggettoBaseImpl { return tipologia + ambito; } + @Override public String getDescrizioneCompleta() { - String descrizione = getCodiceFiscale().toUpperCase() + StringPool.SPACE + "-"; - + StringBuilder sb = new StringBuilder(); + sb.append(getCodiceFiscale().toUpperCase()).append(StringPool.SPACE).append(StringPool.DASH); if (Validator.isNotNull(getCognome())) { - descrizione += StringPool.SPACE + getCognome(); + sb.append(StringPool.SPACE).append(getCognome()); } if (Validator.isNotNull(getNome())) { - descrizione += StringPool.SPACE + getNome(); + sb.append(StringPool.SPACE).append(getNome()); } if (Validator.isNotNull(getDenominazione())) { - descrizione += StringPool.SPACE + getDenominazione(); + sb.append(StringPool.SPACE).append(getDenominazione()); } - return descrizione; + return sb.toString(); } + @Override public String getDescrizioneCompletaAccessoAtti() { - String descrizione = ""; - + StringBuilder sb = new StringBuilder(); if (Validator.isNotNull(getCognome())) { - descrizione += StringPool.SPACE + getCognome(); + sb.append(getCognome()).append(StringPool.SPACE); } if (Validator.isNotNull(getNome())) { - descrizione += StringPool.SPACE + getNome(); + sb.append(getNome()).append(StringPool.SPACE); } if (Validator.isNotNull(getDenominazione())) { - descrizione += StringPool.SPACE + getDenominazione(); + sb.append(getDenominazione()).append(StringPool.SPACE); } - return descrizione; - + if (sb.length() > 0) { + sb.setLength(sb.length() - 1); + } + return sb.toString(); } + @Override public String getDescrizioneRuolo() { String descrizione = getDescrizioneCompleta(); @@ -97,6 +97,7 @@ public class SoggettoImpl extends SoggettoBaseImpl { return descrizione + " - " + ruolo; } + @Override public String getTitle() { if (Validator.isNotNull(getDenominazione())) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java index 3640b9de..028e9551 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioCacheModel.java @@ -38,7 +38,7 @@ public class SorteggioCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(63); + StringBundler sb = new StringBundler(61); sb.append("{uuid="); sb.append(uuid); @@ -100,8 +100,6 @@ public class SorteggioCacheModel implements CacheModel, sb.append(esterna); sb.append(", praticaEsternaId="); sb.append(praticaEsternaId); - sb.append(", oldSorteggioId="); - sb.append(oldSorteggioId); sb.append("}"); return sb.toString(); @@ -254,7 +252,6 @@ public class SorteggioCacheModel implements CacheModel, sorteggioImpl.setEsterna(esterna); sorteggioImpl.setPraticaEsternaId(praticaEsternaId); - sorteggioImpl.setOldSorteggioId(oldSorteggioId); sorteggioImpl.resetOriginalValues(); @@ -293,7 +290,6 @@ public class SorteggioCacheModel implements CacheModel, mesePrecedente = objectInput.readUTF(); esterna = objectInput.readBoolean(); praticaEsternaId = objectInput.readLong(); - oldSorteggioId = objectInput.readLong(); } @Override @@ -418,7 +414,6 @@ public class SorteggioCacheModel implements CacheModel, objectOutput.writeBoolean(esterna); objectOutput.writeLong(praticaEsternaId); - objectOutput.writeLong(oldSorteggioId); } public String uuid; @@ -451,5 +446,4 @@ public class SorteggioCacheModel implements CacheModel, public String mesePrecedente; public boolean esterna; public long praticaEsternaId; - public long oldSorteggioId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java index 06b0a7de..8df03581 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/SorteggioModelImpl.java @@ -97,10 +97,9 @@ public class SorteggioModelImpl extends BaseModelImpl { "tecnico", Types.VARCHAR }, { "mesePrecedente", Types.VARCHAR }, { "esterna", Types.BOOLEAN }, - { "praticaEsternaId", Types.BIGINT }, - { "oldSorteggioId", Types.BIGINT } + { "praticaEsternaId", Types.BIGINT } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_Sorteggio (uuid_ VARCHAR(75) null,sorteggioId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,status INTEGER,statusByUserId LONG,statusByUserName VARCHAR(75) null,statusDate DATE null,intPraticaId LONG,dettPraticaId LONG,note STRING null,anno VARCHAR(4) null,mese VARCHAR(2) null,settimana INTEGER,dtSorteggio DATE null,stato VARCHAR(10) null,dettagli STRING null,numeroEstrazione LONG,pratica STRING null,committente STRING null,comune VARCHAR(75) null,provincia VARCHAR(75) null,tecnico VARCHAR(75) null,mesePrecedente VARCHAR(75) null,esterna BOOLEAN,praticaEsternaId LONG,oldSorteggioId LONG)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_Sorteggio (uuid_ VARCHAR(75) null,sorteggioId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,status INTEGER,statusByUserId LONG,statusByUserName VARCHAR(75) null,statusDate DATE null,intPraticaId LONG,dettPraticaId LONG,note STRING null,anno VARCHAR(4) null,mese VARCHAR(2) null,settimana INTEGER,dtSorteggio DATE null,stato VARCHAR(10) null,dettagli STRING null,numeroEstrazione LONG,pratica STRING null,committente STRING null,comune VARCHAR(75) null,provincia VARCHAR(75) null,tecnico VARCHAR(75) null,mesePrecedente VARCHAR(75) null,esterna BOOLEAN,praticaEsternaId LONG)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_Sorteggio"; public static final String ORDER_BY_JPQL = " ORDER BY sorteggio.sorteggioId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_Sorteggio.sorteggioId ASC"; @@ -122,10 +121,9 @@ public class SorteggioModelImpl extends BaseModelImpl public static long GROUPID_COLUMN_BITMASK = 8L; public static long INTPRATICAID_COLUMN_BITMASK = 16L; public static long MESE_COLUMN_BITMASK = 32L; - public static long OLDSORTEGGIOID_COLUMN_BITMASK = 64L; - public static long SETTIMANA_COLUMN_BITMASK = 128L; - public static long UUID_COLUMN_BITMASK = 256L; - public static long SORTEGGIOID_COLUMN_BITMASK = 512L; + public static long SETTIMANA_COLUMN_BITMASK = 64L; + public static long UUID_COLUMN_BITMASK = 128L; + public static long SORTEGGIOID_COLUMN_BITMASK = 256L; /** * Converts the soap model instance into a normal model instance. @@ -170,7 +168,6 @@ public class SorteggioModelImpl extends BaseModelImpl model.setMesePrecedente(soapModel.getMesePrecedente()); model.setEsterna(soapModel.getEsterna()); model.setPraticaEsternaId(soapModel.getPraticaEsternaId()); - model.setOldSorteggioId(soapModel.getOldSorteggioId()); return model; } @@ -265,7 +262,6 @@ public class SorteggioModelImpl extends BaseModelImpl attributes.put("mesePrecedente", getMesePrecedente()); attributes.put("esterna", getEsterna()); attributes.put("praticaEsternaId", getPraticaEsternaId()); - attributes.put("oldSorteggioId", getOldSorteggioId()); return attributes; } @@ -451,12 +447,6 @@ public class SorteggioModelImpl extends BaseModelImpl if (praticaEsternaId != null) { setPraticaEsternaId(praticaEsternaId); } - - Long oldSorteggioId = (Long)attributes.get("oldSorteggioId"); - - if (oldSorteggioId != null) { - setOldSorteggioId(oldSorteggioId); - } } @JSON @@ -973,29 +963,6 @@ public class SorteggioModelImpl extends BaseModelImpl _praticaEsternaId = praticaEsternaId; } - @JSON - @Override - public long getOldSorteggioId() { - return _oldSorteggioId; - } - - @Override - public void setOldSorteggioId(long oldSorteggioId) { - _columnBitmask |= OLDSORTEGGIOID_COLUMN_BITMASK; - - if (!_setOriginalOldSorteggioId) { - _setOriginalOldSorteggioId = true; - - _originalOldSorteggioId = _oldSorteggioId; - } - - _oldSorteggioId = oldSorteggioId; - } - - public long getOriginalOldSorteggioId() { - return _originalOldSorteggioId; - } - @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -1151,7 +1118,6 @@ public class SorteggioModelImpl extends BaseModelImpl sorteggioImpl.setMesePrecedente(getMesePrecedente()); sorteggioImpl.setEsterna(getEsterna()); sorteggioImpl.setPraticaEsternaId(getPraticaEsternaId()); - sorteggioImpl.setOldSorteggioId(getOldSorteggioId()); sorteggioImpl.resetOriginalValues(); @@ -1230,10 +1196,6 @@ public class SorteggioModelImpl extends BaseModelImpl sorteggioModelImpl._setOriginalSettimana = false; - sorteggioModelImpl._originalOldSorteggioId = sorteggioModelImpl._oldSorteggioId; - - sorteggioModelImpl._setOriginalOldSorteggioId = false; - sorteggioModelImpl._columnBitmask = 0; } @@ -1413,14 +1375,12 @@ public class SorteggioModelImpl extends BaseModelImpl sorteggioCacheModel.praticaEsternaId = getPraticaEsternaId(); - sorteggioCacheModel.oldSorteggioId = getOldSorteggioId(); - return sorteggioCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(63); + StringBundler sb = new StringBundler(61); sb.append("{uuid="); sb.append(getUuid()); @@ -1482,8 +1442,6 @@ public class SorteggioModelImpl extends BaseModelImpl sb.append(getEsterna()); sb.append(", praticaEsternaId="); sb.append(getPraticaEsternaId()); - sb.append(", oldSorteggioId="); - sb.append(getOldSorteggioId()); sb.append("}"); return sb.toString(); @@ -1491,7 +1449,7 @@ public class SorteggioModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(97); + StringBundler sb = new StringBundler(94); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Sorteggio"); @@ -1617,10 +1575,6 @@ public class SorteggioModelImpl extends BaseModelImpl "praticaEsternaId"); - sb.append( - "oldSorteggioId"); sb.append(""); @@ -1676,9 +1630,6 @@ public class SorteggioModelImpl extends BaseModelImpl private String _mesePrecedente; private boolean _esterna; private long _praticaEsternaId; - private long _oldSorteggioId; - private long _originalOldSorteggioId; - private boolean _setOriginalOldSorteggioId; private long _columnBitmask; private Sorteggio _escapedModel; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java index db245843..e6d3ad18 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/StoricoSoggettoPraticaCacheModel.java @@ -38,7 +38,7 @@ public class StoricoSoggettoPraticaCacheModel implements CacheModel"); sb.append("it.tref.liferay.portos.bo.model.StoricoSoggettoPratica"); @@ -749,10 +705,6 @@ public class StoricoSoggettoPraticaModelImpl extends BaseModelImplcodiceFiscale
"); - sb.append( - "oldStoricoSoggettoPraticaId"); sb.append("
"); @@ -779,9 +731,6 @@ public class StoricoSoggettoPraticaModelImpl extends BaseModelImpl, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(33); + StringBundler sb = new StringBundler(31); sb.append("{uuid="); sb.append(uuid); @@ -70,8 +70,6 @@ public class TempisticaCacheModel implements CacheModel, sb.append(wait); sb.append(", completo="); sb.append(completo); - sb.append(", oldTempisticaId="); - sb.append(oldTempisticaId); sb.append("}"); return sb.toString(); @@ -128,7 +126,6 @@ public class TempisticaCacheModel implements CacheModel, tempisticaImpl.setStop(stop); tempisticaImpl.setWait(wait); tempisticaImpl.setCompleto(completo); - tempisticaImpl.setOldTempisticaId(oldTempisticaId); tempisticaImpl.resetOriginalValues(); @@ -152,7 +149,6 @@ public class TempisticaCacheModel implements CacheModel, stop = objectInput.readLong(); wait = objectInput.readLong(); completo = objectInput.readBoolean(); - oldTempisticaId = objectInput.readLong(); } @Override @@ -193,7 +189,6 @@ public class TempisticaCacheModel implements CacheModel, objectOutput.writeLong(stop); objectOutput.writeLong(wait); objectOutput.writeBoolean(completo); - objectOutput.writeLong(oldTempisticaId); } public String uuid; @@ -211,5 +206,4 @@ public class TempisticaCacheModel implements CacheModel, public long stop; public long wait; public boolean completo; - public long oldTempisticaId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java index 8a2bed1d..e4536c3c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/TempisticaModelImpl.java @@ -81,10 +81,9 @@ public class TempisticaModelImpl extends BaseModelImpl { "start_", Types.BIGINT }, { "stop", Types.BIGINT }, { "wait", Types.BIGINT }, - { "completo", Types.BOOLEAN }, - { "oldTempisticaId", Types.BIGINT } + { "completo", Types.BOOLEAN } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_Tempistica (uuid_ VARCHAR(75) null,tempisticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,dettPraticaId LONG,tipo VARCHAR(75) null,start_ LONG,stop LONG,wait LONG,completo BOOLEAN,oldTempisticaId LONG)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_Tempistica (uuid_ VARCHAR(75) null,tempisticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,dettPraticaId LONG,tipo VARCHAR(75) null,start_ LONG,stop LONG,wait LONG,completo BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_Tempistica"; public static final String ORDER_BY_JPQL = " ORDER BY tempistica.tempisticaId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_Tempistica.tempisticaId ASC"; @@ -104,10 +103,9 @@ public class TempisticaModelImpl extends BaseModelImpl public static long COMPLETO_COLUMN_BITMASK = 2L; public static long GROUPID_COLUMN_BITMASK = 4L; public static long INTPRATICAID_COLUMN_BITMASK = 8L; - public static long OLDTEMPISTICAID_COLUMN_BITMASK = 16L; - public static long TIPO_COLUMN_BITMASK = 32L; - public static long UUID_COLUMN_BITMASK = 64L; - public static long TEMPISTICAID_COLUMN_BITMASK = 128L; + public static long TIPO_COLUMN_BITMASK = 16L; + public static long UUID_COLUMN_BITMASK = 32L; + public static long TEMPISTICAID_COLUMN_BITMASK = 64L; /** * Converts the soap model instance into a normal model instance. @@ -137,7 +135,6 @@ public class TempisticaModelImpl extends BaseModelImpl model.setStop(soapModel.getStop()); model.setWait(soapModel.getWait()); model.setCompleto(soapModel.getCompleto()); - model.setOldTempisticaId(soapModel.getOldTempisticaId()); return model; } @@ -217,7 +214,6 @@ public class TempisticaModelImpl extends BaseModelImpl attributes.put("stop", getStop()); attributes.put("wait", getWait()); attributes.put("completo", getCompleto()); - attributes.put("oldTempisticaId", getOldTempisticaId()); return attributes; } @@ -313,12 +309,6 @@ public class TempisticaModelImpl extends BaseModelImpl if (completo != null) { setCompleto(completo); } - - Long oldTempisticaId = (Long)attributes.get("oldTempisticaId"); - - if (oldTempisticaId != null) { - setOldTempisticaId(oldTempisticaId); - } } @JSON @@ -582,29 +572,6 @@ public class TempisticaModelImpl extends BaseModelImpl return _originalCompleto; } - @JSON - @Override - public long getOldTempisticaId() { - return _oldTempisticaId; - } - - @Override - public void setOldTempisticaId(long oldTempisticaId) { - _columnBitmask |= OLDTEMPISTICAID_COLUMN_BITMASK; - - if (!_setOriginalOldTempisticaId) { - _setOriginalOldTempisticaId = true; - - _originalOldTempisticaId = _oldTempisticaId; - } - - _oldTempisticaId = oldTempisticaId; - } - - public long getOriginalOldTempisticaId() { - return _originalOldTempisticaId; - } - @Override public StagedModelType getStagedModelType() { return new StagedModelType(PortalUtil.getClassNameId( @@ -657,7 +624,6 @@ public class TempisticaModelImpl extends BaseModelImpl tempisticaImpl.setStop(getStop()); tempisticaImpl.setWait(getWait()); tempisticaImpl.setCompleto(getCompleto()); - tempisticaImpl.setOldTempisticaId(getOldTempisticaId()); tempisticaImpl.resetOriginalValues(); @@ -730,10 +696,6 @@ public class TempisticaModelImpl extends BaseModelImpl tempisticaModelImpl._setOriginalCompleto = false; - tempisticaModelImpl._originalOldTempisticaId = tempisticaModelImpl._oldTempisticaId; - - tempisticaModelImpl._setOriginalOldTempisticaId = false; - tempisticaModelImpl._columnBitmask = 0; } @@ -803,14 +765,12 @@ public class TempisticaModelImpl extends BaseModelImpl tempisticaCacheModel.completo = getCompleto(); - tempisticaCacheModel.oldTempisticaId = getOldTempisticaId(); - return tempisticaCacheModel; } @Override public String toString() { - StringBundler sb = new StringBundler(33); + StringBundler sb = new StringBundler(31); sb.append("{uuid="); sb.append(getUuid()); @@ -842,8 +802,6 @@ public class TempisticaModelImpl extends BaseModelImpl sb.append(getWait()); sb.append(", completo="); sb.append(getCompleto()); - sb.append(", oldTempisticaId="); - sb.append(getOldTempisticaId()); sb.append("}"); return sb.toString(); @@ -851,7 +809,7 @@ public class TempisticaModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(52); + StringBundler sb = new StringBundler(49); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Tempistica"); @@ -917,10 +875,6 @@ public class TempisticaModelImpl extends BaseModelImpl "completo"); - sb.append( - "oldTempisticaId"); sb.append(""); @@ -957,9 +911,6 @@ public class TempisticaModelImpl extends BaseModelImpl private boolean _completo; private boolean _originalCompleto; private boolean _setOriginalCompleto; - private long _oldTempisticaId; - private long _originalOldTempisticaId; - private boolean _setOriginalOldTempisticaId; private long _columnBitmask; private Tempistica _escapedModel; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AllegatiManualiPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AllegatiManualiPortlet.java index eda4af5f..9dde7799 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AllegatiManualiPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AllegatiManualiPortlet.java @@ -3,6 +3,7 @@ package it.tref.liferay.portos.bo.portlet; import it.tref.liferay.portos.bo.model.AllegatoManuale; import it.tref.liferay.portos.bo.service.AllegatoManualeLocalServiceUtil; import it.tref.liferay.portos.bo.service.AllegatoManualeServiceUtil; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -52,7 +53,6 @@ public class AllegatiManualiPortlet extends MVCPortlet { String descrizione = ParamUtil.getString(uploadRequest, "descrizione"); String sourceFileName = uploadRequest.getFileName("docFile"); File file = uploadRequest.getFile("docFile"); - if (Validator.isNotNull(sourceFileName) && file != null) { // lunghezza fissata a 200 if (sourceFileName.length() > 200) { @@ -61,30 +61,27 @@ public class AllegatiManualiPortlet extends MVCPortlet { } else { SessionErrors.add(actionRequest, "error.geniocivilefe.allegato.manuale.is.request"); } - if (!SessionErrors.isEmpty(actionRequest)) { PortalUtil.copyRequestParameters(actionRequest, actionResponse); } else { if (Validator.isNotNull(intPraticaId) && Validator.isNotNull(dettPraticaId)) { byte[] content = FileUtil.getBytes(file); - AllegatoManualeLocalServiceUtil .addAllegatoManuale(serviceContext.getUserId(), intPraticaId, dettPraticaId, descrizione, content, sourceFileName, serviceContext); } } - PortalUtil.copyRequestParameters(actionRequest, actionResponse); } catch (Exception e) { PortalUtil.copyRequestParameters(actionRequest, actionResponse); _log.error("Error", e); throw new SystemException(e); } - } public void deleteAllegatoManuale(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { + long allegatoManualeId = ParamUtil.getLong(actionRequest, "allegatoManualeId"); AllegatoManualeServiceUtil.deleteAllegatoManuale(allegatoManualeId); } @@ -94,40 +91,31 @@ public class AllegatiManualiPortlet extends MVCPortlet { throws IOException, PortletException { String id = resourceRequest.getResourceID(); - try { if ("downloadAll".equals(id)) { long intPraticaId = ParamUtil.getLong(resourceRequest, "intPraticaId"); List docs = AllegatoManualeServiceUtil.findByIntPratica(intPraticaId); - ZipWriter zipWriter = ZipWriterFactoryUtil.getZipWriter(); - for (AllegatoManuale doc : docs) { - InputStream inputStream = null; try { FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(doc.getFileEntryId()); inputStream = DLFileEntryLocalServiceUtil.getFileAsStream(fileEntry.getFileEntryId(), fileEntry.getVersion(), false); - String name = fileEntry.getTitle() + StringPool.PERIOD + fileEntry.getExtension(); zipWriter.addEntry(name, inputStream); } finally { StreamUtil.cleanUp(inputStream); } } - resourceResponse.reset(); - File file = zipWriter.getFile(); byte[] data = Files.readAllBytes(file.toPath()); - resourceResponse.setContentType(ContentTypes.APPLICATION_ZIP); resourceResponse.addProperty(HttpHeaders.CACHE_CONTROL, "max-age=3600, must-revalidate"); resourceResponse.addProperty(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" - + file.getName() + "\""); + + file.getName() + StringPool.QUOTE); resourceResponse.setContentLength(data.length); - resourceResponse.getPortletOutputStream().write(data); resourceResponse.getPortletOutputStream().flush(); resourceResponse.getPortletOutputStream().close(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java index bbd77fc8..3295d836 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/AmministrazionePortlet.java @@ -50,23 +50,17 @@ public class AmministrazionePortlet extends MVCPortlet { String provincia = ParamUtil.getString(actionRequest, "provincia"); String regione = ParamUtil.getString(actionRequest, "regione"); String sigla = ParamUtil.getString(actionRequest, "sigla"); - - ServiceContext serviceContext = ServiceContextFactory.getInstance(Provincia.class.getName(), - actionRequest); - + ServiceContext serviceContext = ServiceContextFactory.getInstance(Provincia.class.getName(), actionRequest); long userId = PortalUtil.getUserId(actionRequest); - try { Provincia provinciaO = null; - if (provinciaId == 0) { - provinciaO = ProvinciaLocalServiceUtil.addProvincia(userId, codiceProvincia, provincia, - regione, sigla, serviceContext); + provinciaO = ProvinciaLocalServiceUtil.addProvincia(userId, codiceProvincia, provincia, regione, sigla, + serviceContext); } else { - provinciaO = ProvinciaLocalServiceUtil.updateProvincia(userId, provinciaId, provincia, - regione, sigla, serviceContext); + provinciaO = ProvinciaLocalServiceUtil.updateProvincia(userId, provinciaId, provincia, regione, sigla, + serviceContext); } - String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { actionRequest.setAttribute(WebKeys.PORTOS_AMM_PROVINCIA, provinciaO); @@ -74,76 +68,54 @@ public class AmministrazionePortlet extends MVCPortlet { } } catch (PortalException e) { actionResponse.setRenderParameter("mvcPath", "/html/amministrazione/tabs/province/edit.jsp"); - throw e; } } - public void saveConfigScheduler(ActionRequest actionRequest, ActionResponse actionResponse) - throws Exception { + public void saveConfigScheduler(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { try { - ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); serviceContext.setScopeGroupId(-1L); serviceContext.setCompanyId(serviceContext.getCompanyId()); - String schedulerVersioning = ParamUtil.getString(actionRequest, ConfigurazioneConstants.SCHEDULER_VERSIONING); - String schedulerGeneraDocumento = ParamUtil.getString(actionRequest, ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO); String schedulerFirmaDocumento = ParamUtil.getString(actionRequest, ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO); String schedulerInvioDocumento = ParamUtil.getString(actionRequest, ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO); - String schedulerIris = ParamUtil.getString(actionRequest, ConfigurazioneConstants.SCHEDULER_IRIS); String irisVerificaPagamentiURL = ParamUtil.getString(actionRequest, ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL); - String protocollazioneServiceURL = ParamUtil.getString(actionRequest, ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL); - String protocollazioneExportURL = ParamUtil.getString(actionRequest, ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL); - String protocollazioneImportURL = ParamUtil.getString(actionRequest, ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_IMPORT_URL); - String irisComunicazioniDebitorieURL = ParamUtil.getString(actionRequest, ConfigurazioneConstants.IRIS_COMUNICAZIONI_DEBITORIE_URL); - String irisGenerazioneIUVURL = ParamUtil.getString(actionRequest, ConfigurazioneConstants.IRIS_GENERAZIONE_IUV_URL); - String importoBollo = ParamUtil.getString(actionRequest, ConfigurazioneConstants.IMPORTO_BOLLO); - - int dayOfWeekSorteggio = ParamUtil.getInteger(actionRequest, - ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO); - - int hourOfDaySorteggio = ParamUtil.getInteger(actionRequest, - ConfigurazioneConstants.HOUR_OF_DAY_SORTEGGIO); + int dayOfWeekSorteggio = ParamUtil.getInteger(actionRequest, ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO); + int hourOfDaySorteggio = ParamUtil.getInteger(actionRequest, ConfigurazioneConstants.HOUR_OF_DAY_SORTEGGIO); hourOfDaySorteggio = Math.min(23, Math.max(0, hourOfDaySorteggio)); - int dayOfWeekPubblicazione = ParamUtil.getInteger(actionRequest, ConfigurazioneConstants.DAY_OF_WEEK_PUBBLICAZIONE); - - int startDaySorteggio = ParamUtil.getInteger(actionRequest, - ConfigurazioneConstants.START_DAY_SORTEGGIO); - - ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.SCHEDULER_VERSIONING, - schedulerVersioning, serviceContext); - + int startDaySorteggio = ParamUtil.getInteger(actionRequest, ConfigurazioneConstants.START_DAY_SORTEGGIO); + ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.SCHEDULER_VERSIONING, schedulerVersioning, + serviceContext); ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.SCHEDULER_GENERA_DOCUMENTO, schedulerGeneraDocumento, serviceContext); ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.SCHEDULER_FIRMA_DOCUMENTO, schedulerFirmaDocumento, serviceContext); ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.SCHEDULER_INVIO_DOCUMENTO, schedulerInvioDocumento, serviceContext); - ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.SCHEDULER_IRIS, schedulerIris, - serviceContext); - + ConfigurazioneServiceUtil + .storeConfig(ConfigurazioneConstants.SCHEDULER_IRIS, schedulerIris, serviceContext); ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.IRIS_VERIFICA_PAGAMENTI_URL, irisVerificaPagamentiURL, serviceContext); ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_URL, @@ -156,70 +128,48 @@ public class AmministrazionePortlet extends MVCPortlet { irisComunicazioniDebitorieURL, serviceContext); ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.IRIS_GENERAZIONE_IUV_URL, irisGenerazioneIUVURL, serviceContext); - ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.IMPORTO_BOLLO, importoBollo, - serviceContext); - + ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.IMPORTO_BOLLO, importoBollo, serviceContext); ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.DAY_OF_WEEK_SORTEGGIO, String.valueOf(dayOfWeekSorteggio), serviceContext); - ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.HOUR_OF_DAY_SORTEGGIO, String.valueOf(hourOfDaySorteggio), serviceContext); - ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.DAY_OF_WEEK_PUBBLICAZIONE, String.valueOf(dayOfWeekPubblicazione), serviceContext); - ConfigurazioneServiceUtil.storeConfig(ConfigurazioneConstants.START_DAY_SORTEGGIO, String.valueOf(startDaySorteggio), serviceContext); - String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { actionResponse.setRenderParameter("tabs1", "parametri"); } - - } catch (PortalException e) { - _log.error("Error", e); - throw new PortletException(e); - } catch (SystemException e) { + } catch (PortalException | SystemException e) { _log.error("Error", e); throw new PortletException(e); } } - public void saveConfigTemplate(ActionRequest actionRequest, ActionResponse actionResponse) - throws Exception { + public void saveConfigTemplate(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { try { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); - final String _PREFIX_START_CONFIGURAZIONE = "configurazione--"; final String _PREFIX_END_CONFIGURAZIONE = "--"; - Enumeration enu = actionRequest.getParameterNames(); - while (enu.hasMoreElements()) { String name = enu.nextElement(); - if (!name.startsWith(_PREFIX_START_CONFIGURAZIONE) && !name.endsWith("--")) { continue; } - String key = name.substring(_PREFIX_START_CONFIGURAZIONE.length(), name.length() - _PREFIX_END_CONFIGURAZIONE.length()); String value = ParamUtil.getString(actionRequest, name); - ConfigurazioneServiceUtil.storeConfig(key, value, serviceContext); - } String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { actionResponse.setRenderParameter("tabs1", "parametri"); } - - } catch (PortalException e) { - _log.error("Error", e); - throw new PortletException(e); - } catch (SystemException e) { + } catch (PortalException | SystemException e) { _log.error("Error", e); throw new PortletException(e); } @@ -236,24 +186,18 @@ public class AmministrazionePortlet extends MVCPortlet { String mailSuap = ParamUtil.getString(actionRequest, "mailSuap"); String mailSue = ParamUtil.getString(actionRequest, "mailSue"); boolean provincia = ParamUtil.getBoolean(actionRequest, "provincia"); - - ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), - actionRequest); - + ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), actionRequest); long userId = PortalUtil.getUserId(actionRequest); - try { Comune comune = null; - if (comuneId == 0) {// ADD codiceComune = codiceIstat.substring(0, 3); comune = ComuneLocalServiceUtil.addComune(userId, codiceProvincia, codiceComune, codiceIstat, codiceBelfiore, denominazione, provincia, mailSuap, mailSue, serviceContext); } else {// EDIT - ComuneLocalServiceUtil.updateComune(userId, comuneId, codiceProvincia, codiceComune, - codiceIstat, denominazione, provincia, mailSuap, mailSue, serviceContext); + ComuneLocalServiceUtil.updateComune(userId, comuneId, codiceProvincia, codiceComune, codiceIstat, + denominazione, provincia, mailSuap, mailSue, serviceContext); } - String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { actionRequest.setAttribute(WebKeys.PORTOS_AMM_COMUNE, comune); @@ -261,7 +205,6 @@ public class AmministrazionePortlet extends MVCPortlet { } } catch (PortalException e) { actionResponse.setRenderParameter("mvcPath", "/html/amministrazione/tabs/comuni/edit.jsp"); - throw e; } } @@ -279,27 +222,17 @@ public class AmministrazionePortlet extends MVCPortlet { String agMax = ParamUtil.getString(actionRequest, "agMax"); String agMin = ParamUtil.getString(actionRequest, "agMin"); Comune comune = ComuneLocalServiceUtil.getComune(comuneId); - - Provincia provincia = ProvinciaLocalServiceUtil.findByC_C(comune.getCompanyId(), - comune.getCodiceProvincia()); - - ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), - actionRequest); + Provincia provincia = ProvinciaLocalServiceUtil.findByC_C(comune.getCompanyId(), comune.getCodiceProvincia()); + ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), actionRequest); Territorio territorio = null; - if (territorioId == 0) { - - territorio = TerritorioServiceUtil.addTerritorio(comuneId, groupId, - provincia.getCodiceProvincia(), zona, fascia, articolo61, dtIni, dtFin, agMax, agMin, 0L, - serviceContext); - + territorio = TerritorioServiceUtil.addTerritorio(comuneId, groupId, provincia.getCodiceProvincia(), zona, + fascia, articolo61, dtIni, dtFin, agMax, agMin, 0L, serviceContext); } else { territorio = TerritorioLocalServiceUtil.updateTerritorio(territorioId, groupId, comuneId, provincia.getCodiceProvincia(), zona, fascia, articolo61, dtIni, dtFin, agMax, agMin, serviceContext); - } - String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { actionRequest.setAttribute(WebKeys.PORTOS_AMM_TERRITORIO, territorio); @@ -310,47 +243,40 @@ public class AmministrazionePortlet extends MVCPortlet { public void deleteComune(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { long comuneId = ParamUtil.getLong(actionRequest, "comuneId"); - - if (comuneId > 0) + if (comuneId > 0) { ComuneLocalServiceUtil.deleteComune(comuneId); + } } public void deleteComunes(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { long[] deleteComuneIds = ParamUtil.getLongValues(actionRequest, "deleteComuneIds"); - for (long deleteComuneId : deleteComuneIds) { ComuneLocalServiceUtil.deleteComune(deleteComuneId); } - actionResponse.setRenderParameter("mvcPath", "/html/amministrazione/tabs/comuni/view.jsp"); } public void deleteProvincia(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { long provinciaId = ParamUtil.getLong(actionRequest, "provinciaId"); - if (provinciaId > 0) { ProvinciaLocalServiceUtil.deleteProvincia(provinciaId); } - } public void deleteProvincias(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { long[] deleteProvinciaIds = ParamUtil.getLongValues(actionRequest, "deleteProvinciaIds"); - for (long deleteProvinciaId : deleteProvinciaIds) { ProvinciaLocalServiceUtil.deleteProvincia(deleteProvinciaId); } - actionResponse.setRenderParameter("mvcPath", "/html/amministrazione/tabs/province/view.jsp"); } public void deleteTerritorio(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { long territorioId = ParamUtil.getLong(actionRequest, "territorioId"); - if (territorioId > 0) { ComuneLocalServiceUtil.deleteComune(territorioId); } @@ -359,97 +285,74 @@ public class AmministrazionePortlet extends MVCPortlet { public void importProvincias(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { UploadPortletRequest uploadPortletRequest = PortalUtil.getUploadPortletRequest(actionRequest); - ThemeDisplay themeDisplay = (ThemeDisplay) uploadPortletRequest.getAttribute(WebKeys.THEME_DISPLAY); - String delimiter = ParamUtil.getString(uploadPortletRequest, "delimiter"); File file = uploadPortletRequest.getFile("file"); - if (Validator.isNull(file)) { throw new CSVFileNotFoundException(); } - if (Validator.isNull(delimiter)) { throw new PortletException("Delimiter is null in request"); } - ServiceContext serviceContext = ServiceContextFactory.getInstance(Provincia.class.getName(), uploadPortletRequest); - try { _log.info("Inizio importazione province..."); long start = System.currentTimeMillis(); - CSVFormat format = CSVFormat.EXCEL.withDelimiter(delimiter.charAt(0)) .withHeader(Constants.AMMINISTRAZIONE_CSV_HEADERS_PROVINCE).withSkipHeaderRecord() .withIgnoreEmptyLines().withIgnoreSurroundingSpaces(); Iterable records = format.parse(new FileReader(file)); - for (CSVRecord csvRecord : records) { try { - String codiceProvincia = StringUtils.leftPad( - String.format(csvRecord.get("codice_provincia")), 3, '0'); + String codiceProvincia = StringUtils.leftPad(String.format(csvRecord.get("codice_provincia")), 3, + '0'); String provincia = csvRecord.get("provincia"); String regione = csvRecord.get("regione"); String sigla = csvRecord.get("sigla"); - Provincia provinciaO = null; - provinciaO = ProvinciaLocalServiceUtil.fetchByC_C(themeDisplay.getCompanyId(), - codiceProvincia); + provinciaO = ProvinciaLocalServiceUtil.fetchByC_C(themeDisplay.getCompanyId(), codiceProvincia); if (provinciaO == null) { provinciaO = ProvinciaLocalServiceUtil.fetchByC_S(themeDisplay.getCompanyId(), sigla); } - if (provinciaO == null) { _log.info("La provincia non esiste e verrà creata: " + csvRecord); - - ProvinciaLocalServiceUtil.addProvincia(themeDisplay.getUserId(), codiceProvincia, - provincia, regione, sigla, serviceContext); + ProvinciaLocalServiceUtil.addProvincia(themeDisplay.getUserId(), codiceProvincia, provincia, + regione, sigla, serviceContext); } else { _log.info("La provincia esiste e verrà aggiornata: " + csvRecord); - - ProvinciaLocalServiceUtil.updateProvincia(themeDisplay.getUserId(), - provinciaO.getPrimaryKey(), provincia, regione, sigla, serviceContext); + ProvinciaLocalServiceUtil.updateProvincia(themeDisplay.getUserId(), provinciaO.getPrimaryKey(), + provincia, regione, sigla, serviceContext); } } catch (PortalException e) { _log.error("Errore di validazione: " + e.getClass().getName()); } } - long stop = System.currentTimeMillis(); _log.info("Importazione province terminata in " + (stop - start) + "ms"); } catch (Exception e) { actionResponse.setRenderParameter("mvcPath", "/html/amministrazione/tabs/province/import.jsp"); - throw e; } - } public void importComunes(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { UploadPortletRequest uploadPortletRequest = PortalUtil.getUploadPortletRequest(actionRequest); - ThemeDisplay themeDisplay = (ThemeDisplay) uploadPortletRequest.getAttribute(WebKeys.THEME_DISPLAY); - String delimiter = ParamUtil.getString(uploadPortletRequest, "delimiter"); File file = uploadPortletRequest.getFile("file"); - - if (Validator.isNull(delimiter) || Validator.isNull(file)) + if (Validator.isNull(delimiter) || Validator.isNull(file)) { throw new CSVFileNotFoundException(); - - ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), - uploadPortletRequest); - + } + ServiceContext serviceContext = ServiceContextFactory.getInstance(Comune.class.getName(), uploadPortletRequest); try { _log.info("Inizio importazione comuni..."); long start = System.currentTimeMillis(); - CSVFormat format = CSVFormat.EXCEL.withDelimiter(delimiter.charAt(0)) .withHeader(Constants.AMMINISTRAZIONE_CSV_HEADERS_COMUNI).withSkipHeaderRecord() .withIgnoreEmptyLines().withIgnoreSurroundingSpaces(); Iterable records = format.parse(new FileReader(file)); - for (CSVRecord csvRecord : records) { try { String codiceProvincia = csvRecord.get("Codice Provincia (1)"); @@ -458,56 +361,46 @@ public class AmministrazionePortlet extends MVCPortlet { String codiceBelfiore = csvRecord.get("Codice Catastale del comune"); String denominazione = csvRecord.get("Denominazione in italiano"); String provincia = csvRecord.get("Flag Comune capoluogo di provincia"); - boolean nazioneEstera = codiceBelfiore != null && codiceBelfiore.startsWith("Z"); if (Validator.isNull(codiceIstat) && nazioneEstera) { codiceIstat = codiceBelfiore; } - if (Validator.isNull(codiceIstat)) { _log.error("Il comune italiano non ha un codice istat assegnato e non sarà inserito: " + csvRecord); } else { - boolean isProvincia = Validator.isNotNull(provincia) && provincia.equals("1") ? true - : false; - - Comune comuneO = ComuneLocalServiceUtil.fetchByC_CB(themeDisplay.getCompanyId(), - codiceBelfiore); + boolean isProvincia = Validator.isNotNull(provincia) && provincia.equals("1") ? true : false; + Comune comuneO = ComuneLocalServiceUtil + .fetchByC_CB(themeDisplay.getCompanyId(), codiceBelfiore); if (comuneO == null) - comuneO = ComuneLocalServiceUtil.fetchByC_CI(themeDisplay.getCompanyId(), - codiceIstat); - + comuneO = ComuneLocalServiceUtil.fetchByC_CI(themeDisplay.getCompanyId(), codiceIstat); if (comuneO == null) { _log.debug("Il comune non esiste e verra' creato: " + csvRecord); - - if (nazioneEstera) + if (nazioneEstera) { ComuneLocalServiceUtil.addComune(themeDisplay.getUserId(), codiceProvincia, - codiceComune, codiceIstat, codiceBelfiore, denominazione, false, - true, "", "", serviceContext); - else + codiceComune, codiceIstat, codiceBelfiore, denominazione, false, true, "", "", + serviceContext); + } else { ComuneLocalServiceUtil.addComune(themeDisplay.getUserId(), codiceProvincia, - codiceComune, codiceIstat, codiceBelfiore, denominazione, - isProvincia, false, "", "", serviceContext); + codiceComune, codiceIstat, codiceBelfiore, denominazione, isProvincia, false, + "", "", serviceContext); + } } else { _log.debug("Il comune esiste e verra' aggiornato: " + csvRecord); - ComuneLocalServiceUtil.updateComune(themeDisplay.getUserId(), - comuneO.getPrimaryKey(), codiceProvincia, codiceComune, codiceIstat, - denominazione, isProvincia, nazioneEstera, "", "", serviceContext); - + ComuneLocalServiceUtil.updateComune(themeDisplay.getUserId(), comuneO.getPrimaryKey(), + codiceProvincia, codiceComune, codiceIstat, denominazione, isProvincia, + nazioneEstera, "", "", serviceContext); } } } catch (PortalException e) { _log.error("Errore di validazione: " + e.getClass().getName()); } } - long stop = System.currentTimeMillis(); _log.info("Importazione comuni terminata in " + (stop - start) + "ms"); } catch (Exception e) { actionResponse.setRenderParameter("mvcPath", "/html/amministrazione/tabs/comunes/import.jsp"); throw e; } - } - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java index 7c2d5e87..19d864dd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/DocAggiuntivaPortlet.java @@ -3,6 +3,7 @@ package it.tref.liferay.portos.bo.portlet; import it.tref.liferay.portos.bo.model.DocAggiuntiva; import it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil; import it.tref.liferay.portos.bo.service.DocAggiuntivaServiceUtil; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -40,106 +41,93 @@ import com.liferay.util.bridges.mvc.MVCPortlet; public class DocAggiuntivaPortlet extends MVCPortlet { - private Log _log = LogFactoryUtil.getLog(DocAggiuntivaPortlet.class); - - public void uploadDocAggiuntiva(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, - SystemException { - try { - UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest); - ServiceContext serviceContext = ServiceContextFactory.getInstance(uploadRequest); - long intPraticaId = ParamUtil.getLong(uploadRequest, "intPraticaId"); - long dettPraticaId = ParamUtil.getLong(uploadRequest, "dettPraticaId"); - String descrizione = ParamUtil.getString(uploadRequest, "descrizione"); - boolean feVisible = ParamUtil.getBoolean(uploadRequest, "feVisible"); - String sourceFileName = uploadRequest.getFileName("docFile"); - File file = uploadRequest.getFile("docFile"); - - if (Validator.isNotNull(sourceFileName) && file != null) { - // lunghezza fissata a 200 - if (sourceFileName.length() > 200) { - SessionErrors.add(actionRequest, "error.geniocivilefe.pagamento.allegato.length.valid"); - } - } else { - SessionErrors.add(actionRequest, "error.geniocivilefe.pagamento.allegato.is.request"); - } - - if (!SessionErrors.isEmpty(actionRequest)) { - PortalUtil.copyRequestParameters(actionRequest, actionResponse); - } else { - if (Validator.isNotNull(intPraticaId) && Validator.isNotNull(dettPraticaId)) { - byte[] content = FileUtil.getBytes(file); - DocAggiuntivaLocalServiceUtil.addDocAggiuntiva(serviceContext.getUserId(), intPraticaId, dettPraticaId, - descrizione, feVisible, content, sourceFileName, serviceContext); - } - - } - - PortalUtil.copyRequestParameters(actionRequest, actionResponse); - } catch (Exception e) { - PortalUtil.copyRequestParameters(actionRequest, actionResponse); - _log.error("Error", e); - throw new SystemException(e); - } - - } - - public void deleteDocAggiuntiva(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { - long docAggiuntivaId = ParamUtil.getLong(actionRequest, "docAggiuntivaId"); - DocAggiuntivaServiceUtil.deleteDocAggiuntiva(docAggiuntivaId); - } - - @Override - public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException, - PortletException { - - String id = resourceRequest.getResourceID(); - - try { - if ("downloadAll".equals(id)) { - long intPraticaId = ParamUtil.getLong(resourceRequest, "intPraticaId"); - List docs = DocAggiuntivaServiceUtil.findByIntPratica(intPraticaId); - - ZipWriter zipWriter = ZipWriterFactoryUtil.getZipWriter(); - - for (DocAggiuntiva doc : docs) { - - InputStream inputStream = null; - try { - if (Validator.isNull(doc.getFileEntryId())) { - continue; - } - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(doc.getFileEntryId()); - inputStream = - DLFileEntryLocalServiceUtil.getFileAsStream(fileEntry.getFileEntryId(), fileEntry.getVersion(), false); - - String name = fileEntry.getTitle() + StringPool.PERIOD + fileEntry.getExtension(); - zipWriter.addEntry(name, inputStream); - } finally { - StreamUtil.cleanUp(inputStream); - } - } - - resourceResponse.reset(); - - File file = zipWriter.getFile(); - byte[] data = Files.readAllBytes(file.toPath()); - - resourceResponse.setContentType(ContentTypes.APPLICATION_ZIP); - resourceResponse.addProperty(HttpHeaders.CACHE_CONTROL, "max-age=3600, must-revalidate"); - resourceResponse - .addProperty(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getName() + "\""); - resourceResponse.setContentLength(data.length); - - resourceResponse.getPortletOutputStream().write(data); - resourceResponse.getPortletOutputStream().flush(); - resourceResponse.getPortletOutputStream().close(); - - } else { - super.serveResource(resourceRequest, resourceResponse); - } - } catch (PortalException | SystemException e) { - _log.error(e, e); - throw new IOException(e); - } - } -} + private Log _log = LogFactoryUtil.getLog(DocAggiuntivaPortlet.class); + + public void uploadDocAggiuntiva(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, + SystemException { + try { + UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(uploadRequest); + long intPraticaId = ParamUtil.getLong(uploadRequest, "intPraticaId"); + long dettPraticaId = ParamUtil.getLong(uploadRequest, "dettPraticaId"); + String descrizione = ParamUtil.getString(uploadRequest, "descrizione"); + boolean feVisible = ParamUtil.getBoolean(uploadRequest, "feVisible"); + String sourceFileName = uploadRequest.getFileName("docFile"); + File file = uploadRequest.getFile("docFile"); + if (Validator.isNotNull(sourceFileName) && file != null) { + // lunghezza fissata a 200 + if (sourceFileName.length() > 200) { + SessionErrors.add(actionRequest, "error.geniocivilefe.pagamento.allegato.length.valid"); + } + } else { + SessionErrors.add(actionRequest, "error.geniocivilefe.pagamento.allegato.is.request"); + } + if (!SessionErrors.isEmpty(actionRequest)) { + PortalUtil.copyRequestParameters(actionRequest, actionResponse); + } else { + if (Validator.isNotNull(intPraticaId) && Validator.isNotNull(dettPraticaId)) { + byte[] content = FileUtil.getBytes(file); + DocAggiuntivaLocalServiceUtil.addDocAggiuntiva(serviceContext.getUserId(), intPraticaId, + dettPraticaId, descrizione, feVisible, content, sourceFileName, serviceContext); + } + + } + PortalUtil.copyRequestParameters(actionRequest, actionResponse); + } catch (Exception e) { + PortalUtil.copyRequestParameters(actionRequest, actionResponse); + _log.error("Error", e); + throw new SystemException(e); + } + } + + public void deleteDocAggiuntiva(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { + long docAggiuntivaId = ParamUtil.getLong(actionRequest, "docAggiuntivaId"); + + DocAggiuntivaServiceUtil.deleteDocAggiuntiva(docAggiuntivaId); + } + + @Override + public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException, + PortletException { + + String id = resourceRequest.getResourceID(); + try { + if ("downloadAll".equals(id)) { + long intPraticaId = ParamUtil.getLong(resourceRequest, "intPraticaId"); + List docs = DocAggiuntivaServiceUtil.findByIntPratica(intPraticaId); + ZipWriter zipWriter = ZipWriterFactoryUtil.getZipWriter(); + for (DocAggiuntiva doc : docs) { + InputStream inputStream = null; + try { + if (Validator.isNull(doc.getFileEntryId())) { + continue; + } + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(doc.getFileEntryId()); + inputStream = DLFileEntryLocalServiceUtil.getFileAsStream(fileEntry.getFileEntryId(), + fileEntry.getVersion(), false); + String name = fileEntry.getTitle() + StringPool.PERIOD + fileEntry.getExtension(); + zipWriter.addEntry(name, inputStream); + } finally { + StreamUtil.cleanUp(inputStream); + } + } + resourceResponse.reset(); + File file = zipWriter.getFile(); + byte[] data = Files.readAllBytes(file.toPath()); + resourceResponse.setContentType(ContentTypes.APPLICATION_ZIP); + resourceResponse.addProperty(HttpHeaders.CACHE_CONTROL, "max-age=3600, must-revalidate"); + resourceResponse.addProperty(HttpHeaders.CONTENT_DISPOSITION, + "attachment; filename=\"" + file.getName() + StringPool.QUOTE); + resourceResponse.setContentLength(data.length); + resourceResponse.getPortletOutputStream().write(data); + resourceResponse.getPortletOutputStream().flush(); + resourceResponse.getPortletOutputStream().close(); + } else { + super.serveResource(resourceRequest, resourceResponse); + } + } catch (PortalException | SystemException e) { + _log.error(e, e); + throw new IOException(e); + } + } +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java index 15f164d3..5e5a1f8e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/HomeBOPortlet.java @@ -28,165 +28,127 @@ import com.liferay.util.bridges.mvc.MVCPortlet; * Portlet implementation class HomeBOPortlet */ public class HomeBOPortlet extends MVCPortlet { - + private static final Log _log = LogFactoryUtil.getLog(HomeBOPortlet.class); - + @Override - public void render(RenderRequest renderRequest, RenderResponse renderResponse) - throws PortletException, IOException { - + public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException { + ThemeDisplay themeDisplay = (ThemeDisplay) renderRequest.getAttribute(WebKeys.THEME_DISPLAY); - try { - int countPraticheScaduteAutorizzazione = TempisticaLocalServiceUtil.countPraticheScaduteAutorizzazione( themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - int countPraticheScaduteSorteggiate = TempisticaLocalServiceUtil.countPraticheScaduteSorteggiate( themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - - int countPraticheScaduteControlloObbligatorio = TempisticaLocalServiceUtil.countPraticheScaduteControlloObbligatorio( - themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - - - int countPraticheInScadenzaAutorizzazioni = TempisticaLocalServiceUtil.countPraticheInScadenzaAutorizzazioni( - themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - + int countPraticheScaduteControlloObbligatorio = TempisticaLocalServiceUtil + .countPraticheScaduteControlloObbligatorio(themeDisplay.getCompanyId(), + themeDisplay.getScopeGroupId()); + int countPraticheInScadenzaAutorizzazioni = TempisticaLocalServiceUtil + .countPraticheInScadenzaAutorizzazioni(themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); int countPraticheInScadenzaSorteggiate = TempisticaLocalServiceUtil.countPraticheInScadenzaSorteggiate( themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - - int countPraticheInScadenzaControlloObbligatorio = TempisticaLocalServiceUtil.countPraticheInScadenzaControlloObbligatorio( - themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - - + int countPraticheInScadenzaControlloObbligatorio = TempisticaLocalServiceUtil + .countPraticheInScadenzaControlloObbligatorio(themeDisplay.getCompanyId(), + themeDisplay.getScopeGroupId()); renderRequest.setAttribute("countPraticheScaduteAutorizzazione", countPraticheScaduteAutorizzazione); renderRequest.setAttribute("countPraticheScaduteSorteggiate", countPraticheScaduteSorteggiate); - renderRequest.setAttribute("countPraticheScaduteControlloObbligatorio", countPraticheScaduteControlloObbligatorio); - + renderRequest.setAttribute("countPraticheScaduteControlloObbligatorio", + countPraticheScaduteControlloObbligatorio); renderRequest.setAttribute("countPraticheInScadenzaAutorizzazioni", countPraticheInScadenzaAutorizzazioni); renderRequest.setAttribute("countPraticheInScadenzaSorteggiate", countPraticheInScadenzaSorteggiate); - renderRequest.setAttribute("countPraticheInScadenzaControlloObbligatorio", countPraticheInScadenzaControlloObbligatorio); - - - ClassLoader classLoader = - (ClassLoader) PortletBeanLocatorUtil.locate(com.liferay.portal.workflow.kaleo.service.ClpSerializer.getServletContextName(), "portletClassLoader"); - - + renderRequest.setAttribute("countPraticheInScadenzaControlloObbligatorio", + countPraticheInScadenzaControlloObbligatorio); + ClassLoader classLoader = (ClassLoader) PortletBeanLocatorUtil.locate( + com.liferay.portal.workflow.kaleo.service.ClpSerializer.getServletContextName(), + "portletClassLoader"); List praticheAttiveAutorizzazioni = TempisticaLocalServiceUtil.praticheAttiveAutorizzazioni( themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - int countAutorizzazioniDaAssegnare = 0; int countAutorizzazioniOrdinarie = 0; - - for(Long intPraticaId : praticheAttiveAutorizzazioni){ - + for (Long intPraticaId : praticheAttiveAutorizzazioni) { DynamicQuery query = DynamicQueryFactoryUtil.forClass(ControlloPratica.class); query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - List lista = ControlloPraticaLocalServiceUtil.dynamicQuery(query); - if(lista != null && !lista.isEmpty()){ - + if (lista != null && !lista.isEmpty()) { ControlloPratica controlloPratica = lista.get(0); - if(controlloPratica != null){ - - DynamicQuery queryKaleo = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class,classLoader); + if (controlloPratica != null) { + DynamicQuery queryKaleo = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class, + classLoader); queryKaleo.add(RestrictionsFactoryUtil.eq("classPK", controlloPratica.getControlloPraticaId())); queryKaleo.add(RestrictionsFactoryUtil.eq("kaleoTaskName", "Assegnazione")); queryKaleo.add(RestrictionsFactoryUtil.eq("completed", false)); - - List listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil.dynamicQuery(queryKaleo); - if(listaKaleo != null && !listaKaleo.isEmpty()){ - countAutorizzazioniDaAssegnare ++; + List listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil + .dynamicQuery(queryKaleo); + if (listaKaleo != null && !listaKaleo.isEmpty()) { + countAutorizzazioniDaAssegnare++; } else { countAutorizzazioniOrdinarie++; } } } } - renderRequest.setAttribute("countAutorizzazioniDaAssegnare", countAutorizzazioniDaAssegnare); renderRequest.setAttribute("countAutorizzazioniOrdinarie", countAutorizzazioniOrdinarie); - - List praticheAttiveSorteggiate = TempisticaLocalServiceUtil.praticheAttiveSorteggiate( themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - int countSorteggiateDaAssegnare = 0; int countSorteggiateOrdinarie = 0; - - for(Long intPraticaId : praticheAttiveSorteggiate){ - + for (Long intPraticaId : praticheAttiveSorteggiate) { DynamicQuery query = DynamicQueryFactoryUtil.forClass(ControlloPratica.class); query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - List lista = ControlloPraticaLocalServiceUtil.dynamicQuery(query); - if(lista != null && !lista.isEmpty()){ - + if (lista != null && !lista.isEmpty()) { ControlloPratica controlloPratica = lista.get(0); - if(controlloPratica != null){ - - DynamicQuery queryKaleo = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class,classLoader); + if (controlloPratica != null) { + DynamicQuery queryKaleo = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class, + classLoader); queryKaleo.add(RestrictionsFactoryUtil.eq("classPK", controlloPratica.getControlloPraticaId())); queryKaleo.add(RestrictionsFactoryUtil.eq("kaleoTaskName", "Assegnazione")); queryKaleo.add(RestrictionsFactoryUtil.eq("completed", false)); - - List listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil.dynamicQuery(queryKaleo); - if(listaKaleo != null && !listaKaleo.isEmpty()){ - countSorteggiateDaAssegnare ++; + List listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil + .dynamicQuery(queryKaleo); + if (listaKaleo != null && !listaKaleo.isEmpty()) { + countSorteggiateDaAssegnare++; } else { countSorteggiateOrdinarie++; } } } } - renderRequest.setAttribute("countSorteggiateDaAssegnare", countSorteggiateDaAssegnare); renderRequest.setAttribute("countSorteggiateOrdinarie", countSorteggiateOrdinarie); - - List praticheAttiveControlloObbligatorio = TempisticaLocalServiceUtil.praticheAttiveControlloObbligatorio( - themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); - + List praticheAttiveControlloObbligatorio = TempisticaLocalServiceUtil + .praticheAttiveControlloObbligatorio(themeDisplay.getCompanyId(), themeDisplay.getScopeGroupId()); int countControlloObbligatorioDaAssegnare = 0; int countControlloObbligatorioOrdinarie = 0; - - for(Long intPraticaId : praticheAttiveControlloObbligatorio){ - + for (Long intPraticaId : praticheAttiveControlloObbligatorio) { DynamicQuery query = DynamicQueryFactoryUtil.forClass(ControlloPratica.class); query.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - List lista = ControlloPraticaLocalServiceUtil.dynamicQuery(query); - if(lista != null && !lista.isEmpty()){ - + if (lista != null && !lista.isEmpty()) { ControlloPratica controlloPratica = lista.get(0); - if(controlloPratica != null){ - - DynamicQuery queryKaleo = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class,classLoader); + if (controlloPratica != null) { + DynamicQuery queryKaleo = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class, + classLoader); queryKaleo.add(RestrictionsFactoryUtil.eq("classPK", controlloPratica.getControlloPraticaId())); queryKaleo.add(RestrictionsFactoryUtil.eq("className", ControlloPratica.class.getName())); queryKaleo.add(RestrictionsFactoryUtil.eq("kaleoTaskName", "Assegnazione")); queryKaleo.add(RestrictionsFactoryUtil.eq("completed", false)); - - List listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil.dynamicQuery(queryKaleo); - if(listaKaleo != null && !listaKaleo.isEmpty()){ - countControlloObbligatorioDaAssegnare ++; + List listaKaleo = KaleoTaskInstanceTokenLocalServiceUtil + .dynamicQuery(queryKaleo); + if (listaKaleo != null && !listaKaleo.isEmpty()) { + countControlloObbligatorioDaAssegnare++; } else { countControlloObbligatorioOrdinarie++; - } } } } - renderRequest.setAttribute("countControlloObbligatorioDaAssegnare", countControlloObbligatorioDaAssegnare); renderRequest.setAttribute("countControlloObbligatorioOrdinarie", countControlloObbligatorioOrdinarie); - - } catch (SystemException e) { - _log.error(e,e); + _log.error(e, e); } - super.render(renderRequest, renderResponse); } - - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java index c9feaaf2..c75e89df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/portlet/RicercaProtocolloPortlet.java @@ -12,18 +12,14 @@ import com.liferay.util.bridges.mvc.MVCPortlet; * Portlet implementation class RicercaProtocolloPortlet */ public class RicercaProtocolloPortlet extends MVCPortlet { - - - public void search(ActionRequest actionRequest, ActionResponse actionResponse){ - + + public void search(ActionRequest actionRequest, ActionResponse actionResponse) { + String dataDa = ParamUtil.getString(actionRequest, "dataDa", StringPool.BLANK); String dataA = ParamUtil.getString(actionRequest, "dataA", StringPool.BLANK); - String numeroProtocollo = ParamUtil.getString(actionRequest, "numeroProtocollo", StringPool.BLANK); - - actionResponse.setRenderParameter("dataDa", dataDa); - actionResponse.setRenderParameter("dataA", dataA); - actionResponse.setRenderParameter("numeroProtocollo", numeroProtocollo); - + String numeroProtocollo = ParamUtil.getString(actionRequest, "numeroProtocollo", StringPool.BLANK); + actionResponse.setRenderParameter("dataDa", dataDa); + actionResponse.setRenderParameter("dataA", dataA); + actionResponse.setRenderParameter("numeroProtocollo", numeroProtocollo); } - } 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 ddcd95cf..910e0742 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 @@ -4,9 +4,6 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -import com.liferay.portal.kernel.log.Log; -import com.liferay.portal.kernel.log.LogFactoryUtil; - public class ReportAvvisoBean implements Serializable { private static final long serialVersionUID = -1229588050032694212L; @@ -37,9 +34,7 @@ public class ReportAvvisoBean implements Serializable { private long numeroIntegrazione; private String codiceTipoIntegrazione; private String tipoIntegrazione; - private long varianteNumero; // numero progressivo - // variante in - // intPratica + private long varianteNumero; // numero progressivo variante in intPratica private Date dataAvviso; private Date dataSorteggio; private String meseSorteggio; @@ -49,12 +44,9 @@ public class ReportAvvisoBean implements Serializable { private String tipoProcedura; private String po; private String presidio; - private String numeroVariante; // numero totali - // varianti - + private String numeroVariante; // numero totali varianti private String numeroProtocolloIntegrazione; private String elencoNumeriProtocolloIntegrazione; - private Boolean parziale; private String parzialeNumero; private String tipoAutorizzazione; @@ -117,7 +109,7 @@ public class ReportAvvisoBean implements Serializable { public String getDirettoreLavori() { return direttoreLavori; } - + public void setDirettoreLavori(String direttoreLavori) { this.direttoreLavori = direttoreLavori; } @@ -126,7 +118,7 @@ public class ReportAvvisoBean implements Serializable { public String getAlCommittente() { return committente; } - + public String getCommittente() { return committente; } @@ -182,19 +174,19 @@ public class ReportAvvisoBean implements Serializable { public void setNumeroProtocolloValido(String numeroProtocolloValido) { this.numeroProtocolloValido = numeroProtocolloValido; } - + public String getTipoAnnullato() { return tipoAnnullato; } - + public void setTipoAnnullato(String tipoAnnullato) { this.tipoAnnullato = tipoAnnullato; } - + public String getTipoValido() { return tipoValido; } - + public void setTipoValido(String tipoValido) { this.tipoValido = tipoValido; } @@ -375,7 +367,6 @@ public class ReportAvvisoBean implements Serializable { this.po = po; } - public String getNumeroProtocolloIntegrazione() { return numeroProtocolloIntegrazione; @@ -417,7 +408,7 @@ public class ReportAvvisoBean implements Serializable { public String getTitolareDigitale() { return titolareDigitale; } - + public void setTitolareDigitale(String titolareDigitale) { this.titolareDigitale = titolareDigitale; } @@ -461,7 +452,7 @@ public class ReportAvvisoBean implements Serializable { this.parzialeNumero = parzialeNumero; } - + public String getTipoAutorizzazione() { return tipoAutorizzazione; @@ -471,5 +462,4 @@ public class ReportAvvisoBean implements Serializable { this.tipoAutorizzazione = tipoAutorizzazione; } - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java index ff20ecb3..40644f22 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoAllegatoBeanBuilder.java @@ -13,32 +13,24 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; public class ReportAvvisoAllegatoBeanBuilder { private ReportAvvisoAllegatoBeanBuilder() { - } public static ReportAvvisoAllegatoBean build(DocPratica docPratica) throws SystemException { ReportAvvisoAllegatoBean bean = new ReportAvvisoAllegatoBean(); - try { FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(docPratica.getDlFileEntryId()); - bean.setTitoloAllegato(fileEntry.getDescription()); - - // ADT: BUG FE ID=31 if (docPratica.getTipologia().equalsIgnoreCase( DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO) && (Validator.isNull(fileEntry.getDescription()))) { bean.setTitoloAllegato(fileEntry.getTitle()); } - // //// - bean.setCodiceAllegato(docPratica.getTipologia()); bean.setSha256Allegato(docPratica.getSha256()); } catch (PortalException e) { throw new SystemException(e); } - return bean; } @@ -50,8 +42,6 @@ public class ReportAvvisoAllegatoBeanBuilder { bean.setTipoIntegrazione(tipoIntegrazione); bean.setNumeroIntegrazione(numeroIntegrazione); bean.setAggiornato(docPratica.isAggiornato()); - return bean; } - } 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 8c130cb9..d62187c8 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 @@ -61,64 +61,53 @@ public class ReportAvvisoBeanBuilder { private ReportAvvisoBeanBuilder() { } - public static ReportAvvisoBean build(Avviso avviso, Map parameters) - throws SystemException, PortalException { + public static ReportAvvisoBean build(Avviso avviso, Map parameters) throws SystemException, + PortalException { long intPraticaId = avviso.getIntPraticaId(); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); ReportAvvisoBean bean = new ReportAvvisoBean(); DettPratica dettPratica = null; - - long numeroIntegrazione = 0l; + long numeroIntegrazione = 0L; String codiceTipoIntegrazione = StringPool.BLANK; String tipoIntegrazione = StringPool.BLANK; - // DATI PER NUMERO VARIANTI - int numeroVarianti = DettPraticaLocalServiceUtil.countByIntPraticaId_TipoIntegrazione_Completa( - intPraticaId, TipoIntegrazioneUtil.VARIANTE, true); + int numeroVarianti = DettPraticaLocalServiceUtil.countByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, + TipoIntegrazioneUtil.VARIANTE, true); if (numeroVarianti > 0) { bean.setNumeroVariante(String.valueOf(numeroVarianti)); } - if (DettPratica.class.getName().equals(avviso.getClassName())) { dettPratica = DettPraticaLocalServiceUtil.getDettPratica(avviso.getClassPk()); bean.setNumeroProtocollo(dettPratica.getProtocollo()); bean.setVarianteNumero(dettPratica.getVarianteNumero()); - // DATI PER INTEGRAZIONE if (dettPratica.getIntegrazione() > 0) { numeroIntegrazione = dettPratica.getIntegrazione(); codiceTipoIntegrazione = dettPratica.getTipoIntegrazione(); - tipoIntegrazione = LanguageUtil.get(LocaleUtil.getSiteDefault(), "label-integrazione-" - + dettPratica.getTipoIntegrazione()); + tipoIntegrazione = LanguageUtil.get(LocaleUtil.getSiteDefault(), + "label-integrazione-" + dettPratica.getTipoIntegrazione()); bean.setDataIntegrazione(dettPratica.getDataEffettuazione()); bean.setNumeroIntegrazione(numeroIntegrazione); bean.setCodiceTipoIntegrazione(codiceTipoIntegrazione); bean.setTipoIntegrazione(tipoIntegrazione); } - // DATI PER VARIAZIONE SOGGETTO List soggettiBean = new ArrayList(); if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(dettPratica.getTipoIntegrazione())) { - - // ADT BUG FE ID = 6 - List soggetti = SoggettoLocalServiceUtil.findByIntPratica(dettPratica - .getIntPraticaId()); + List soggetti = SoggettoLocalServiceUtil.findByIntPratica(dettPratica.getIntPraticaId()); for (Soggetto soggetto : soggetti) { ReportAvvisoSoggettoBean beanSoggetto = ReportAvvisoSoggettoBeanBuilder.build(soggetto, dettPratica.getDettPraticaId()); if (beanSoggetto != null) { if (beanSoggetto.getTipoOperazione() != null) { soggettiBean.add(beanSoggetto); - } } } } bean.setSoggetti(soggettiBean); - String tipo = AvvisoUtil.getTipoReport(dettPratica, avviso.getTipoDocumento()); - // DATI SOLO PER IL SORTEGGIO if (tipo.equals(AvvisoUtil.TIPO_REPORT_SORTEGGIO)) { Sorteggio sorteggio = SorteggioLocalServiceUtil.findByIntPratica(intPraticaId); @@ -131,19 +120,15 @@ public class ReportAvvisoBeanBuilder { calendar.setTime(intPratica.getDtSorteggio()); mId = calendar.get(Calendar.MONTH); } - bean.setMeseSorteggio(CalendarUtil.getMonths(Locale.ITALIAN)[mId]); } bean.setTipo(tipo); - int numeroProtocolloIntegrazione = DettPraticaLocalServiceUtil .countByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, true); bean.setNumeroProtocolloIntegrazione(String.valueOf(numeroProtocolloIntegrazione)); - - List integrazioni = DettPraticaLocalServiceUtil - .findByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, - TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, true); + List integrazioni = DettPraticaLocalServiceUtil.findByIntPraticaId_TipoIntegrazione_Completa( + intPraticaId, TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, true); StringBuilder sb = new StringBuilder(); for (DettPratica integrazione : integrazioni) { if (sb.length() != 0) { @@ -152,28 +137,22 @@ public class ReportAvvisoBeanBuilder { sb.append(integrazione.getProtocollo()); } bean.setElencoNumeriProtocolloIntegrazione(sb.toString()); - } else if (FineLavori.class.getName().equalsIgnoreCase(avviso.getClassName())) { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(avviso.getClassPk()); dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); bean.setNumeroProtocollo(fineLavori.getProtocollo()); bean.setParziale(fineLavori.isParziale()); bean.setParzialeNumero(String.valueOf(fineLavori.getNumero())); - } else if (Collaudo.class.getName().equalsIgnoreCase(avviso.getClassName())) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(avviso.getClassPk()); dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); bean.setNumeroProtocollo(collaudo.getProtocollo()); bean.setParziale(collaudo.isParziale()); bean.setParzialeNumero(String.valueOf(collaudo.getNumero())); - } - List allegati = new ArrayList(); - // ADT BUG FE ID = 9 List docPraticas = null; - if (avviso.getTipoDocumento().equalsIgnoreCase( - DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO)) { + if (avviso.getTipoDocumento().equalsIgnoreCase(DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO)) { docPraticas = DocPraticaLocalServiceUtil.findByIntPratica_Tipologia(intPraticaId, DocumentiPraticaUtil.TIPOLOGIA_ALLEGATO_ANNULLAMENTO_FASCICOLO, -1, -1); } else if (avviso.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.AUTORIZZATA) @@ -188,80 +167,57 @@ public class ReportAvvisoBeanBuilder { docPraticas = DocPraticaLocalServiceUtil.findByClassPk(avviso.getClassPk()); } for (DocPratica docPratica : docPraticas) { - allegati.add(ReportAvvisoAllegatoBeanBuilder.build(docPratica, codiceTipoIntegrazione, - tipoIntegrazione, numeroIntegrazione)); + allegati.add(ReportAvvisoAllegatoBeanBuilder.build(docPratica, codiceTipoIntegrazione, tipoIntegrazione, + numeroIntegrazione)); } - bean.setAllegati(allegati); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); Group groupGenio = GroupLocalServiceUtil.getGroup(territorio.getGroupId()); - Organization organizzation = OrganizationLocalServiceUtil.getOrganization(groupGenio - .getOrganizationId()); - + Organization organizzation = OrganizationLocalServiceUtil.getOrganization(groupGenio.getOrganizationId()); String uuid = avviso.getUuid(); - Comune comune = ComuneLocalServiceUtil.fetchComune(territorio.getComuneId()); String comuneDesc = comune.getDenominazione(); - long organizationId = GroupLocalServiceUtil.fetchGroup(territorio.getGroupId()).getOrganizationId(); Organization organization = OrganizationLocalServiceUtil.fetchOrganization(organizationId); - - bean.setPo((String) organization.getExpandoBridge() - .getAttribute(Constants.ORG_CUSTOM_FIELD_PO, false)); + bean.setPo((String) organization.getExpandoBridge().getAttribute(Constants.ORG_CUSTOM_FIELD_PO, false)); bean.setSedeGenioCivile(organization.getName()); bean.setDirigente("Il dirigente"); - // ADT BUG FE ID = 8 if (FineLavori.class.getName().equalsIgnoreCase(avviso.getClassName())) { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(avviso.getClassPk()); bean.setDataPratica(fineLavori.getDtProtocollo()); - } - // ADT BUG FE ID = 19 - else if (Collaudo.class.getName().equalsIgnoreCase(avviso.getClassName())) { + } else if (Collaudo.class.getName().equalsIgnoreCase(avviso.getClassName())) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(avviso.getClassPk()); bean.setDataPratica(collaudo.getDtProtocollo()); - } - - else { - + } else { bean.setDataPratica(intPratica.getDtPratica()); } - bean.setDataAvviso(avviso.getModifiedDate()); bean.setTipoPratica(intPratica.getTipoPratica()); bean.setTipoProcedura(intPratica.getTipoProcedura()); - bean.setTipoAutorizzazione(LanguageUtil.get(LocaleUtil.getSiteDefault(), "tipo_procedura_" - + intPratica.getTipoProcedura())); - + bean.setTipoAutorizzazione(LanguageUtil.get(LocaleUtil.getSiteDefault(), + "tipo_procedura_" + intPratica.getTipoProcedura())); bean.setCodiceUnivoco(uuid); bean.setLavoriDi(dettPratica.getDescLongIntervento()); bean.setNumeroProgetto(intPratica.getNumeroProgetto()); - if (Validator.isNotNull(intPratica.getStatusByUserId())) { User user = UserLocalServiceUtil.getUser(intPratica.getStatusByUserId()); bean.setTecnicoEmail(user.getEmailAddress()); bean.setTecnico(user.getFullName()); } - String ubicazione = dettPratica.getVia(); if (Validator.isNull(ubicazione)) { ubicazione = dettPratica.getLocalita(); } else if (Validator.isNotNull(dettPratica.getLocalita())) { ubicazione += StringPool.COMMA_AND_SPACE + dettPratica.getLocalita(); } - bean.setUbicazione(ubicazione); bean.setComune(comuneDesc); - bean.setSedeGenioCivile(organizzation.getName()); - User user = UserLocalServiceUtil.getUser(intPratica.getUserId()); bean.setTitolareDigitale(user.getFullName()); - // RIEMPIO I SOGGETTI - Soggetto committenteBean = SoggettoLocalServiceUtil - .getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(intPraticaId, - dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE); + Soggetto committenteBean = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto( + intPraticaId, dettPratica.getCodiceFiscalePrincipaleCommittente(), TipoSoggettoUtil.COMMITTENTE); if (Validator.isNull(committenteBean)) { List committenti = SoggettoLocalServiceUtil.getValidTmpByDettPratica_TipologiaSoggetto( dettPratica.getDettPraticaId(), TipoSoggettoUtil.COMMITTENTE); @@ -270,36 +226,26 @@ public class ReportAvvisoBeanBuilder { } } if (Validator.isNotNull(committenteBean)) { - // String committente = committenteBean.getNome() + StringPool.SPACE - // + - // committenteBean.getCognome(); String committente = committenteBean.getTitle(); bean.setCommittente(committente); } - - Soggetto direttoreLavoriBean = SoggettoLocalServiceUtil - .getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(intPraticaId, - dettPratica.getCodiceFiscalePrincipaleDirettoreLavori(), - TipoSoggettoUtil.DIRETTORE_LAVORI); + Soggetto direttoreLavoriBean = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto( + intPraticaId, dettPratica.getCodiceFiscalePrincipaleDirettoreLavori(), + TipoSoggettoUtil.DIRETTORE_LAVORI); if (Validator.isNotNull(direttoreLavoriBean)) { String direttoreLavori = direttoreLavoriBean.getNome() + StringPool.SPACE + direttoreLavoriBean.getCognome(); bean.setDirettoreLavori(direttoreLavori); } - - Soggetto collaudatoreBean = SoggettoLocalServiceUtil - .getValidByIntPratica_CodiceFiscale_TipologiaSoggetto(intPraticaId, - dettPratica.getCodiceFiscalePrincipaleCollaudatore(), TipoSoggettoUtil.COLLAUDATORE); + Soggetto collaudatoreBean = SoggettoLocalServiceUtil.getValidByIntPratica_CodiceFiscale_TipologiaSoggetto( + intPraticaId, dettPratica.getCodiceFiscalePrincipaleCollaudatore(), TipoSoggettoUtil.COLLAUDATORE); if (Validator.isNotNull(collaudatoreBean)) { - String collaudatore = collaudatoreBean.getNome() + StringPool.SPACE - + collaudatoreBean.getCognome(); + String collaudatore = collaudatoreBean.getNome() + StringPool.SPACE + collaudatoreBean.getCognome(); bean.setCollaudatore(collaudatore); } - if (WorkflowUtil.isWorkflowDisattivabile(intPraticaId)) { - - List controlloPraticas = ControlloPraticaLocalServiceUtil - .findByIntPraticaId_Status(intPraticaId, WorkflowConstants.STATUS_PENDING); + List controlloPraticas = ControlloPraticaLocalServiceUtil.findByIntPraticaId_Status( + intPraticaId, WorkflowConstants.STATUS_PENDING); if (controlloPraticas.size() > 0) { ControlloPratica controlloPratica = controlloPraticas.get(0); Map formParameters = WorkflowUtil.getFormParameters(controlloPratica); @@ -308,36 +254,39 @@ public class ReportAvvisoBeanBuilder { } } } - SimpleDateFormat dfmt = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); - if (parameters.containsKey("dataProtocolloAnnullato")) + if (parameters.containsKey("dataProtocolloAnnullato")) { try { bean.setDataProtocolloAnnullato(dfmt.parse((String) parameters.get("dataProtocolloAnnullato"))); } catch (ParseException e) { } - if (parameters.containsKey("numeroProtocolloAnnullato")) + } + if (parameters.containsKey("numeroProtocolloAnnullato")) { bean.setNumeroProtocolloAnnullato((String) parameters.get("numeroProtocolloAnnullato")); - if (parameters.containsKey("tipoAnnullato")) + } + if (parameters.containsKey("tipoAnnullato")) { bean.setTipoAnnullato((String) parameters.get("tipoAnnullato")); - - if (parameters.containsKey("dataProtocolloValido")) + } + if (parameters.containsKey("dataProtocolloValido")) { try { bean.setDataProtocolloValido(dfmt.parse((String) parameters.get("dataProtocolloValido"))); } catch (ParseException e) { } - if (parameters.containsKey("numeroProtocolloValido")) + } + if (parameters.containsKey("numeroProtocolloValido")) { bean.setNumeroProtocolloValido((String) parameters.get("numeroProtocolloValido")); - if (parameters.containsKey("tipoValido")) + } + if (parameters.containsKey("tipoValido")) { bean.setTipoValido((String) parameters.get("tipoValido")); - + } // ADT:bug id 14: correzione testo del documento di non autorizzazione if (avviso.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.NON_AUTORIZZATA) || avviso.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.NON_CONFORME) || avviso.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.NO_PARERE)) { - if (Validator.isNull(parameters.get("motivazioni"))) + if (Validator.isNull(parameters.get("motivazioni"))) { parameters.put("motivazioni", parameters.get("testo_del_documento")); + } } - return bean; } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java index 317945c3..3238bed9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportAvvisoSoggettoBeanBuilder.java @@ -9,28 +9,23 @@ import com.liferay.portal.kernel.util.Validator; public class ReportAvvisoSoggettoBeanBuilder { - private ReportAvvisoSoggettoBeanBuilder() { - - } - - public static ReportAvvisoSoggettoBean build(Soggetto soggetto, long dettPraticaId) { - - ReportAvvisoSoggettoBean bean = new ReportAvvisoSoggettoBean(); - - bean.setTipoSoggetto(LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-" + soggetto.getTipologiaSoggetto())); - bean.setDenominazione(soggetto.getTitle()); - if (soggetto.getDettPraticaId() == dettPraticaId) { - bean.setTipoOperazione("aggiunto"); - } else if (soggetto.getDettPraticaIdRimozione() == dettPraticaId) { - if (Validator.isNotNull(soggetto.getSostituitoDa())) { - bean.setTipoOperazione("sostituito"); - } else { - bean.setTipoOperazione("rimosso"); - } - } - - return bean; - } - - + private ReportAvvisoSoggettoBeanBuilder() { + } + + public static ReportAvvisoSoggettoBean build(Soggetto soggetto, long dettPraticaId) { + + ReportAvvisoSoggettoBean bean = new ReportAvvisoSoggettoBean(); + bean.setTipoSoggetto(LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-" + soggetto.getTipologiaSoggetto())); + bean.setDenominazione(soggetto.getTitle()); + if (soggetto.getDettPraticaId() == dettPraticaId) { + bean.setTipoOperazione("aggiunto"); + } else if (soggetto.getDettPraticaIdRimozione() == dettPraticaId) { + if (Validator.isNotNull(soggetto.getSostituitoDa())) { + bean.setTipoOperazione("sostituito"); + } else { + bean.setTipoOperazione("rimosso"); + } + } + return bean; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportSorteggioBeanBuilder.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportSorteggioBeanBuilder.java deleted file mode 100644 index 4bf2d4e0..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/report/builder/builder/ReportSorteggioBeanBuilder.java +++ /dev/null @@ -1,51 +0,0 @@ -package it.tref.liferay.portos.bo.report.builder.builder; - -import it.tref.liferay.portos.bo.model.DettPratica; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.model.Sorteggio; -import it.tref.liferay.portos.bo.model.Territorio; -import it.tref.liferay.portos.bo.report.builder.bean.ReportSorteggioBean; -import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; -import it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil; - -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.kernel.exception.SystemException; - -public class ReportSorteggioBeanBuilder { - - private ReportSorteggioBeanBuilder() { - - } - - public static ReportSorteggioBean build(Sorteggio sorteggio) throws SystemException { - - ReportSorteggioBean reportSorteggioBOBean = new ReportSorteggioBean(); - - try { - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(sorteggio.getDettPraticaId()); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - reportSorteggioBOBean.setFascia(territorio.getFascia()); - - //Task 32561 - reportSorteggioBOBean.setZona(territorio.getZona()); - - reportSorteggioBOBean.setProvincia(sorteggio.getProvincia()); - - } catch (PortalException e) { - } - - reportSorteggioBOBean.setNumeroEstrazione(String.valueOf(sorteggio.getNumeroEstrazione())); - - reportSorteggioBOBean.setTecnico(sorteggio.getTecnico()); - reportSorteggioBOBean.setCommittente(sorteggio.getCommittente()); - reportSorteggioBOBean.setCitta(sorteggio.getComune()); - reportSorteggioBOBean.setPratica(sorteggio.getPratica()); - - reportSorteggioBOBean.setFase(Boolean.parseBoolean(sorteggio.getMesePrecedente()) ? "1" : "2"); - - return reportSorteggioBOBean; - } - -} diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java index b1403529..d9733049 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerPratiche.java @@ -59,32 +59,19 @@ public class SchedulerPratiche implements MessageListener { if (lock.tryLock()) { try { - - /* - * Fascicoli Senza progetto - */ - + // Fascicoli Senza progetto int count = IntPraticaLocalServiceUtil.countFascicoliNotProgetto(); - if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - - List intPratiche = IntPraticaLocalServiceUtil.findFascicoliNotProgetto( - cursor, cursor + SIZE); - + List intPratiche = IntPraticaLocalServiceUtil.findFascicoliNotProgetto(cursor, + cursor + SIZE); for (IntPratica intPratica : intPratiche) { - try { - User user = UserLocalServiceUtil.getUser(intPratica.getUserId()); PrincipalThreadLocal.setName(user.getUserId()); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil - .create(user); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); - assegnaNumeroProgetto(intPratica); - } catch (Exception e) { _log.error("Error", e); } finally { @@ -94,33 +81,19 @@ public class SchedulerPratiche implements MessageListener { } } } - - /* - * Pratiche gestite ma senza protocollo - */ - + // Pratiche gestite ma senza protocollo count = DettPraticaLocalServiceUtil.countPraticheCompleteNotProtocollo(); - if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - - List dettPratiche = DettPraticaLocalServiceUtil - .findPraticheCompleteNotProtocollo(cursor, cursor + SIZE); - + List dettPratiche = DettPraticaLocalServiceUtil.findPraticheCompleteNotProtocollo( + cursor, cursor + SIZE); for (DettPratica dettPratica : dettPratiche) { - try { - User user = UserLocalServiceUtil.getUser(dettPratica.getUserId()); PrincipalThreadLocal.setName(user.getUserId()); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil - .create(user); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); - - protocollazione(dettPratica.getCompanyId(), dettPratica.getGroupId(), - dettPratica); - + protocollazione(dettPratica.getCompanyId(), dettPratica.getGroupId(), dettPratica); } catch (Exception e) { _log.error("Error DettPraticaId=" + dettPratica.getDettPraticaId(), e); } finally { @@ -130,33 +103,19 @@ public class SchedulerPratiche implements MessageListener { } } } - - /* - * Fine Lavori complete ma senza protocollo - */ - + // Fine Lavori complete ma senza protocollo count = FineLavoriLocalServiceUtil.countFineLavoriCompleteNotProtocollo(); - if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - - List fineLavoris = FineLavoriLocalServiceUtil - .findFineLavoriCompleteNotProtocollo(cursor, cursor + SIZE); - + List fineLavoris = FineLavoriLocalServiceUtil.findFineLavoriCompleteNotProtocollo( + cursor, cursor + SIZE); for (FineLavori fineLavori : fineLavoris) { - try { - User user = UserLocalServiceUtil.getUser(fineLavori.getUserId()); PrincipalThreadLocal.setName(user.getUserId()); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil - .create(user); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); - - protocollazione(fineLavori.getCompanyId(), fineLavori.getGroupId(), - fineLavori); - + protocollazione(fineLavori.getCompanyId(), fineLavori.getGroupId(), fineLavori); } catch (Exception e) { _log.error("Error fineLavoriId=" + fineLavori.getFineLavoriId(), e); } finally { @@ -166,36 +125,23 @@ public class SchedulerPratiche implements MessageListener { } } } - - /* - * Fine Lavori complete con protocollo non gestite - */ - + // Fine Lavori complete con protocollo non gestite count = FineLavoriLocalServiceUtil.countFineLavoriCompleteNotGestite(); - if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - - List fineLavoris = FineLavoriLocalServiceUtil - .findFineLavoriCompleteNotGestite(cursor, cursor + SIZE); - + List fineLavoris = FineLavoriLocalServiceUtil.findFineLavoriCompleteNotGestite( + cursor, cursor + SIZE); for (FineLavori fineLavori : fineLavoris) { - try { - User user = UserLocalServiceUtil.getUser(fineLavori.getUserId()); PrincipalThreadLocal.setName(user.getUserId()); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil - .create(user); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); creaAvvisoVidimazione(fineLavori.getCompanyId(), fineLavori.getGroupId(), fineLavori.getUserId(), fineLavori.getIntPraticaId(), fineLavori.getFineLavoriId(), FineLavori.class.getName()); - fineLavori.setGestita(true); FineLavoriLocalServiceUtil.updateFineLavori(fineLavori); - } catch (Exception e) { _log.error("Error", e); } finally { @@ -205,31 +151,19 @@ public class SchedulerPratiche implements MessageListener { } } } - /* - * Collaudi complete ma senza protocollo - */ - + // Collaudi complete ma senza protocollo count = CollaudoLocalServiceUtil.countCollaudiCompletiNotProtocollo(); - if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - - List collaudi = CollaudoLocalServiceUtil.findCollaudiCompletiNotProtocollo( - cursor, cursor + SIZE); - + List collaudi = CollaudoLocalServiceUtil.findCollaudiCompletiNotProtocollo(cursor, + cursor + SIZE); for (Collaudo collaudo : collaudi) { - try { - User user = UserLocalServiceUtil.getUser(collaudo.getUserId()); PrincipalThreadLocal.setName(user.getUserId()); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil - .create(user); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); - protocollazione(collaudo.getCompanyId(), collaudo.getGroupId(), collaudo); - } catch (Exception e) { _log.error("Error collaudoId=" + collaudo.getCollaudoId(), e); } finally { @@ -239,35 +173,23 @@ public class SchedulerPratiche implements MessageListener { } } } - /* - * Collaudi complete con protocollo non gestiti - */ - + // Collaudi complete con protocollo non gestiti count = CollaudoLocalServiceUtil.countCollaudiCompletiNotGestiti(); - if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - - List collaudi = CollaudoLocalServiceUtil.findCollaudiCompletiNotGestiti( - cursor, cursor + SIZE); - + List collaudi = CollaudoLocalServiceUtil.findCollaudiCompletiNotGestiti(cursor, + cursor + SIZE); for (Collaudo collaudo : collaudi) { - try { - User user = UserLocalServiceUtil.getUser(collaudo.getUserId()); PrincipalThreadLocal.setName(user.getUserId()); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil - .create(user); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); creaAvvisoVidimazione(collaudo.getCompanyId(), collaudo.getGroupId(), - collaudo.getUserId(), collaudo.getIntPraticaId(), - collaudo.getCollaudoId(), Collaudo.class.getName()); - + collaudo.getUserId(), collaudo.getIntPraticaId(), collaudo.getCollaudoId(), + Collaudo.class.getName()); collaudo.setGestita(true); CollaudoLocalServiceUtil.updateCollaudo(collaudo); - } catch (Exception e) { _log.error("Error", e); } finally { @@ -277,29 +199,19 @@ public class SchedulerPratiche implements MessageListener { } } } - // generazioni documenti e avvio workflow count = DettPraticaLocalServiceUtil.countPraticheCompleteNotGestite(); - if (count > 0) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - - List dettPratiche = DettPraticaLocalServiceUtil - .findPraticheCompleteNotGestite(cursor, cursor + SIZE); - + List dettPratiche = DettPraticaLocalServiceUtil.findPraticheCompleteNotGestite( + cursor, cursor + SIZE); for (DettPratica dettPratica : dettPratiche) { - try { - User user = UserLocalServiceUtil.getUser(dettPratica.getUserId()); PrincipalThreadLocal.setName(user.getUserId()); - PermissionChecker permissionChecker = PermissionCheckerFactoryUtil - .create(user); + PermissionChecker permissionChecker = PermissionCheckerFactoryUtil.create(user); PermissionThreadLocal.setPermissionChecker(permissionChecker); - gestionePratica(dettPratica); - } catch (Exception e) { _log.error("Error", e); } finally { @@ -309,29 +221,20 @@ public class SchedulerPratiche implements MessageListener { } } } - // versionamento count = DettPraticaLocalServiceUtil.countPraticheCompletateNonversionate(); - if (count > 0) { - for (Company company : CompanyLocalServiceUtil.getCompanies()) { - String condition = ConfigurazioneLocalServiceUtil.findByC_ChiaveString( - company.getCompanyId(), ConfigurazioneConstants.SCHEDULER_VERSIONING); + String condition = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(company.getCompanyId(), + ConfigurazioneConstants.SCHEDULER_VERSIONING); if (Boolean.parseBoolean(condition)) { - for (int cursor = 0; cursor <= count; cursor += SIZE) { - List dettPratiche = DettPraticaLocalServiceUtil .findPraticheCompletateNonVersionate(cursor, cursor + SIZE); - for (DettPratica dettPratica : dettPratiche) { - try { - - DettPraticaServiceUtil.sendToVersioning( - dettPratica.getDettPraticaId(), dettPratica.getCompanyId()); - + DettPraticaServiceUtil.sendToVersioning(dettPratica.getDettPraticaId(), + dettPratica.getCompanyId()); } catch (Exception e) { _log.error("Error", e); } finally { @@ -340,12 +243,9 @@ public class SchedulerPratiche implements MessageListener { } } } - } } - } - } catch (SystemException e) { _log.error("Error", e); } finally { @@ -354,8 +254,8 @@ public class SchedulerPratiche implements MessageListener { } } - private void creaAvvisoVidimazione(long companyId, long groupId, long userId, long intPraticaId, - long classPk, String className) throws SystemException, PortalException { + private void creaAvvisoVidimazione(long companyId, long groupId, long userId, long intPraticaId, long classPk, + String className) throws SystemException, PortalException { String descLong = StringPool.BLANK; Date dtAvviso = new Date(); String tipoAvviso = AvvisoUtil.TIPO_AVVISO_DIRETTO; @@ -371,24 +271,19 @@ public class SchedulerPratiche implements MessageListener { propertiesTemplateType = StatoPraticaConstants.VARIAZIONE_SOGGETTI; } } - String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get( - propertiesTemplateType); - long fileEntryIdTemplate = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, - propertiesTemplate); - - long controlloPraticaId = 0l; + String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get(propertiesTemplateType); + long fileEntryIdTemplate = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong(companyId, propertiesTemplate); + long controlloPraticaId = 0L; ServiceContext serviceContext = new ServiceContext(); serviceContext.setCompanyId(companyId); serviceContext.setScopeGroupId(groupId); serviceContext.setUserId(userId); - AvvisoLocalServiceUtil.addAvviso(intPraticaId, descLong, dtAvviso, tipoAvviso, tipoDocumento, fileEntryIdTemplate, classPk, className, controlloPraticaId, serviceContext); } private IntPratica assegnaNumeroProgetto(IntPratica intPratica) throws PortalException, SystemException { - // in caso di errore successivo alla protocollazione salto questa - // operazione + // in caso di errore successivo alla protocollazione salto questa operazione if (Validator.isNull(intPratica.getNumeroProgetto())) { intPratica = IntPraticaLocalServiceUtil.addNumeroProgetto(intPratica.getIntPraticaId()); @@ -399,31 +294,24 @@ public class SchedulerPratiche implements MessageListener { public void gestionePratica(DettPratica dettPratica) throws Exception { ServiceContext serviceContext = getServiceContext(dettPratica); - // protocollazione da servizio remoto protocollazione(serviceContext.getCompanyId(), serviceContext.getScopeGroupId(), dettPratica); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - intPratica = assegnaNumeroProgetto(intPratica); - String tipoIntegrazione = dettPratica.getTipoIntegrazione(); - // 1o Avviso di ricezione corretta o in errore della pratica int count = AvvisoLocalServiceUtil.countAvvisoByClassPk_ClassName(dettPratica.getDettPraticaId(), DettPratica.class.getName()); // in caso di errore non genere un nuovo avviso if (count == 0) { // tutte le integrazioni eccetto annulla valida - if (Validator.isNotNull(tipoIntegrazione)) { - if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(tipoIntegrazione)) { // avviso pilotato per integrazioni String stato = StatoPraticaConstants.INTEGRAZIONE_ACCETTATA; AvvisoLocalServiceUtil.createStandardAvvisoPratica(dettPratica.getIntPraticaId(), stato, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext, - AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, 0l); + AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, 0L); } else if (TipoIntegrazioneUtil.VARIANTE.equals(tipoIntegrazione)) { // avviso pilotato per varianti String stato = null; @@ -434,107 +322,81 @@ public class SchedulerPratiche implements MessageListener { } AvvisoLocalServiceUtil.createStandardAvvisoPratica(dettPratica.getIntPraticaId(), stato, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext, - AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, 0l); + AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, 0L); } else if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equals(tipoIntegrazione)) { - String propertiesTemplateType = StatoPraticaConstants.VARIAZIONE_SOGGETTI; String propertiesTemplate = AvvisoUtil.getAllTipoDocumentoFileTemplateProps().get( propertiesTemplateType); long fileEntryIdTemplate = ConfigurazioneLocalServiceUtil.findByC_ChiaveLong( serviceContext.getCompanyId(), propertiesTemplate); - - AvvisoLocalServiceUtil.addAvviso(dettPratica.getIntPraticaId(), StringPool.BLANK, - new Date(), AvvisoUtil.TIPO_AVVISO_DIRETTO, StatoPraticaConstants.VIDIMATA, - fileEntryIdTemplate, dettPratica.getDettPraticaId(), DettPratica.class.getName(), - 0l, serviceContext); + AvvisoLocalServiceUtil.addAvviso(dettPratica.getIntPraticaId(), StringPool.BLANK, new Date(), + AvvisoUtil.TIPO_AVVISO_DIRETTO, StatoPraticaConstants.VIDIMATA, fileEntryIdTemplate, + dettPratica.getDettPraticaId(), DettPratica.class.getName(), 0L, serviceContext); } - } else { // avviso standard da stato pratica - AvvisoLocalServiceUtil.createStandardAvvisoPratica(intPratica, - dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext, - AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, 0l); + AvvisoLocalServiceUtil.createStandardAvvisoPratica(intPratica, dettPratica.getDettPraticaId(), + DettPratica.class.getName(), serviceContext, AvvisoUtil.TIPO_AVVISO_DIRETTO, StringPool.BLANK, + 0L); } } - // Avvio Workflow if (!dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO) && !(dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE) && !dettPratica .getVarianteSostanziale())) { - ControlloPratica cp = avvioWorkflow(dettPratica, dettPratica.getUserId(), serviceContext); if (cp != null) ControlloPraticaLocalServiceUtil.gestioneWFVarianti(cp); } else { _log.info("Workflow non avviato"); } - - dettPratica = DettPraticaLocalServiceUtil.updateDettPraticaGestita(dettPratica.getDettPraticaId(), - true); - DettPraticaLocalServiceUtil.updateAsset(dettPratica, null, true); + dettPratica = DettPraticaLocalServiceUtil.updateDettPraticaGestita(dettPratica.getDettPraticaId(), true); } - private DettPratica protocollazione(long companyId, long groupId, DettPratica dettPratica) - throws Exception { + private DettPratica protocollazione(long companyId, long groupId, DettPratica dettPratica) throws Exception { - // in caso di errore successivo alla protocollazione salto questa - // operazione + // in caso di errore successivo alla protocollazione salto questa operazione if (Validator.isNull(dettPratica.getProtocollo())) { - String protocollo = null; - - String title = dettPratica.getDettPraticaId() + "_" + System.currentTimeMillis(); + String title = dettPratica.getDettPraticaId() + StringPool.UNDERLINE + System.currentTimeMillis(); protocollo = ProtocollazioneUtil.protocollaArrivo(dettPratica, title); if (Validator.isNull(protocollo)) { throw new Exception("errore nella protocollazione pratica"); } - - dettPratica = DettPraticaLocalServiceUtil.updateDettPraticaProtocollo( - dettPratica.getDettPraticaId(), protocollo); + dettPratica = DettPraticaLocalServiceUtil.updateDettPraticaProtocollo(dettPratica.getDettPraticaId(), + protocollo); } - return dettPratica; } private FineLavori protocollazione(long companyId, long groupId, FineLavori fineLavori) throws Exception { - // in caso di errore successivo alla protocollazione salto questa - // operazione + // in caso di errore successivo alla protocollazione salto questa operazione if (Validator.isNull(fineLavori.getProtocollo())) { - String protocollo = null; - - String title = fineLavori.getFineLavoriId() + "_" + System.currentTimeMillis(); + String title = fineLavori.getFineLavoriId() + StringPool.UNDERLINE + System.currentTimeMillis(); protocollo = ProtocollazioneUtil.protocollaArrivo(fineLavori, title); if (Validator.isNull(protocollo)) { throw new Exception("errore nella protocollazione fine lavori"); } - - fineLavori = FineLavoriLocalServiceUtil.updateFineLavoriProtocollo(fineLavori.getFineLavoriId(), - protocollo); + fineLavori = FineLavoriLocalServiceUtil + .updateFineLavoriProtocollo(fineLavori.getFineLavoriId(), protocollo); } - return fineLavori; } private Collaudo protocollazione(long companyId, long groupId, Collaudo collaudo) throws Exception { - // in caso di errore successivo alla protocollazione salto questa - // operazione + // in caso di errore successivo alla protocollazione salto questa operazione if (Validator.isNull(collaudo.getProtocollo())) { - String protocollo = null; - - String title = collaudo.getCollaudoId() + "_" + System.currentTimeMillis(); + String title = collaudo.getCollaudoId() + StringPool.UNDERLINE + System.currentTimeMillis(); protocollo = ProtocollazioneUtil.protocollaArrivo(collaudo, title); if (Validator.isNull(protocollo)) { throw new Exception("errore nella protocollazione collaudo"); } - - collaudo = CollaudoLocalServiceUtil - .updateCollaudoProtocollo(collaudo.getCollaudoId(), protocollo); + collaudo = CollaudoLocalServiceUtil.updateCollaudoProtocollo(collaudo.getCollaudoId(), protocollo); } - return collaudo; } @@ -546,9 +408,9 @@ public class SchedulerPratiche implements MessageListener { if (WorkflowUtil.needToStartWorkflow(dettPratica)) { boolean updateFlagControlloObbligatorio = true; // ADT: bug id=7 gestione workflow - ControlloPratica cp = ControlloPraticaLocalServiceUtil.addControlloPratica( - territorio.getGroupId(), userId, intPratica.getIntPraticaId(), - dettPratica.getDettPraticaId(), updateFlagControlloObbligatorio, serviceContext); + ControlloPratica cp = ControlloPraticaLocalServiceUtil.addControlloPratica(territorio.getGroupId(), + userId, intPratica.getIntPraticaId(), dettPratica.getDettPraticaId(), + updateFlagControlloObbligatorio, serviceContext); return cp; } } @@ -562,5 +424,4 @@ public class SchedulerPratiche implements MessageListener { serviceContext.setUserId(dettPratica.getUserId()); return serviceContext; } - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java index 04f46bb6..b559f9cf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/CollaudoLocalServiceClpInvoker.java @@ -268,10 +268,6 @@ public class CollaudoLocalServiceClpInvoker { _methodName224 = "countCollaudiCompletiNotGestiti"; _methodParameterTypes224 = new String[] { }; - - _methodName226 = "fetchByOldDettPraticaId"; - - _methodParameterTypes226 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -581,11 +577,6 @@ public class CollaudoLocalServiceClpInvoker { return CollaudoLocalServiceUtil.countCollaudiCompletiNotGestiti(); } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { - return CollaudoLocalServiceUtil.fetchByOldDettPraticaId(((Long)arguments[0]).longValue()); - } - throw new UnsupportedOperationException(); } @@ -687,6 +678,4 @@ public class CollaudoLocalServiceClpInvoker { private String[] _methodParameterTypes223; private String _methodName224; private String[] _methodParameterTypes224; - private String _methodName226; - private String[] _methodParameterTypes226; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java index c81b99c9..9c961dc2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/ControlloPraticaLocalServiceClpInvoker.java @@ -182,71 +182,61 @@ public class ControlloPraticaLocalServiceClpInvoker { "java.util.Map" }; - _methodName229 = "updateStatoPraticaGeneraDocumentoFinale"; + _methodName229 = "generaDocumentoFinale"; _methodParameterTypes229 = new String[] { "long", "java.lang.String", "long", "java.util.Map" }; - _methodName230 = "generaDocumentoFinale"; + _methodName230 = "updateIstruttore"; - _methodParameterTypes230 = new String[] { - "long", "java.lang.String", "long", "java.util.Map" - }; + _methodParameterTypes230 = new String[] { "long", "java.util.Map" }; - _methodName231 = "updateIstruttore"; + _methodName231 = "valutazioneEsitoFinaleUpdateStatoPratica"; _methodParameterTypes231 = new String[] { "long", "java.util.Map" }; - _methodName232 = "valutazioneEsitoFinale"; - - _methodParameterTypes232 = new String[] { "long", "java.util.Map" }; - - _methodName233 = "valutazioneEsitoFinaleUpdateStatoPratica"; + _methodName233 = "aggiornaStatoPerRichiestaIntegrazione"; _methodParameterTypes233 = new String[] { "long", "java.util.Map" }; - _methodName235 = "aggiornaStatoPerRichiestaIntegrazione"; - - _methodParameterTypes235 = new String[] { "long", "java.util.Map" }; - - _methodName236 = "getJsonListaIstruttori"; + _methodName234 = "getJsonListaIstruttori"; - _methodParameterTypes236 = new String[] { "long", "java.util.Map" }; + _methodParameterTypes234 = new String[] { "long", "java.util.Map" }; - _methodName237 = "getJsonEsitoPratica"; + _methodName235 = "getJsonEsitoPratica"; - _methodParameterTypes237 = new String[] { "long", "java.util.Map" }; + _methodParameterTypes235 = new String[] { "long", "java.util.Map" }; - _methodName240 = "addPraticheAlControllo"; + _methodName238 = "addPraticheAlControllo"; - _methodParameterTypes240 = new String[] { "long", "long" }; + _methodParameterTypes238 = new String[] { "long", "long" }; - _methodName241 = "addPraticheAlControlloVarianti"; + _methodName239 = "addPraticheAlControlloVarianti"; - _methodParameterTypes241 = new String[] { + _methodParameterTypes239 = new String[] { "long", "long", "com.liferay.portal.service.ServiceContext" }; - _methodName242 = "getReturnValueScriptIniziale"; + _methodName240 = "getReturnValueScriptIniziale"; - _methodParameterTypes242 = new String[] { "long" }; + _methodParameterTypes240 = new String[] { "long" }; - _methodName243 = "getTipoEsito"; + _methodName241 = "getTipoEsito"; - _methodParameterTypes243 = new String[] { "long" }; + _methodParameterTypes241 = new String[] { "long" }; - _methodName244 = "findByIntPratica"; + _methodName242 = "findByIntPratica"; - _methodParameterTypes244 = new String[] { "long" }; + _methodParameterTypes242 = new String[] { "long" }; - _methodName245 = "calculateDateAvvioProcedimento"; + _methodName243 = "calculateDateAvvioProcedimento"; - _methodParameterTypes245 = new String[] { "long" }; + _methodParameterTypes243 = new String[] { "long" }; - _methodName246 = "gestioneWFVarianti"; + _methodName244 = "gestioneWFVarianti"; - _methodParameterTypes246 = new String[] { + _methodParameterTypes244 = new String[] { "it.tref.liferay.portos.bo.model.ControlloPratica" }; } @@ -444,7 +434,7 @@ public class ControlloPraticaLocalServiceClpInvoker { if (_methodName229.equals(name) && Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.updateStatoPraticaGeneraDocumentoFinale(((Long)arguments[0]).longValue(), + return ControlloPraticaLocalServiceUtil.generaDocumentoFinale(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Long)arguments[2]).longValue(), (java.util.Map)arguments[3]); @@ -452,87 +442,73 @@ public class ControlloPraticaLocalServiceClpInvoker { if (_methodName230.equals(name) && Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.generaDocumentoFinale(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1], - ((Long)arguments[2]).longValue(), - (java.util.Map)arguments[3]); - } - - if (_methodName231.equals(name) && - Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { ControlloPraticaLocalServiceUtil.updateIstruttore(((Long)arguments[0]).longValue(), (java.util.Map)arguments[1]); return null; } - if (_methodName232.equals(name) && - Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.valutazioneEsitoFinale(((Long)arguments[0]).longValue(), + if (_methodName231.equals(name) && + Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { + return ControlloPraticaLocalServiceUtil.valutazioneEsitoFinaleUpdateStatoPratica(((Long)arguments[0]).longValue(), (java.util.Map)arguments[1]); } if (_methodName233.equals(name) && Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { - return ControlloPraticaLocalServiceUtil.valutazioneEsitoFinaleUpdateStatoPratica(((Long)arguments[0]).longValue(), - (java.util.Map)arguments[1]); - } - - if (_methodName235.equals(name) && - Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { ControlloPraticaLocalServiceUtil.aggiornaStatoPerRichiestaIntegrazione(((Long)arguments[0]).longValue(), (java.util.Map)arguments[1]); return null; } - if (_methodName236.equals(name) && - Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { + if (_methodName234.equals(name) && + Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { return ControlloPraticaLocalServiceUtil.getJsonListaIstruttori(((Long)arguments[0]).longValue(), (java.util.Map)arguments[1]); } - if (_methodName237.equals(name) && - Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { + if (_methodName235.equals(name) && + Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { return ControlloPraticaLocalServiceUtil.getJsonEsitoPratica(((Long)arguments[0]).longValue(), (java.util.Map)arguments[1]); } - if (_methodName240.equals(name) && - Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { + if (_methodName238.equals(name) && + Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { return ControlloPraticaLocalServiceUtil.addPraticheAlControllo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName241.equals(name) && - Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { + if (_methodName239.equals(name) && + Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { return ControlloPraticaLocalServiceUtil.addPraticheAlControlloVarianti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (com.liferay.portal.service.ServiceContext)arguments[2]); } - if (_methodName242.equals(name) && - Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { + if (_methodName240.equals(name) && + Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { return ControlloPraticaLocalServiceUtil.getReturnValueScriptIniziale(((Long)arguments[0]).longValue()); } - if (_methodName243.equals(name) && - Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { + if (_methodName241.equals(name) && + Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { return ControlloPraticaLocalServiceUtil.getTipoEsito(((Long)arguments[0]).longValue()); } - if (_methodName244.equals(name) && - Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { + if (_methodName242.equals(name) && + Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { return ControlloPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName245.equals(name) && - Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { + if (_methodName243.equals(name) && + Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { return ControlloPraticaLocalServiceUtil.calculateDateAvvioProcedimento(((Long)arguments[0]).longValue()); } - if (_methodName246.equals(name) && - Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { + if (_methodName244.equals(name) && + Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { ControlloPraticaLocalServiceUtil.gestioneWFVarianti((it.tref.liferay.portos.bo.model.ControlloPratica)arguments[0]); return null; @@ -609,16 +585,16 @@ public class ControlloPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes230; private String _methodName231; private String[] _methodParameterTypes231; - private String _methodName232; - private String[] _methodParameterTypes232; private String _methodName233; private String[] _methodParameterTypes233; + private String _methodName234; + private String[] _methodParameterTypes234; private String _methodName235; private String[] _methodParameterTypes235; - private String _methodName236; - private String[] _methodParameterTypes236; - private String _methodName237; - private String[] _methodParameterTypes237; + private String _methodName238; + private String[] _methodParameterTypes238; + private String _methodName239; + private String[] _methodParameterTypes239; private String _methodName240; private String[] _methodParameterTypes240; private String _methodName241; @@ -629,8 +605,4 @@ public class ControlloPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes243; private String _methodName244; private String[] _methodParameterTypes244; - private String _methodName245; - private String[] _methodParameterTypes245; - private String _methodName246; - private String[] _methodParameterTypes246; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java index 2d5ca6da..faed9f2f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaLocalServiceClpInvoker.java @@ -206,60 +206,56 @@ public class DettPraticaLocalServiceClpInvoker { _methodParameterTypes243 = new String[] { "long" }; - _methodName244 = "getByOldDettPraticaId"; + _methodName244 = "search"; - _methodParameterTypes244 = new String[] { "long" }; - - _methodName245 = "search"; - - _methodParameterTypes245 = new String[] { + _methodParameterTypes244 = new String[] { "com.liferay.portal.kernel.search.SearchContext" }; - _methodName246 = "searchCount"; + _methodName245 = "searchCount"; - _methodParameterTypes246 = new String[] { + _methodParameterTypes245 = new String[] { "com.liferay.portal.kernel.search.SearchContext" }; - _methodName247 = "updateDettPraticaSoggetti"; + _methodName246 = "updateDettPraticaSoggetti"; - _methodParameterTypes247 = new String[] { + _methodParameterTypes246 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName248 = "updateDettPratica"; + _methodName247 = "updateDettPratica"; - _methodParameterTypes248 = new String[] { + _methodParameterTypes247 = new String[] { "long", "long", "long", "long", "java.lang.String", "java.lang.String", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.util.Date", "int", "boolean", "long", - "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "long", "long", - "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "boolean", "java.util.Date", "java.util.Date", - "java.util.Date", "java.lang.String", "boolean", "long", "int", + "java.lang.String", "long", "long", "boolean", "boolean", + "boolean", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "java.util.Date", "java.util.Date", "java.util.Date", + "java.lang.String", "boolean", "long", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -267,32 +263,32 @@ public class DettPraticaLocalServiceClpInvoker { "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.util.Date", - "java.lang.Double", "java.lang.Double", "java.lang.Double", + "java.util.Date", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", - "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "java.lang.Double", "java.lang.String", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "java.lang.String", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", - "java.lang.String", "com.liferay.portal.service.ServiceContext", - "boolean", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.Boolean", - "java.lang.Boolean", "java.lang.Boolean", "java.lang.String", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "java.lang.String", + "com.liferay.portal.service.ServiceContext", "boolean", + "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.Boolean", "java.lang.Boolean", + "java.lang.Boolean", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "double", "java.lang.String" + "boolean", "double", "java.lang.String" }; - _methodName249 = "updateDettPraticaDatiDomanda"; + _methodName248 = "updateDettPraticaDatiDomanda"; - _methodParameterTypes249 = new String[] { + _methodParameterTypes248 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -332,9 +328,9 @@ public class DettPraticaLocalServiceClpInvoker { "boolean", "java.lang.String" }; - _methodName250 = "updateDettPraticaDatiIntegrazione"; + _methodName249 = "updateDettPraticaDatiIntegrazione"; - _methodParameterTypes250 = new String[] { + _methodParameterTypes249 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", @@ -358,9 +354,9 @@ public class DettPraticaLocalServiceClpInvoker { "boolean", "boolean", "boolean", "java.lang.String" }; - _methodName252 = "updateDettPraticaGeologo"; + _methodName250 = "updateDettPraticaGeologo"; - _methodParameterTypes252 = new String[] { + _methodParameterTypes250 = new String[] { "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -372,9 +368,9 @@ public class DettPraticaLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext", "boolean" }; - _methodName253 = "updateDettPraticaPagamento"; + _methodName251 = "updateDettPraticaPagamento"; - _methodParameterTypes253 = new String[] { + _methodParameterTypes251 = new String[] { "long", "java.lang.String", "java.lang.String", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", @@ -384,39 +380,39 @@ public class DettPraticaLocalServiceClpInvoker { "java.lang.Double", "com.liferay.portal.service.ServiceContext" }; - _methodName254 = "updateCheckPagamenti"; + _methodName252 = "updateCheckPagamenti"; - _methodParameterTypes254 = new String[] { "long", "boolean", "boolean" }; + _methodParameterTypes252 = new String[] { "long", "boolean", "boolean" }; - _methodName255 = "updateEsitoPagamento"; + _methodName253 = "updateEsitoPagamento"; - _methodParameterTypes255 = new String[] { + _methodParameterTypes253 = new String[] { "long", "long", "java.lang.String" }; - _methodName256 = "updateEsitoPagamento"; + _methodName254 = "updateEsitoPagamento"; - _methodParameterTypes256 = new String[] { + _methodParameterTypes254 = new String[] { "long", "long", "long", "java.lang.String" }; - _methodName257 = "isControlloObbligatorio"; + _methodName255 = "isControlloObbligatorio"; - _methodParameterTypes257 = new String[] { + _methodParameterTypes255 = new String[] { "it.tref.liferay.portos.bo.model.DettPratica" }; - _methodName258 = "updateEsito"; + _methodName256 = "updateEsito"; - _methodParameterTypes258 = new String[] { "long", "int" }; + _methodParameterTypes256 = new String[] { "long", "int" }; - _methodName260 = "updateEsitoIntegrazione"; + _methodName258 = "updateEsitoIntegrazione"; - _methodParameterTypes260 = new String[] { "long", "int" }; + _methodParameterTypes258 = new String[] { "long", "int" }; - _methodName261 = "pagaInvia"; + _methodName259 = "pagaInvia"; - _methodParameterTypes261 = new String[] { + _methodParameterTypes259 = new String[] { "long", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", @@ -427,149 +423,138 @@ public class DettPraticaLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext" }; - _methodName264 = "updateStatus"; + _methodName261 = "updateStatus"; - _methodParameterTypes264 = new String[] { + _methodParameterTypes261 = new String[] { "long", "long", "int", "com.liferay.portal.service.ServiceContext" }; - _methodName267 = "updateDettPraticaProtocollo"; + _methodName264 = "updateDettPraticaProtocollo"; - _methodParameterTypes267 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes264 = new String[] { "long", "java.lang.String" }; - _methodName268 = "findByProtocollo"; + _methodName265 = "findByProtocollo"; - _methodParameterTypes268 = new String[] { + _methodParameterTypes265 = new String[] { "long", "long", "java.lang.String" }; - _methodName269 = "fetchByProtocollo"; + _methodName266 = "fetchByProtocollo"; - _methodParameterTypes269 = new String[] { + _methodParameterTypes266 = new String[] { "long", "long", "java.lang.String" }; - _methodName270 = "fetchByProtocollo"; + _methodName267 = "fetchByProtocollo"; - _methodParameterTypes270 = new String[] { "java.lang.String" }; + _methodParameterTypes267 = new String[] { "java.lang.String" }; - _methodName271 = "findByIntPraticaId"; + _methodName268 = "findByIntPraticaId"; - _methodParameterTypes271 = new String[] { "long" }; + _methodParameterTypes268 = new String[] { "long" }; - _methodName272 = "findByIntPraticaIdInviate"; + _methodName269 = "findByIntPraticaIdInviate"; - _methodParameterTypes272 = new String[] { "long", "int", "int" }; + _methodParameterTypes269 = new String[] { "long", "int", "int" }; - _methodName273 = "findPraticheCompleteNotProtocollo"; + _methodName270 = "findPraticheCompleteNotProtocollo"; - _methodParameterTypes273 = new String[] { "int", "int" }; + _methodParameterTypes270 = new String[] { "int", "int" }; - _methodName274 = "countPraticheCompleteNotProtocollo"; + _methodName271 = "countPraticheCompleteNotProtocollo"; - _methodParameterTypes274 = new String[] { }; + _methodParameterTypes271 = new String[] { }; - _methodName276 = "findPraticheCompleteNotGestite"; + _methodName273 = "findPraticheCompleteNotGestite"; - _methodParameterTypes276 = new String[] { "int", "int" }; + _methodParameterTypes273 = new String[] { "int", "int" }; - _methodName277 = "countPraticheCompleteNotGestite"; + _methodName274 = "countPraticheCompleteNotGestite"; - _methodParameterTypes277 = new String[] { }; + _methodParameterTypes274 = new String[] { }; - _methodName279 = "findByIntPraticaId_TipoIntegrazione_Completa"; + _methodName276 = "findByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes279 = new String[] { + _methodParameterTypes276 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName280 = "countByIntPraticaId_TipoIntegrazione_Completa"; + _methodName277 = "countByIntPraticaId_TipoIntegrazione_Completa"; - _methodParameterTypes280 = new String[] { + _methodParameterTypes277 = new String[] { "long", "java.lang.String", "boolean" }; - _methodName281 = "findPraticheCompletateNonVersionate"; + _methodName278 = "findPraticheCompletateNonVersionate"; - _methodParameterTypes281 = new String[] { "int", "int" }; + _methodParameterTypes278 = new String[] { "int", "int" }; - _methodName282 = "countPraticheCompletateNonversionate"; + _methodName279 = "countPraticheCompletateNonversionate"; - _methodParameterTypes282 = new String[] { }; + _methodParameterTypes279 = new String[] { }; - _methodName284 = "updateDettPraticaGestita"; + _methodName281 = "updateDettPraticaGestita"; - _methodParameterTypes284 = new String[] { "long", "boolean" }; + _methodParameterTypes281 = new String[] { "long", "boolean" }; - _methodName285 = "updateAsset"; + _methodName282 = "updateStatus"; - _methodParameterTypes285 = new String[] { - "it.tref.liferay.portos.bo.model.DettPratica", "long[][]", - "boolean" - }; + _methodParameterTypes282 = new String[] { "long", "int" }; - _methodName286 = "updateStatus"; + _methodName283 = "updateSignal"; - _methodParameterTypes286 = new String[] { "long", "int" }; + _methodParameterTypes283 = new String[] { "long", "java.util.Date" }; - _methodName287 = "updateSignal"; + _methodName284 = "countInvioSignal"; - _methodParameterTypes287 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes284 = new String[] { }; - _methodName288 = "countInvioSignal"; + _methodName285 = "getInvioSignal"; - _methodParameterTypes288 = new String[] { }; + _methodParameterTypes285 = new String[] { "long" }; - _methodName289 = "getInvioSignal"; + _methodName286 = "getInviiSignal"; - _methodParameterTypes289 = new String[] { "long" }; + _methodParameterTypes286 = new String[] { "int", "int" }; - _methodName290 = "getInviiSignal"; + _methodName287 = "dynamicQueryInvioSignal"; - _methodParameterTypes290 = new String[] { "int", "int" }; + _methodParameterTypes287 = new String[] { "java.lang.Long" }; - _methodName291 = "dynamicQueryInvioSignal"; + _methodName288 = "findByPagamentoId"; - _methodParameterTypes291 = new String[] { "java.lang.Long" }; + _methodParameterTypes288 = new String[] { "long" }; - _methodName292 = "findByPagamentoId"; + _methodName289 = "updatePrincipale"; - _methodParameterTypes292 = new String[] { "long" }; - - _methodName293 = "updatePrincipale"; - - _methodParameterTypes293 = new String[] { + _methodParameterTypes289 = new String[] { "long", "java.lang.String", "java.lang.String" }; - _methodName294 = "sendToVersioning"; - - _methodParameterTypes294 = new String[] { "long", "java.lang.String" }; - - _methodName295 = "getNumeroDiVersioni"; + _methodName290 = "sendToVersioning"; - _methodParameterTypes295 = new String[] { "java.lang.String" }; + _methodParameterTypes290 = new String[] { "long", "java.lang.String" }; - _methodName296 = "getVersionNumber"; + _methodName291 = "getNumeroDiVersioni"; - _methodParameterTypes296 = new String[] { "java.lang.String", "int" }; + _methodParameterTypes291 = new String[] { "java.lang.String" }; - _methodName298 = "callForChanges"; + _methodName292 = "getVersionNumber"; - _methodParameterTypes298 = new String[] { "java.lang.String" }; + _methodParameterTypes292 = new String[] { "java.lang.String", "int" }; - _methodName299 = "fetchByOldDettPraticaId"; + _methodName294 = "callForChanges"; - _methodParameterTypes299 = new String[] { "long" }; + _methodParameterTypes294 = new String[] { "java.lang.String" }; - _methodName300 = "countVariateByIntPratica"; + _methodName295 = "countVariateByIntPratica"; - _methodParameterTypes300 = new String[] { "long" }; + _methodParameterTypes295 = new String[] { "long" }; - _methodName301 = "getFirstCompletedByIntPratica"; + _methodName296 = "getFirstCompletedByIntPratica"; - _methodParameterTypes301 = new String[] { "long" }; + _methodParameterTypes296 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -792,21 +777,16 @@ public class DettPraticaLocalServiceClpInvoker { if (_methodName244.equals(name) && Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { - return DettPraticaLocalServiceUtil.getByOldDettPraticaId(((Long)arguments[0]).longValue()); + return DettPraticaLocalServiceUtil.search((com.liferay.portal.kernel.search.SearchContext)arguments[0]); } if (_methodName245.equals(name) && Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { - return DettPraticaLocalServiceUtil.search((com.liferay.portal.kernel.search.SearchContext)arguments[0]); + return DettPraticaLocalServiceUtil.searchCount((com.liferay.portal.kernel.search.SearchContext)arguments[0]); } if (_methodName246.equals(name) && Arrays.deepEquals(_methodParameterTypes246, parameterTypes)) { - return DettPraticaLocalServiceUtil.searchCount((com.liferay.portal.kernel.search.SearchContext)arguments[0]); - } - - if (_methodName247.equals(name) && - Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaSoggetti(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), @@ -815,8 +795,8 @@ public class DettPraticaLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[6]); } - if (_methodName248.equals(name) && - Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) { + if (_methodName247.equals(name) && + Arrays.deepEquals(_methodParameterTypes247, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPratica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), @@ -831,30 +811,30 @@ public class DettPraticaLocalServiceClpInvoker { ((Integer)arguments[14]).intValue(), ((Boolean)arguments[15]).booleanValue(), ((Long)arguments[16]).longValue(), - ((Long)arguments[17]).longValue(), + (java.lang.String)arguments[17], (java.lang.String)arguments[18], (java.lang.String)arguments[19], (java.lang.String)arguments[20], (java.lang.String)arguments[21], (java.lang.String)arguments[22], (java.lang.String)arguments[23], - (java.lang.String)arguments[24], + ((Long)arguments[24]).longValue(), ((Long)arguments[25]).longValue(), - ((Long)arguments[26]).longValue(), + ((Boolean)arguments[26]).booleanValue(), ((Boolean)arguments[27]).booleanValue(), ((Boolean)arguments[28]).booleanValue(), - ((Boolean)arguments[29]).booleanValue(), + (java.lang.String)arguments[29], (java.lang.String)arguments[30], (java.lang.String)arguments[31], (java.lang.String)arguments[32], - (java.lang.String)arguments[33], + ((Boolean)arguments[33]).booleanValue(), ((Boolean)arguments[34]).booleanValue(), - ((Boolean)arguments[35]).booleanValue(), - (java.util.Date)arguments[36], (java.util.Date)arguments[37], - (java.util.Date)arguments[38], (java.lang.String)arguments[39], - ((Boolean)arguments[40]).booleanValue(), - ((Long)arguments[41]).longValue(), - ((Integer)arguments[42]).intValue(), + (java.util.Date)arguments[35], (java.util.Date)arguments[36], + (java.util.Date)arguments[37], (java.lang.String)arguments[38], + ((Boolean)arguments[39]).booleanValue(), + ((Long)arguments[40]).longValue(), + ((Integer)arguments[41]).intValue(), + (java.lang.String)arguments[42], (java.lang.String)arguments[43], (java.lang.String)arguments[44], (java.lang.String)arguments[45], @@ -869,7 +849,7 @@ public class DettPraticaLocalServiceClpInvoker { (java.lang.String)arguments[54], (java.lang.String)arguments[55], (java.lang.String)arguments[56], - (java.lang.String)arguments[57], + ((Boolean)arguments[57]).booleanValue(), ((Boolean)arguments[58]).booleanValue(), ((Boolean)arguments[59]).booleanValue(), ((Boolean)arguments[60]).booleanValue(), @@ -880,31 +860,31 @@ public class DettPraticaLocalServiceClpInvoker { ((Boolean)arguments[65]).booleanValue(), ((Boolean)arguments[66]).booleanValue(), ((Boolean)arguments[67]).booleanValue(), - ((Boolean)arguments[68]).booleanValue(), + (java.lang.String)arguments[68], (java.lang.String)arguments[69], - (java.lang.String)arguments[70], + ((Boolean)arguments[70]).booleanValue(), ((Boolean)arguments[71]).booleanValue(), ((Boolean)arguments[72]).booleanValue(), ((Boolean)arguments[73]).booleanValue(), - ((Boolean)arguments[74]).booleanValue(), + (java.lang.String)arguments[74], (java.lang.String)arguments[75], (java.lang.String)arguments[76], - (java.lang.String)arguments[77], + ((Boolean)arguments[77]).booleanValue(), ((Boolean)arguments[78]).booleanValue(), ((Boolean)arguments[79]).booleanValue(), ((Boolean)arguments[80]).booleanValue(), ((Boolean)arguments[81]).booleanValue(), ((Boolean)arguments[82]).booleanValue(), - ((Boolean)arguments[83]).booleanValue(), - (java.lang.String)arguments[84], + (java.lang.String)arguments[83], + ((Boolean)arguments[84]).booleanValue(), ((Boolean)arguments[85]).booleanValue(), ((Boolean)arguments[86]).booleanValue(), ((Boolean)arguments[87]).booleanValue(), ((Boolean)arguments[88]).booleanValue(), ((Boolean)arguments[89]).booleanValue(), - ((Boolean)arguments[90]).booleanValue(), + (java.lang.String)arguments[90], (java.lang.String)arguments[91], - (java.lang.String)arguments[92], + ((Boolean)arguments[92]).booleanValue(), ((Boolean)arguments[93]).booleanValue(), ((Boolean)arguments[94]).booleanValue(), ((Boolean)arguments[95]).booleanValue(), @@ -912,14 +892,14 @@ public class DettPraticaLocalServiceClpInvoker { ((Boolean)arguments[97]).booleanValue(), ((Boolean)arguments[98]).booleanValue(), ((Boolean)arguments[99]).booleanValue(), - ((Boolean)arguments[100]).booleanValue(), - (java.lang.String)arguments[101], + (java.lang.String)arguments[100], + ((Boolean)arguments[101]).booleanValue(), ((Boolean)arguments[102]).booleanValue(), ((Boolean)arguments[103]).booleanValue(), ((Boolean)arguments[104]).booleanValue(), ((Boolean)arguments[105]).booleanValue(), - ((Boolean)arguments[106]).booleanValue(), - (java.lang.String)arguments[107], + (java.lang.String)arguments[106], + ((Boolean)arguments[107]).booleanValue(), ((Boolean)arguments[108]).booleanValue(), ((Boolean)arguments[109]).booleanValue(), ((Boolean)arguments[110]).booleanValue(), @@ -928,7 +908,7 @@ public class DettPraticaLocalServiceClpInvoker { ((Boolean)arguments[113]).booleanValue(), ((Boolean)arguments[114]).booleanValue(), ((Boolean)arguments[115]).booleanValue(), - ((Boolean)arguments[116]).booleanValue(), + (java.lang.String)arguments[116], (java.lang.String)arguments[117], (java.lang.String)arguments[118], (java.lang.String)arguments[119], @@ -951,8 +931,8 @@ public class DettPraticaLocalServiceClpInvoker { (java.lang.String)arguments[136], (java.lang.String)arguments[137], (java.lang.String)arguments[138], - (java.lang.String)arguments[139], - (java.util.Date)arguments[140], + (java.util.Date)arguments[139], + (java.lang.Double)arguments[140], (java.lang.Double)arguments[141], (java.lang.Double)arguments[142], (java.lang.Double)arguments[143], @@ -967,10 +947,10 @@ public class DettPraticaLocalServiceClpInvoker { (java.lang.Double)arguments[152], (java.lang.Double)arguments[153], (java.lang.Double)arguments[154], - (java.lang.Double)arguments[155], + (java.lang.String)arguments[155], (java.lang.String)arguments[156], (java.lang.String)arguments[157], - (java.lang.String)arguments[158], + ((Boolean)arguments[158]).booleanValue(), ((Boolean)arguments[159]).booleanValue(), ((Boolean)arguments[160]).booleanValue(), ((Boolean)arguments[161]).booleanValue(), @@ -985,8 +965,8 @@ public class DettPraticaLocalServiceClpInvoker { ((Boolean)arguments[170]).booleanValue(), ((Boolean)arguments[171]).booleanValue(), ((Boolean)arguments[172]).booleanValue(), - ((Boolean)arguments[173]).booleanValue(), - (java.lang.String)arguments[174], + (java.lang.String)arguments[173], + ((Boolean)arguments[174]).booleanValue(), ((Boolean)arguments[175]).booleanValue(), ((Boolean)arguments[176]).booleanValue(), ((Boolean)arguments[177]).booleanValue(), @@ -1010,21 +990,21 @@ public class DettPraticaLocalServiceClpInvoker { ((Boolean)arguments[195]).booleanValue(), ((Boolean)arguments[196]).booleanValue(), ((Boolean)arguments[197]).booleanValue(), - ((Boolean)arguments[198]).booleanValue(), + (java.lang.String)arguments[198], (java.lang.String)arguments[199], - (java.lang.String)arguments[200], - ((Boolean)arguments[201]).booleanValue(), - (java.lang.String)arguments[202], - (com.liferay.portal.service.ServiceContext)arguments[203], - ((Boolean)arguments[204]).booleanValue(), + ((Boolean)arguments[200]).booleanValue(), + (java.lang.String)arguments[201], + (com.liferay.portal.service.ServiceContext)arguments[202], + ((Boolean)arguments[203]).booleanValue(), + (java.lang.String)arguments[204], (java.lang.String)arguments[205], (java.lang.String)arguments[206], (java.lang.String)arguments[207], - (java.lang.String)arguments[208], + (java.lang.Boolean)arguments[208], (java.lang.Boolean)arguments[209], (java.lang.Boolean)arguments[210], - (java.lang.Boolean)arguments[211], - (java.lang.String)arguments[212], + (java.lang.String)arguments[211], + ((Boolean)arguments[212]).booleanValue(), ((Boolean)arguments[213]).booleanValue(), ((Boolean)arguments[214]).booleanValue(), ((Boolean)arguments[215]).booleanValue(), @@ -1033,13 +1013,12 @@ public class DettPraticaLocalServiceClpInvoker { ((Boolean)arguments[218]).booleanValue(), ((Boolean)arguments[219]).booleanValue(), ((Boolean)arguments[220]).booleanValue(), - ((Boolean)arguments[221]).booleanValue(), - ((Double)arguments[222]).doubleValue(), - (java.lang.String)arguments[223]); + ((Double)arguments[221]).doubleValue(), + (java.lang.String)arguments[222]); } - if (_methodName249.equals(name) && - Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) { + if (_methodName248.equals(name) && + Arrays.deepEquals(_methodParameterTypes248, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaDatiDomanda(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), @@ -1200,8 +1179,8 @@ public class DettPraticaLocalServiceClpInvoker { (java.lang.String)arguments[160]); } - if (_methodName250.equals(name) && - Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { + if (_methodName249.equals(name) && + Arrays.deepEquals(_methodParameterTypes249, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaDatiIntegrazione(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), @@ -1299,8 +1278,8 @@ public class DettPraticaLocalServiceClpInvoker { (java.lang.String)arguments[96]); } - if (_methodName252.equals(name) && - Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) { + if (_methodName250.equals(name) && + Arrays.deepEquals(_methodParameterTypes250, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaGeologo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), @@ -1327,8 +1306,8 @@ public class DettPraticaLocalServiceClpInvoker { ((Boolean)arguments[27]).booleanValue()); } - if (_methodName253.equals(name) && - Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { + if (_methodName251.equals(name) && + Arrays.deepEquals(_methodParameterTypes251, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaPagamento(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], (java.lang.Double)arguments[3], (java.lang.Double)arguments[4], @@ -1347,49 +1326,45 @@ public class DettPraticaLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[19]); } - if (_methodName254.equals(name) && - Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { + if (_methodName252.equals(name) && + Arrays.deepEquals(_methodParameterTypes252, parameterTypes)) { return DettPraticaLocalServiceUtil.updateCheckPagamenti(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue(), ((Boolean)arguments[2]).booleanValue()); } - if (_methodName255.equals(name) && - Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { - DettPraticaLocalServiceUtil.updateEsitoPagamento(((Long)arguments[0]).longValue(), + if (_methodName253.equals(name) && + Arrays.deepEquals(_methodParameterTypes253, parameterTypes)) { + return DettPraticaLocalServiceUtil.updateEsitoPagamento(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); - - return null; } - if (_methodName256.equals(name) && - Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { - DettPraticaLocalServiceUtil.updateEsitoPagamento(((Long)arguments[0]).longValue(), + if (_methodName254.equals(name) && + Arrays.deepEquals(_methodParameterTypes254, parameterTypes)) { + return DettPraticaLocalServiceUtil.updateEsitoPagamento(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), (java.lang.String)arguments[3]); - - return null; } - if (_methodName257.equals(name) && - Arrays.deepEquals(_methodParameterTypes257, parameterTypes)) { + if (_methodName255.equals(name) && + Arrays.deepEquals(_methodParameterTypes255, parameterTypes)) { return DettPraticaLocalServiceUtil.isControlloObbligatorio((it.tref.liferay.portos.bo.model.DettPratica)arguments[0]); } - if (_methodName258.equals(name) && - Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) { + if (_methodName256.equals(name) && + Arrays.deepEquals(_methodParameterTypes256, parameterTypes)) { return DettPraticaLocalServiceUtil.updateEsito(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName260.equals(name) && - Arrays.deepEquals(_methodParameterTypes260, parameterTypes)) { + if (_methodName258.equals(name) && + Arrays.deepEquals(_methodParameterTypes258, parameterTypes)) { return DettPraticaLocalServiceUtil.updateEsitoIntegrazione(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName261.equals(name) && - Arrays.deepEquals(_methodParameterTypes261, parameterTypes)) { + if (_methodName259.equals(name) && + Arrays.deepEquals(_methodParameterTypes259, parameterTypes)) { return DettPraticaLocalServiceUtil.pagaInvia(((Long)arguments[0]).longValue(), (java.lang.Double)arguments[1], (java.lang.Double)arguments[2], (java.lang.Double)arguments[3], (java.lang.Double)arguments[4], @@ -1409,192 +1384,177 @@ public class DettPraticaLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[20]); } - if (_methodName264.equals(name) && - Arrays.deepEquals(_methodParameterTypes264, parameterTypes)) { + if (_methodName261.equals(name) && + Arrays.deepEquals(_methodParameterTypes261, parameterTypes)) { return DettPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), (com.liferay.portal.service.ServiceContext)arguments[3]); } - if (_methodName267.equals(name) && - Arrays.deepEquals(_methodParameterTypes267, parameterTypes)) { + if (_methodName264.equals(name) && + Arrays.deepEquals(_methodParameterTypes264, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaProtocollo(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName268.equals(name) && - Arrays.deepEquals(_methodParameterTypes268, parameterTypes)) { + if (_methodName265.equals(name) && + Arrays.deepEquals(_methodParameterTypes265, parameterTypes)) { return DettPraticaLocalServiceUtil.findByProtocollo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); } - if (_methodName269.equals(name) && - Arrays.deepEquals(_methodParameterTypes269, parameterTypes)) { + if (_methodName266.equals(name) && + Arrays.deepEquals(_methodParameterTypes266, parameterTypes)) { return DettPraticaLocalServiceUtil.fetchByProtocollo(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2]); } - if (_methodName270.equals(name) && - Arrays.deepEquals(_methodParameterTypes270, parameterTypes)) { + if (_methodName267.equals(name) && + Arrays.deepEquals(_methodParameterTypes267, parameterTypes)) { return DettPraticaLocalServiceUtil.fetchByProtocollo((java.lang.String)arguments[0]); } - if (_methodName271.equals(name) && - Arrays.deepEquals(_methodParameterTypes271, parameterTypes)) { + if (_methodName268.equals(name) && + Arrays.deepEquals(_methodParameterTypes268, parameterTypes)) { return DettPraticaLocalServiceUtil.findByIntPraticaId(((Long)arguments[0]).longValue()); } - if (_methodName272.equals(name) && - Arrays.deepEquals(_methodParameterTypes272, parameterTypes)) { + if (_methodName269.equals(name) && + Arrays.deepEquals(_methodParameterTypes269, parameterTypes)) { return DettPraticaLocalServiceUtil.findByIntPraticaIdInviate(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName273.equals(name) && - Arrays.deepEquals(_methodParameterTypes273, parameterTypes)) { + if (_methodName270.equals(name) && + Arrays.deepEquals(_methodParameterTypes270, parameterTypes)) { return DettPraticaLocalServiceUtil.findPraticheCompleteNotProtocollo(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName274.equals(name) && - Arrays.deepEquals(_methodParameterTypes274, parameterTypes)) { + if (_methodName271.equals(name) && + Arrays.deepEquals(_methodParameterTypes271, parameterTypes)) { return DettPraticaLocalServiceUtil.countPraticheCompleteNotProtocollo(); } - if (_methodName276.equals(name) && - Arrays.deepEquals(_methodParameterTypes276, parameterTypes)) { + if (_methodName273.equals(name) && + Arrays.deepEquals(_methodParameterTypes273, parameterTypes)) { return DettPraticaLocalServiceUtil.findPraticheCompleteNotGestite(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName277.equals(name) && - Arrays.deepEquals(_methodParameterTypes277, parameterTypes)) { + if (_methodName274.equals(name) && + Arrays.deepEquals(_methodParameterTypes274, parameterTypes)) { return DettPraticaLocalServiceUtil.countPraticheCompleteNotGestite(); } - if (_methodName279.equals(name) && - Arrays.deepEquals(_methodParameterTypes279, parameterTypes)) { + if (_methodName276.equals(name) && + Arrays.deepEquals(_methodParameterTypes276, parameterTypes)) { return DettPraticaLocalServiceUtil.findByIntPraticaId_TipoIntegrazione_Completa(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Boolean)arguments[2]).booleanValue()); } - if (_methodName280.equals(name) && - Arrays.deepEquals(_methodParameterTypes280, parameterTypes)) { + if (_methodName277.equals(name) && + Arrays.deepEquals(_methodParameterTypes277, parameterTypes)) { return DettPraticaLocalServiceUtil.countByIntPraticaId_TipoIntegrazione_Completa(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Boolean)arguments[2]).booleanValue()); } - if (_methodName281.equals(name) && - Arrays.deepEquals(_methodParameterTypes281, parameterTypes)) { + if (_methodName278.equals(name) && + Arrays.deepEquals(_methodParameterTypes278, parameterTypes)) { return DettPraticaLocalServiceUtil.findPraticheCompletateNonVersionate(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName282.equals(name) && - Arrays.deepEquals(_methodParameterTypes282, parameterTypes)) { + if (_methodName279.equals(name) && + Arrays.deepEquals(_methodParameterTypes279, parameterTypes)) { return DettPraticaLocalServiceUtil.countPraticheCompletateNonversionate(); } - if (_methodName284.equals(name) && - Arrays.deepEquals(_methodParameterTypes284, parameterTypes)) { + if (_methodName281.equals(name) && + Arrays.deepEquals(_methodParameterTypes281, parameterTypes)) { return DettPraticaLocalServiceUtil.updateDettPraticaGestita(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue()); } - if (_methodName285.equals(name) && - Arrays.deepEquals(_methodParameterTypes285, parameterTypes)) { - DettPraticaLocalServiceUtil.updateAsset((it.tref.liferay.portos.bo.model.DettPratica)arguments[0], - (long[])arguments[1], ((Boolean)arguments[2]).booleanValue()); - - return null; - } - - if (_methodName286.equals(name) && - Arrays.deepEquals(_methodParameterTypes286, parameterTypes)) { - DettPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), + if (_methodName282.equals(name) && + Arrays.deepEquals(_methodParameterTypes282, parameterTypes)) { + return DettPraticaLocalServiceUtil.updateStatus(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue()); - - return null; } - if (_methodName287.equals(name) && - Arrays.deepEquals(_methodParameterTypes287, parameterTypes)) { + if (_methodName283.equals(name) && + Arrays.deepEquals(_methodParameterTypes283, parameterTypes)) { return DettPraticaLocalServiceUtil.updateSignal(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); } - if (_methodName288.equals(name) && - Arrays.deepEquals(_methodParameterTypes288, parameterTypes)) { + if (_methodName284.equals(name) && + Arrays.deepEquals(_methodParameterTypes284, parameterTypes)) { return DettPraticaLocalServiceUtil.countInvioSignal(); } - if (_methodName289.equals(name) && - Arrays.deepEquals(_methodParameterTypes289, parameterTypes)) { + if (_methodName285.equals(name) && + Arrays.deepEquals(_methodParameterTypes285, parameterTypes)) { return DettPraticaLocalServiceUtil.getInvioSignal(((Long)arguments[0]).longValue()); } - if (_methodName290.equals(name) && - Arrays.deepEquals(_methodParameterTypes290, parameterTypes)) { + if (_methodName286.equals(name) && + Arrays.deepEquals(_methodParameterTypes286, parameterTypes)) { return DettPraticaLocalServiceUtil.getInviiSignal(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName291.equals(name) && - Arrays.deepEquals(_methodParameterTypes291, parameterTypes)) { + if (_methodName287.equals(name) && + Arrays.deepEquals(_methodParameterTypes287, parameterTypes)) { return DettPraticaLocalServiceUtil.dynamicQueryInvioSignal((java.lang.Long)arguments[0]); } - if (_methodName292.equals(name) && - Arrays.deepEquals(_methodParameterTypes292, parameterTypes)) { + if (_methodName288.equals(name) && + Arrays.deepEquals(_methodParameterTypes288, parameterTypes)) { return DettPraticaLocalServiceUtil.findByPagamentoId(((Long)arguments[0]).longValue()); } - if (_methodName293.equals(name) && - Arrays.deepEquals(_methodParameterTypes293, parameterTypes)) { + if (_methodName289.equals(name) && + Arrays.deepEquals(_methodParameterTypes289, parameterTypes)) { return DettPraticaLocalServiceUtil.updatePrincipale(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2]); } - if (_methodName294.equals(name) && - Arrays.deepEquals(_methodParameterTypes294, parameterTypes)) { + if (_methodName290.equals(name) && + Arrays.deepEquals(_methodParameterTypes290, parameterTypes)) { DettPraticaLocalServiceUtil.sendToVersioning(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); return null; } - if (_methodName295.equals(name) && - Arrays.deepEquals(_methodParameterTypes295, parameterTypes)) { + if (_methodName291.equals(name) && + Arrays.deepEquals(_methodParameterTypes291, parameterTypes)) { return DettPraticaLocalServiceUtil.getNumeroDiVersioni((java.lang.String)arguments[0]); } - if (_methodName296.equals(name) && - Arrays.deepEquals(_methodParameterTypes296, parameterTypes)) { + if (_methodName292.equals(name) && + Arrays.deepEquals(_methodParameterTypes292, parameterTypes)) { return DettPraticaLocalServiceUtil.getVersionNumber((java.lang.String)arguments[0], ((Integer)arguments[1]).intValue()); } - if (_methodName298.equals(name) && - Arrays.deepEquals(_methodParameterTypes298, parameterTypes)) { + if (_methodName294.equals(name) && + Arrays.deepEquals(_methodParameterTypes294, parameterTypes)) { return DettPraticaLocalServiceUtil.callForChanges((java.lang.String)arguments[0]); } - if (_methodName299.equals(name) && - Arrays.deepEquals(_methodParameterTypes299, parameterTypes)) { - return DettPraticaLocalServiceUtil.fetchByOldDettPraticaId(((Long)arguments[0]).longValue()); - } - - if (_methodName300.equals(name) && - Arrays.deepEquals(_methodParameterTypes300, parameterTypes)) { + if (_methodName295.equals(name) && + Arrays.deepEquals(_methodParameterTypes295, parameterTypes)) { return DettPraticaLocalServiceUtil.countVariateByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName301.equals(name) && - Arrays.deepEquals(_methodParameterTypes301, parameterTypes)) { + if (_methodName296.equals(name) && + Arrays.deepEquals(_methodParameterTypes296, parameterTypes)) { return DettPraticaLocalServiceUtil.getFirstCompletedByIntPratica(((Long)arguments[0]).longValue()); } @@ -1691,6 +1651,8 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes249; private String _methodName250; private String[] _methodParameterTypes250; + private String _methodName251; + private String[] _methodParameterTypes251; private String _methodName252; private String[] _methodParameterTypes252; private String _methodName253; @@ -1701,16 +1663,18 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes255; private String _methodName256; private String[] _methodParameterTypes256; - private String _methodName257; - private String[] _methodParameterTypes257; private String _methodName258; private String[] _methodParameterTypes258; - private String _methodName260; - private String[] _methodParameterTypes260; + private String _methodName259; + private String[] _methodParameterTypes259; private String _methodName261; private String[] _methodParameterTypes261; private String _methodName264; private String[] _methodParameterTypes264; + private String _methodName265; + private String[] _methodParameterTypes265; + private String _methodName266; + private String[] _methodParameterTypes266; private String _methodName267; private String[] _methodParameterTypes267; private String _methodName268; @@ -1721,8 +1685,6 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes270; private String _methodName271; private String[] _methodParameterTypes271; - private String _methodName272; - private String[] _methodParameterTypes272; private String _methodName273; private String[] _methodParameterTypes273; private String _methodName274; @@ -1731,14 +1693,16 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes276; private String _methodName277; private String[] _methodParameterTypes277; + private String _methodName278; + private String[] _methodParameterTypes278; private String _methodName279; private String[] _methodParameterTypes279; - private String _methodName280; - private String[] _methodParameterTypes280; private String _methodName281; private String[] _methodParameterTypes281; private String _methodName282; private String[] _methodParameterTypes282; + private String _methodName283; + private String[] _methodParameterTypes283; private String _methodName284; private String[] _methodParameterTypes284; private String _methodName285; @@ -1757,20 +1721,10 @@ public class DettPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes291; private String _methodName292; private String[] _methodParameterTypes292; - private String _methodName293; - private String[] _methodParameterTypes293; private String _methodName294; private String[] _methodParameterTypes294; private String _methodName295; private String[] _methodParameterTypes295; private String _methodName296; private String[] _methodParameterTypes296; - private String _methodName298; - private String[] _methodParameterTypes298; - private String _methodName299; - private String[] _methodParameterTypes299; - private String _methodName300; - private String[] _methodParameterTypes300; - private String _methodName301; - private String[] _methodParameterTypes301; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java index e23db30b..a0933946 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DettPraticaServiceClpInvoker.java @@ -84,30 +84,30 @@ public class DettPraticaServiceClpInvoker { "java.lang.String", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.util.Date", "int", "boolean", "long", - "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "long", "long", - "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "boolean", "java.util.Date", "java.util.Date", - "java.util.Date", "java.lang.String", "boolean", "long", "int", + "java.lang.String", "long", "long", "boolean", "boolean", + "boolean", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "java.util.Date", "java.util.Date", "java.util.Date", + "java.lang.String", "boolean", "long", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "boolean", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "java.lang.String", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "java.lang.String", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "java.lang.String", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", @@ -115,28 +115,27 @@ public class DettPraticaServiceClpInvoker { "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.String", "java.lang.String", "java.util.Date", + "java.util.Date", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", "java.lang.Double", - "java.lang.Double", "java.lang.Double", "java.lang.Double", - "java.lang.String", "java.lang.String", "java.lang.String", + "java.lang.Double", "java.lang.String", "java.lang.String", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "boolean", "boolean", "boolean", + "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "boolean", "java.lang.String", + "com.liferay.portal.service.ServiceContext", "boolean", + "boolean", "boolean", "java.lang.String", "java.lang.String", + "java.lang.String", "java.lang.String", "java.lang.Boolean", + "java.lang.Boolean", "java.lang.Boolean", "java.lang.String", "boolean", "boolean", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", - "java.lang.String", "java.lang.String", "boolean", - "java.lang.String", "com.liferay.portal.service.ServiceContext", - "boolean", "boolean", "boolean", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "java.lang.Boolean", "java.lang.Boolean", "java.lang.Boolean", - "java.lang.String", "boolean", "boolean", "boolean", "boolean", - "boolean", "boolean", "boolean", "boolean", "boolean", "double", - "java.lang.String" + "boolean", "boolean", "boolean", "double", "java.lang.String" }; _methodName215 = "fetchDettPratica"; @@ -292,30 +291,30 @@ public class DettPraticaServiceClpInvoker { ((Integer)arguments[14]).intValue(), ((Boolean)arguments[15]).booleanValue(), ((Long)arguments[16]).longValue(), - ((Long)arguments[17]).longValue(), + (java.lang.String)arguments[17], (java.lang.String)arguments[18], (java.lang.String)arguments[19], (java.lang.String)arguments[20], (java.lang.String)arguments[21], (java.lang.String)arguments[22], (java.lang.String)arguments[23], - (java.lang.String)arguments[24], + ((Long)arguments[24]).longValue(), ((Long)arguments[25]).longValue(), - ((Long)arguments[26]).longValue(), + ((Boolean)arguments[26]).booleanValue(), ((Boolean)arguments[27]).booleanValue(), ((Boolean)arguments[28]).booleanValue(), - ((Boolean)arguments[29]).booleanValue(), + (java.lang.String)arguments[29], (java.lang.String)arguments[30], (java.lang.String)arguments[31], (java.lang.String)arguments[32], - (java.lang.String)arguments[33], + ((Boolean)arguments[33]).booleanValue(), ((Boolean)arguments[34]).booleanValue(), - ((Boolean)arguments[35]).booleanValue(), - (java.util.Date)arguments[36], (java.util.Date)arguments[37], - (java.util.Date)arguments[38], (java.lang.String)arguments[39], - ((Boolean)arguments[40]).booleanValue(), - ((Long)arguments[41]).longValue(), - ((Integer)arguments[42]).intValue(), + (java.util.Date)arguments[35], (java.util.Date)arguments[36], + (java.util.Date)arguments[37], (java.lang.String)arguments[38], + ((Boolean)arguments[39]).booleanValue(), + ((Long)arguments[40]).longValue(), + ((Integer)arguments[41]).intValue(), + (java.lang.String)arguments[42], (java.lang.String)arguments[43], (java.lang.String)arguments[44], (java.lang.String)arguments[45], @@ -330,7 +329,7 @@ public class DettPraticaServiceClpInvoker { (java.lang.String)arguments[54], (java.lang.String)arguments[55], (java.lang.String)arguments[56], - (java.lang.String)arguments[57], + ((Boolean)arguments[57]).booleanValue(), ((Boolean)arguments[58]).booleanValue(), ((Boolean)arguments[59]).booleanValue(), ((Boolean)arguments[60]).booleanValue(), @@ -341,31 +340,31 @@ public class DettPraticaServiceClpInvoker { ((Boolean)arguments[65]).booleanValue(), ((Boolean)arguments[66]).booleanValue(), ((Boolean)arguments[67]).booleanValue(), - ((Boolean)arguments[68]).booleanValue(), + (java.lang.String)arguments[68], (java.lang.String)arguments[69], - (java.lang.String)arguments[70], + ((Boolean)arguments[70]).booleanValue(), ((Boolean)arguments[71]).booleanValue(), ((Boolean)arguments[72]).booleanValue(), ((Boolean)arguments[73]).booleanValue(), - ((Boolean)arguments[74]).booleanValue(), + (java.lang.String)arguments[74], (java.lang.String)arguments[75], (java.lang.String)arguments[76], - (java.lang.String)arguments[77], + ((Boolean)arguments[77]).booleanValue(), ((Boolean)arguments[78]).booleanValue(), ((Boolean)arguments[79]).booleanValue(), ((Boolean)arguments[80]).booleanValue(), ((Boolean)arguments[81]).booleanValue(), ((Boolean)arguments[82]).booleanValue(), - ((Boolean)arguments[83]).booleanValue(), - (java.lang.String)arguments[84], + (java.lang.String)arguments[83], + ((Boolean)arguments[84]).booleanValue(), ((Boolean)arguments[85]).booleanValue(), ((Boolean)arguments[86]).booleanValue(), ((Boolean)arguments[87]).booleanValue(), ((Boolean)arguments[88]).booleanValue(), ((Boolean)arguments[89]).booleanValue(), - ((Boolean)arguments[90]).booleanValue(), + (java.lang.String)arguments[90], (java.lang.String)arguments[91], - (java.lang.String)arguments[92], + ((Boolean)arguments[92]).booleanValue(), ((Boolean)arguments[93]).booleanValue(), ((Boolean)arguments[94]).booleanValue(), ((Boolean)arguments[95]).booleanValue(), @@ -373,14 +372,14 @@ public class DettPraticaServiceClpInvoker { ((Boolean)arguments[97]).booleanValue(), ((Boolean)arguments[98]).booleanValue(), ((Boolean)arguments[99]).booleanValue(), - ((Boolean)arguments[100]).booleanValue(), - (java.lang.String)arguments[101], + (java.lang.String)arguments[100], + ((Boolean)arguments[101]).booleanValue(), ((Boolean)arguments[102]).booleanValue(), ((Boolean)arguments[103]).booleanValue(), ((Boolean)arguments[104]).booleanValue(), ((Boolean)arguments[105]).booleanValue(), - ((Boolean)arguments[106]).booleanValue(), - (java.lang.String)arguments[107], + (java.lang.String)arguments[106], + ((Boolean)arguments[107]).booleanValue(), ((Boolean)arguments[108]).booleanValue(), ((Boolean)arguments[109]).booleanValue(), ((Boolean)arguments[110]).booleanValue(), @@ -389,7 +388,7 @@ public class DettPraticaServiceClpInvoker { ((Boolean)arguments[113]).booleanValue(), ((Boolean)arguments[114]).booleanValue(), ((Boolean)arguments[115]).booleanValue(), - ((Boolean)arguments[116]).booleanValue(), + (java.lang.String)arguments[116], (java.lang.String)arguments[117], (java.lang.String)arguments[118], (java.lang.String)arguments[119], @@ -412,8 +411,8 @@ public class DettPraticaServiceClpInvoker { (java.lang.String)arguments[136], (java.lang.String)arguments[137], (java.lang.String)arguments[138], - (java.lang.String)arguments[139], - (java.util.Date)arguments[140], + (java.util.Date)arguments[139], + (java.lang.Double)arguments[140], (java.lang.Double)arguments[141], (java.lang.Double)arguments[142], (java.lang.Double)arguments[143], @@ -428,10 +427,10 @@ public class DettPraticaServiceClpInvoker { (java.lang.Double)arguments[152], (java.lang.Double)arguments[153], (java.lang.Double)arguments[154], - (java.lang.Double)arguments[155], + (java.lang.String)arguments[155], (java.lang.String)arguments[156], (java.lang.String)arguments[157], - (java.lang.String)arguments[158], + ((Boolean)arguments[158]).booleanValue(), ((Boolean)arguments[159]).booleanValue(), ((Boolean)arguments[160]).booleanValue(), ((Boolean)arguments[161]).booleanValue(), @@ -446,8 +445,8 @@ public class DettPraticaServiceClpInvoker { ((Boolean)arguments[170]).booleanValue(), ((Boolean)arguments[171]).booleanValue(), ((Boolean)arguments[172]).booleanValue(), - ((Boolean)arguments[173]).booleanValue(), - (java.lang.String)arguments[174], + (java.lang.String)arguments[173], + ((Boolean)arguments[174]).booleanValue(), ((Boolean)arguments[175]).booleanValue(), ((Boolean)arguments[176]).booleanValue(), ((Boolean)arguments[177]).booleanValue(), @@ -471,23 +470,23 @@ public class DettPraticaServiceClpInvoker { ((Boolean)arguments[195]).booleanValue(), ((Boolean)arguments[196]).booleanValue(), ((Boolean)arguments[197]).booleanValue(), - ((Boolean)arguments[198]).booleanValue(), + (java.lang.String)arguments[198], (java.lang.String)arguments[199], - (java.lang.String)arguments[200], - ((Boolean)arguments[201]).booleanValue(), - (java.lang.String)arguments[202], - (com.liferay.portal.service.ServiceContext)arguments[203], + ((Boolean)arguments[200]).booleanValue(), + (java.lang.String)arguments[201], + (com.liferay.portal.service.ServiceContext)arguments[202], + ((Boolean)arguments[203]).booleanValue(), ((Boolean)arguments[204]).booleanValue(), ((Boolean)arguments[205]).booleanValue(), - ((Boolean)arguments[206]).booleanValue(), + (java.lang.String)arguments[206], (java.lang.String)arguments[207], (java.lang.String)arguments[208], (java.lang.String)arguments[209], - (java.lang.String)arguments[210], + (java.lang.Boolean)arguments[210], (java.lang.Boolean)arguments[211], (java.lang.Boolean)arguments[212], - (java.lang.Boolean)arguments[213], - (java.lang.String)arguments[214], + (java.lang.String)arguments[213], + ((Boolean)arguments[214]).booleanValue(), ((Boolean)arguments[215]).booleanValue(), ((Boolean)arguments[216]).booleanValue(), ((Boolean)arguments[217]).booleanValue(), @@ -496,9 +495,8 @@ public class DettPraticaServiceClpInvoker { ((Boolean)arguments[220]).booleanValue(), ((Boolean)arguments[221]).booleanValue(), ((Boolean)arguments[222]).booleanValue(), - ((Boolean)arguments[223]).booleanValue(), - ((Double)arguments[224]).doubleValue(), - (java.lang.String)arguments[225]); + ((Double)arguments[223]).doubleValue(), + (java.lang.String)arguments[224]); } if (_methodName215.equals(name) && diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java index 27ffb8d8..933cbcbd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/DocPraticaLocalServiceClpInvoker.java @@ -166,205 +166,191 @@ public class DocPraticaLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext" }; - _methodName203 = "addDocPraticaForImport"; + _methodName203 = "addAttachment"; _methodParameterTypes203 = new String[] { - "long", "java.lang.String", "long", "long", "byte[][]", - "java.lang.String", "java.lang.String", "boolean", - "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "java.lang.String", "long", "java.util.Date", "long", - "com.liferay.portal.service.ServiceContext" - }; - - _methodName204 = "addAttachment"; - - _methodParameterTypes204 = new String[] { "long", "long", "long", "java.lang.String", "byte[][]", "java.lang.String" }; - _methodName205 = "getAttachment"; + _methodName204 = "getAttachment"; - _methodParameterTypes205 = new String[] { "long" }; + _methodParameterTypes204 = new String[] { "long" }; - _methodName206 = "addFirma"; + _methodName205 = "addFirma"; - _methodParameterTypes206 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes205 = new String[] { "long", "java.lang.String" }; - _methodName207 = "addFirmeAndApprova"; + _methodName206 = "addFirmeAndApprova"; - _methodParameterTypes207 = new String[] { "long", "java.util.List" }; + _methodParameterTypes206 = new String[] { "long", "java.util.List" }; - _methodName208 = "addErrorAndApprova"; + _methodName207 = "addErrorAndApprova"; - _methodParameterTypes208 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes207 = new String[] { "long", "java.lang.String" }; - _methodName209 = "removeFirma"; + _methodName208 = "removeFirma"; - _methodParameterTypes209 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes208 = new String[] { "long", "java.lang.String" }; - _methodName210 = "updateDocPraticaAggiornato"; + _methodName209 = "updateDocPraticaAggiornato"; - _methodParameterTypes210 = new String[] { "long", "boolean" }; + _methodParameterTypes209 = new String[] { "long", "boolean" }; - _methodName211 = "countDocPraticaDaInviareDax"; + _methodName210 = "countDocPraticaDaInviareDax"; - _methodParameterTypes211 = new String[] { }; + _methodParameterTypes210 = new String[] { }; - _methodName212 = "getDocPraticaDaInviareDax"; + _methodName211 = "getDocPraticaDaInviareDax"; - _methodParameterTypes212 = new String[] { "int", "int" }; + _methodParameterTypes211 = new String[] { "int", "int" }; - _methodName214 = "countByClassPk"; + _methodName213 = "countByClassPk"; - _methodParameterTypes214 = new String[] { "long" }; + _methodParameterTypes213 = new String[] { "long" }; - _methodName215 = "findByClassPk"; + _methodName214 = "findByClassPk"; - _methodParameterTypes215 = new String[] { "long", "int", "int" }; + _methodParameterTypes214 = new String[] { "long", "int", "int" }; - _methodName216 = "findByIntPratica"; + _methodName215 = "findByIntPratica"; - _methodParameterTypes216 = new String[] { "long" }; + _methodParameterTypes215 = new String[] { "long" }; - _methodName217 = "findByClassPk"; + _methodName216 = "findByClassPk"; - _methodParameterTypes217 = new String[] { "long" }; + _methodParameterTypes216 = new String[] { "long" }; - _methodName218 = "findByStaus"; + _methodName217 = "findByStaus"; - _methodParameterTypes218 = new String[] { + _methodParameterTypes217 = new String[] { "int", "int", "int", "com.liferay.portal.kernel.util.OrderByComparator" }; - _methodName219 = "countByStatus"; + _methodName218 = "countByStatus"; - _methodParameterTypes219 = new String[] { "long" }; + _methodParameterTypes218 = new String[] { "long" }; - _methodName220 = "countByClassPk_Tipologia"; + _methodName219 = "countByClassPk_Tipologia"; - _methodParameterTypes220 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes219 = new String[] { "long", "java.lang.String" }; - _methodName221 = "findByClassPk_Tipologia"; + _methodName220 = "findByClassPk_Tipologia"; - _methodParameterTypes221 = new String[] { + _methodParameterTypes220 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName222 = "findByIntPratica_Tipologia"; + _methodName221 = "findByIntPratica_Tipologia"; - _methodParameterTypes222 = new String[] { + _methodParameterTypes221 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName223 = "findByIntPratica_ClassPk_Tipologia"; + _methodName222 = "findByIntPratica_ClassPk_Tipologia"; - _methodParameterTypes223 = new String[] { + _methodParameterTypes222 = new String[] { "long", "long", "java.lang.String", "int", "int" }; - _methodName224 = "findByIntPratica_ClassPk_Tipologie"; - - _methodParameterTypes224 = new String[] { "long", "long", "java.util.List" }; - - _methodName225 = "findByIntPratica_ClassPkEqual_Tipologie"; + _methodName223 = "findByIntPratica_ClassPk_Tipologie"; - _methodParameterTypes225 = new String[] { "long", "long", "java.util.List" }; + _methodParameterTypes223 = new String[] { "long", "long", "java.util.List" }; - _methodName226 = "fetchByC_Group_DlFileEntry_Version"; + _methodName224 = "findByIntPratica_ClassPkEqual_Tipologie"; - _methodParameterTypes226 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes224 = new String[] { "long", "long", "java.util.List" }; - _methodName227 = "fetchByOldDocPraticaId"; + _methodName225 = "fetchByC_Group_DlFileEntry_Version"; - _methodParameterTypes227 = new String[] { "long" }; + _methodParameterTypes225 = new String[] { "long", "java.lang.String" }; - _methodName228 = "findDistinctDlFileEntryId"; + _methodName226 = "findDistinctDlFileEntryId"; - _methodParameterTypes228 = new String[] { + _methodParameterTypes226 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName229 = "findDistinctDlFileEntryId"; + _methodName227 = "findDistinctDlFileEntryId"; - _methodParameterTypes229 = new String[] { + _methodParameterTypes227 = new String[] { "long[][]", "java.lang.String", "int", "int" }; - _methodName230 = "getValidByIntPratica"; + _methodName228 = "getValidByIntPratica"; - _methodParameterTypes230 = new String[] { "long" }; + _methodParameterTypes228 = new String[] { "long" }; - _methodName231 = "getValidByIntPratica_Tipologia"; + _methodName229 = "getValidByIntPratica_Tipologia"; - _methodParameterTypes231 = new String[] { + _methodParameterTypes229 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName232 = "countValidTmpByIntPratica_Tipologia"; + _methodName230 = "countValidTmpByIntPratica_Tipologia"; - _methodParameterTypes232 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes230 = new String[] { "long", "java.lang.String" }; - _methodName233 = "getValidTmpByIntPratica"; + _methodName231 = "getValidTmpByIntPratica"; - _methodParameterTypes233 = new String[] { "long", "int", "int" }; + _methodParameterTypes231 = new String[] { "long", "int", "int" }; - _methodName234 = "getValidTmpByIntPratica_Tipologia"; + _methodName232 = "getValidTmpByIntPratica_Tipologia"; - _methodParameterTypes234 = new String[] { + _methodParameterTypes232 = new String[] { "long", "java.lang.String", "int", "int" }; - _methodName235 = "getValidTmpByIntPratica_DettPratica_Tipologia"; + _methodName233 = "getValidTmpByIntPratica_DettPratica_Tipologia"; - _methodParameterTypes235 = new String[] { + _methodParameterTypes233 = new String[] { "long", "long", "java.lang.String", "int", "int" }; - _methodName236 = "getValidTmpByIntPratica_Tipologie"; + _methodName234 = "getValidTmpByIntPratica_Tipologie"; - _methodParameterTypes236 = new String[] { + _methodParameterTypes234 = new String[] { "long", "java.lang.String[][]", "int", "int" }; - _methodName237 = "countValidTmpByIntPratica_Tipologie"; + _methodName235 = "countValidTmpByIntPratica_Tipologie"; - _methodParameterTypes237 = new String[] { "long", "java.lang.String[][]" }; + _methodParameterTypes235 = new String[] { "long", "java.lang.String[][]" }; - _methodName239 = "getInvalidByIntPratica"; + _methodName237 = "getInvalidByIntPratica"; - _methodParameterTypes239 = new String[] { "long" }; + _methodParameterTypes237 = new String[] { "long" }; - _methodName240 = "getInvalidTmpByIntPratica"; + _methodName238 = "getInvalidTmpByIntPratica"; - _methodParameterTypes240 = new String[] { "long" }; + _methodParameterTypes238 = new String[] { "long" }; - _methodName241 = "getValidUntilClassPkByIntPratica"; + _methodName239 = "getValidUntilClassPkByIntPratica"; - _methodParameterTypes241 = new String[] { + _methodParameterTypes239 = new String[] { "long", "long", "java.lang.String", "int", "int" }; - _methodName242 = "completeInvalidation"; + _methodName240 = "completeInvalidation"; - _methodParameterTypes242 = new String[] { "long" }; + _methodParameterTypes240 = new String[] { "long" }; - _methodName243 = "getDocPraticaWithOldFileEntryId"; + _methodName241 = "getDocPraticaWithOldFileEntryId"; - _methodParameterTypes243 = new String[] { "int", "int" }; + _methodParameterTypes241 = new String[] { "int", "int" }; - _methodName244 = "addDocPraticaAnnullamento"; + _methodName242 = "addDocPraticaAnnullamento"; - _methodParameterTypes244 = new String[] { + _methodParameterTypes242 = new String[] { "long", "java.lang.String", "long", "long", "long", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName245 = "findByIntPratica_ClassPk_TipologiaNew"; + _methodName243 = "findByIntPratica_ClassPk_TipologiaNew"; - _methodParameterTypes245 = new String[] { + _methodParameterTypes243 = new String[] { "long", "long", "java.lang.String", "int", "int" }; } @@ -546,24 +532,6 @@ public class DocPraticaLocalServiceClpInvoker { if (_methodName203.equals(name) && Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { - return DocPraticaLocalServiceUtil.addDocPraticaForImport(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1], - ((Long)arguments[2]).longValue(), - ((Long)arguments[3]).longValue(), (byte[])arguments[4], - (java.lang.String)arguments[5], (java.lang.String)arguments[6], - ((Boolean)arguments[7]).booleanValue(), - (java.lang.String)arguments[8], (java.lang.String)arguments[9], - (java.lang.String)arguments[10], - ((Boolean)arguments[11]).booleanValue(), - (java.lang.String)arguments[12], - ((Long)arguments[13]).longValue(), - (java.util.Date)arguments[14], - ((Long)arguments[15]).longValue(), - (com.liferay.portal.service.ServiceContext)arguments[16]); - } - - if (_methodName204.equals(name) && - Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { return DocPraticaLocalServiceUtil.addAttachment(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Long)arguments[2]).longValue(), @@ -571,119 +539,119 @@ public class DocPraticaLocalServiceClpInvoker { (java.lang.String)arguments[5]); } - if (_methodName205.equals(name) && - Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { + if (_methodName204.equals(name) && + Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { return DocPraticaLocalServiceUtil.getAttachment(((Long)arguments[0]).longValue()); } - if (_methodName206.equals(name) && - Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { + if (_methodName205.equals(name) && + Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { DocPraticaLocalServiceUtil.addFirma(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); return null; } - if (_methodName207.equals(name) && - Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { + if (_methodName206.equals(name) && + Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { DocPraticaLocalServiceUtil.addFirmeAndApprova(((Long)arguments[0]).longValue(), (java.util.List)arguments[1]); return null; } - if (_methodName208.equals(name) && - Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { + if (_methodName207.equals(name) && + Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { DocPraticaLocalServiceUtil.addErrorAndApprova(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); return null; } - if (_methodName209.equals(name) && - Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + if (_methodName208.equals(name) && + Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { DocPraticaLocalServiceUtil.removeFirma(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); return null; } - if (_methodName210.equals(name) && - Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { return DocPraticaLocalServiceUtil.updateDocPraticaAggiornato(((Long)arguments[0]).longValue(), ((Boolean)arguments[1]).booleanValue()); } - if (_methodName211.equals(name) && - Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { + if (_methodName210.equals(name) && + Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { return DocPraticaLocalServiceUtil.countDocPraticaDaInviareDax(); } - if (_methodName212.equals(name) && - Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { + if (_methodName211.equals(name) && + Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { return DocPraticaLocalServiceUtil.getDocPraticaDaInviareDax(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName214.equals(name) && - Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { + if (_methodName213.equals(name) && + Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { return DocPraticaLocalServiceUtil.countByClassPk(((Long)arguments[0]).longValue()); } - if (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return DocPraticaLocalServiceUtil.findByClassPk(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName215.equals(name) && + Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { return DocPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName217.equals(name) && - Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { + if (_methodName216.equals(name) && + Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { return DocPraticaLocalServiceUtil.findByClassPk(((Long)arguments[0]).longValue()); } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName217.equals(name) && + Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { return DocPraticaLocalServiceUtil.findByStaus(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue(), (com.liferay.portal.kernel.util.OrderByComparator)arguments[3]); } - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { + if (_methodName218.equals(name) && + Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { return DocPraticaLocalServiceUtil.countByStatus(((Long)arguments[0]).longValue()); } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName219.equals(name) && + Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return DocPraticaLocalServiceUtil.countByClassPk_Tipologia(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName221.equals(name) && - Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { + if (_methodName220.equals(name) && + Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { return DocPraticaLocalServiceUtil.findByClassPk_Tipologia(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName222.equals(name) && - Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { + if (_methodName221.equals(name) && + Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { return DocPraticaLocalServiceUtil.findByIntPratica_Tipologia(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName223.equals(name) && - Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { + if (_methodName222.equals(name) && + Arrays.deepEquals(_methodParameterTypes222, parameterTypes)) { return DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_Tipologia(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2], @@ -691,83 +659,78 @@ public class DocPraticaLocalServiceClpInvoker { ((Integer)arguments[4]).intValue()); } - if (_methodName224.equals(name) && - Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { + if (_methodName223.equals(name) && + Arrays.deepEquals(_methodParameterTypes223, parameterTypes)) { return DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_Tipologie(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.util.List)arguments[2]); } - if (_methodName225.equals(name) && - Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { + if (_methodName224.equals(name) && + Arrays.deepEquals(_methodParameterTypes224, parameterTypes)) { return DocPraticaLocalServiceUtil.findByIntPratica_ClassPkEqual_Tipologie(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.util.List)arguments[2]); } - if (_methodName226.equals(name) && - Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { + if (_methodName225.equals(name) && + Arrays.deepEquals(_methodParameterTypes225, parameterTypes)) { return DocPraticaLocalServiceUtil.fetchByC_Group_DlFileEntry_Version(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName227.equals(name) && - Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { - return DocPraticaLocalServiceUtil.fetchByOldDocPraticaId(((Long)arguments[0]).longValue()); - } - - if (_methodName228.equals(name) && - Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { + if (_methodName226.equals(name) && + Arrays.deepEquals(_methodParameterTypes226, parameterTypes)) { return DocPraticaLocalServiceUtil.findDistinctDlFileEntryId(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName229.equals(name) && - Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { + if (_methodName227.equals(name) && + Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) { return DocPraticaLocalServiceUtil.findDistinctDlFileEntryId((long[])arguments[0], (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName230.equals(name) && - Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { + if (_methodName228.equals(name) && + Arrays.deepEquals(_methodParameterTypes228, parameterTypes)) { return DocPraticaLocalServiceUtil.getValidByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName231.equals(name) && - Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { + if (_methodName229.equals(name) && + Arrays.deepEquals(_methodParameterTypes229, parameterTypes)) { return DocPraticaLocalServiceUtil.getValidByIntPratica_Tipologia(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName232.equals(name) && - Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { + if (_methodName230.equals(name) && + Arrays.deepEquals(_methodParameterTypes230, parameterTypes)) { return DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologia(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1]); } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { + if (_methodName231.equals(name) && + Arrays.deepEquals(_methodParameterTypes231, parameterTypes)) { return DocPraticaLocalServiceUtil.getValidTmpByIntPratica(((Long)arguments[0]).longValue(), ((Integer)arguments[1]).intValue(), ((Integer)arguments[2]).intValue()); } - if (_methodName234.equals(name) && - Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { + if (_methodName232.equals(name) && + Arrays.deepEquals(_methodParameterTypes232, parameterTypes)) { return DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologia(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName235.equals(name) && - Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { + if (_methodName233.equals(name) && + Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { return DocPraticaLocalServiceUtil.getValidTmpByIntPratica_DettPratica_Tipologia(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2], @@ -775,32 +738,32 @@ public class DocPraticaLocalServiceClpInvoker { ((Integer)arguments[4]).intValue()); } - if (_methodName236.equals(name) && - Arrays.deepEquals(_methodParameterTypes236, parameterTypes)) { + if (_methodName234.equals(name) && + Arrays.deepEquals(_methodParameterTypes234, parameterTypes)) { return DocPraticaLocalServiceUtil.getValidTmpByIntPratica_Tipologie(((Long)arguments[0]).longValue(), (java.lang.String[])arguments[1], ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName237.equals(name) && - Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { + if (_methodName235.equals(name) && + Arrays.deepEquals(_methodParameterTypes235, parameterTypes)) { return DocPraticaLocalServiceUtil.countValidTmpByIntPratica_Tipologie(((Long)arguments[0]).longValue(), (java.lang.String[])arguments[1]); } - if (_methodName239.equals(name) && - Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { + if (_methodName237.equals(name) && + Arrays.deepEquals(_methodParameterTypes237, parameterTypes)) { return DocPraticaLocalServiceUtil.getInvalidByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName240.equals(name) && - Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { + if (_methodName238.equals(name) && + Arrays.deepEquals(_methodParameterTypes238, parameterTypes)) { return DocPraticaLocalServiceUtil.getInvalidTmpByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName241.equals(name) && - Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { + if (_methodName239.equals(name) && + Arrays.deepEquals(_methodParameterTypes239, parameterTypes)) { return DocPraticaLocalServiceUtil.getValidUntilClassPkByIntPratica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2], @@ -808,21 +771,21 @@ public class DocPraticaLocalServiceClpInvoker { ((Integer)arguments[4]).intValue()); } - if (_methodName242.equals(name) && - Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { + if (_methodName240.equals(name) && + Arrays.deepEquals(_methodParameterTypes240, parameterTypes)) { DocPraticaLocalServiceUtil.completeInvalidation(((Long)arguments[0]).longValue()); return null; } - if (_methodName243.equals(name) && - Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { + if (_methodName241.equals(name) && + Arrays.deepEquals(_methodParameterTypes241, parameterTypes)) { return DocPraticaLocalServiceUtil.getDocPraticaWithOldFileEntryId(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName244.equals(name) && - Arrays.deepEquals(_methodParameterTypes244, parameterTypes)) { + if (_methodName242.equals(name) && + Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { return DocPraticaLocalServiceUtil.addDocPraticaAnnullamento(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], ((Long)arguments[2]).longValue(), @@ -833,8 +796,8 @@ public class DocPraticaLocalServiceClpInvoker { (com.liferay.portal.service.ServiceContext)arguments[9]); } - if (_methodName245.equals(name) && - Arrays.deepEquals(_methodParameterTypes245, parameterTypes)) { + if (_methodName243.equals(name) && + Arrays.deepEquals(_methodParameterTypes243, parameterTypes)) { return DocPraticaLocalServiceUtil.findByIntPratica_ClassPk_TipologiaNew(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), (java.lang.String)arguments[2], @@ -917,8 +880,8 @@ public class DocPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes210; private String _methodName211; private String[] _methodParameterTypes211; - private String _methodName212; - private String[] _methodParameterTypes212; + private String _methodName213; + private String[] _methodParameterTypes213; private String _methodName214; private String[] _methodParameterTypes214; private String _methodName215; @@ -963,10 +926,10 @@ public class DocPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes234; private String _methodName235; private String[] _methodParameterTypes235; - private String _methodName236; - private String[] _methodParameterTypes236; private String _methodName237; private String[] _methodParameterTypes237; + private String _methodName238; + private String[] _methodParameterTypes238; private String _methodName239; private String[] _methodParameterTypes239; private String _methodName240; @@ -977,8 +940,4 @@ public class DocPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes242; private String _methodName243; private String[] _methodParameterTypes243; - private String _methodName244; - private String[] _methodParameterTypes244; - private String _methodName245; - private String[] _methodParameterTypes245; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java index a80b8189..2847ce1b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/FineLavoriLocalServiceClpInvoker.java @@ -304,10 +304,6 @@ public class FineLavoriLocalServiceClpInvoker { _methodName232 = "findIntPraticaByFineLavori"; _methodParameterTypes232 = new String[] { "java.lang.String" }; - - _methodName233 = "fetchByOldDettPraticaId"; - - _methodParameterTypes233 = new String[] { "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -666,11 +662,6 @@ public class FineLavoriLocalServiceClpInvoker { return FineLavoriLocalServiceUtil.findIntPraticaByFineLavori((java.lang.String)arguments[0]); } - if (_methodName233.equals(name) && - Arrays.deepEquals(_methodParameterTypes233, parameterTypes)) { - return FineLavoriLocalServiceUtil.fetchByOldDettPraticaId(((Long)arguments[0]).longValue()); - } - throw new UnsupportedOperationException(); } @@ -786,6 +777,4 @@ public class FineLavoriLocalServiceClpInvoker { private String[] _methodParameterTypes231; private String _methodName232; private String[] _methodParameterTypes232; - private String _methodName233; - private String[] _methodParameterTypes233; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java index b190f7a9..3a7d884f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/SorteggioLocalServiceClpInvoker.java @@ -141,144 +141,113 @@ public class SorteggioLocalServiceClpInvoker { "com.liferay.portal.service.ServiceContext" }; - _methodName195 = "addSorteggioForImport"; + _methodName195 = "search"; _methodParameterTypes195 = new String[] { - "long", "long", "java.lang.String", "java.lang.String", "int", - "java.util.Date", "java.lang.String", "java.lang.String", - "java.lang.String", "long", "java.lang.String", - "java.lang.String", "java.lang.String", "java.lang.String", - "boolean", "long", "boolean", "int", "long", - "com.liferay.portal.service.ServiceContext" - }; - - _methodName196 = "getYears"; - - _methodParameterTypes196 = new String[] { "java.lang.Long", "int" }; - - _methodName197 = "countDettPraticaWorkflowNonAvviato"; - - _methodParameterTypes197 = new String[] { }; - - _methodName198 = "getDettPraticaWorkflowNonAvviato"; - - _methodParameterTypes198 = new String[] { "int", "int" }; - - _methodName200 = "search"; - - _methodParameterTypes200 = new String[] { "long", "java.lang.String", "java.lang.String", "int", "int", "int" }; - _methodName201 = "countSearch"; + _methodName196 = "countSearch"; - _methodParameterTypes201 = new String[] { + _methodParameterTypes196 = new String[] { "long", "java.lang.String", "java.lang.String", "int" }; - _methodName202 = "search"; + _methodName197 = "search"; - _methodParameterTypes202 = new String[] { + _methodParameterTypes197 = new String[] { "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String", "int", "int" }; - _methodName203 = "countSearch"; + _methodName198 = "countSearch"; - _methodParameterTypes203 = new String[] { + _methodParameterTypes198 = new String[] { "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String" }; - _methodName205 = "isDettPraticaSorteggiata"; + _methodName200 = "findByC_DettPratica"; - _methodParameterTypes205 = new String[] { "long", "long" }; + _methodParameterTypes200 = new String[] { "long", "long" }; - _methodName206 = "fetchByOldSorteggioId"; + _methodName201 = "findByIntPratica"; - _methodParameterTypes206 = new String[] { "long" }; + _methodParameterTypes201 = new String[] { "long" }; - _methodName207 = "findByC_DettPratica"; + _methodName202 = "findByGroupId_Anno_Mese_Settimana"; - _methodParameterTypes207 = new String[] { "long", "long" }; - - _methodName208 = "findByIntPratica"; - - _methodParameterTypes208 = new String[] { "long" }; - - _methodName209 = "findByGroupId_Anno_Mese_Settimana"; - - _methodParameterTypes209 = new String[] { + _methodParameterTypes202 = new String[] { "long", "java.lang.String", "java.lang.String", "int" }; - _methodName210 = "findByCompanyIdGroupId"; + _methodName203 = "findByCompanyIdGroupId"; - _methodParameterTypes210 = new String[] { "long", "long" }; + _methodParameterTypes203 = new String[] { "long", "long" }; - _methodName211 = "findByAnno_Mese_Settimana"; + _methodName204 = "findByAnno_Mese_Settimana"; - _methodParameterTypes211 = new String[] { + _methodParameterTypes204 = new String[] { "java.lang.String", "java.lang.String", "int" }; - _methodName212 = "findSorteggiGroupByAnnoMeseSettimana"; + _methodName205 = "findSorteggiGroupByAnnoMeseSettimana"; - _methodParameterTypes212 = new String[] { "int", "int" }; + _methodParameterTypes205 = new String[] { "int", "int" }; - _methodName213 = "countSorteggiGroupByAnnoMeseSettimana"; + _methodName206 = "countSorteggiGroupByAnnoMeseSettimana"; - _methodParameterTypes213 = new String[] { }; + _methodParameterTypes206 = new String[] { }; - _methodName214 = "countSorteggioMese"; + _methodName207 = "countSorteggioMese"; - _methodParameterTypes214 = new String[] { + _methodParameterTypes207 = new String[] { "java.util.Date", "java.util.Date", "java.util.List", "java.util.List" }; - _methodName215 = "findSorteggioMese"; + _methodName208 = "findSorteggioMese"; - _methodParameterTypes215 = new String[] { + _methodParameterTypes208 = new String[] { "java.util.Date", "java.util.Date", "java.util.List", "java.util.List", "java.util.List", "int" }; - _methodName216 = "findSorteggioAnno"; + _methodName209 = "findSorteggioAnno"; - _methodParameterTypes216 = new String[] { + _methodParameterTypes209 = new String[] { "java.util.Date", "java.util.Date", "java.util.List", "java.util.List", "java.util.List", "int" }; - _methodName217 = "updateDataSorteggioPraticaEsterna"; + _methodName210 = "updateDataSorteggioPraticaEsterna"; - _methodParameterTypes217 = new String[] { "long", "java.util.Date" }; + _methodParameterTypes210 = new String[] { "long", "java.util.Date" }; - _methodName218 = "getTecnicoSorteggioPraticaEsterna"; + _methodName211 = "getTecnicoSorteggioPraticaEsterna"; - _methodParameterTypes218 = new String[] { "long" }; + _methodParameterTypes211 = new String[] { "long" }; - _methodName219 = "findTipoPraticaIdSorteggioPraticaEsterna"; + _methodName212 = "findTipoPraticaIdSorteggioPraticaEsterna"; - _methodParameterTypes219 = new String[] { "long" }; + _methodParameterTypes212 = new String[] { "long" }; - _methodName220 = "search"; + _methodName213 = "search"; - _methodParameterTypes220 = new String[] { + _methodParameterTypes213 = new String[] { "java.lang.Long", "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String", "int", "int" }; - _methodName221 = "count"; + _methodName214 = "count"; - _methodParameterTypes221 = new String[] { + _methodParameterTypes214 = new String[] { "java.lang.Long", "java.lang.String", "java.lang.String", "int", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.Long", "java.lang.String" @@ -431,44 +400,6 @@ public class SorteggioLocalServiceClpInvoker { if (_methodName195.equals(name) && Arrays.deepEquals(_methodParameterTypes195, parameterTypes)) { - return SorteggioLocalServiceUtil.addSorteggioForImport(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue(), - (java.lang.String)arguments[2], (java.lang.String)arguments[3], - ((Integer)arguments[4]).intValue(), - (java.util.Date)arguments[5], (java.lang.String)arguments[6], - (java.lang.String)arguments[7], (java.lang.String)arguments[8], - ((Long)arguments[9]).longValue(), - (java.lang.String)arguments[10], - (java.lang.String)arguments[11], - (java.lang.String)arguments[12], - (java.lang.String)arguments[13], - ((Boolean)arguments[14]).booleanValue(), - ((Long)arguments[15]).longValue(), - ((Boolean)arguments[16]).booleanValue(), - ((Integer)arguments[17]).intValue(), - ((Long)arguments[18]).longValue(), - (com.liferay.portal.service.ServiceContext)arguments[19]); - } - - if (_methodName196.equals(name) && - Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { - return SorteggioLocalServiceUtil.getYears((java.lang.Long)arguments[0], - ((Integer)arguments[1]).intValue()); - } - - if (_methodName197.equals(name) && - Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { - return SorteggioLocalServiceUtil.countDettPraticaWorkflowNonAvviato(); - } - - if (_methodName198.equals(name) && - Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { - return SorteggioLocalServiceUtil.getDettPraticaWorkflowNonAvviato(((Integer)arguments[0]).intValue(), - ((Integer)arguments[1]).intValue()); - } - - if (_methodName200.equals(name) && - Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { return SorteggioLocalServiceUtil.search(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Integer)arguments[3]).intValue(), @@ -476,15 +407,15 @@ public class SorteggioLocalServiceClpInvoker { ((Integer)arguments[5]).intValue()); } - if (_methodName201.equals(name) && - Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { + if (_methodName196.equals(name) && + Arrays.deepEquals(_methodParameterTypes196, parameterTypes)) { return SorteggioLocalServiceUtil.countSearch(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Integer)arguments[3]).intValue()); } - if (_methodName202.equals(name) && - Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { + if (_methodName197.equals(name) && + Arrays.deepEquals(_methodParameterTypes197, parameterTypes)) { return SorteggioLocalServiceUtil.search((java.lang.String)arguments[0], (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), @@ -495,8 +426,8 @@ public class SorteggioLocalServiceClpInvoker { ((Integer)arguments[10]).intValue()); } - if (_methodName203.equals(name) && - Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { + if (_methodName198.equals(name) && + Arrays.deepEquals(_methodParameterTypes198, parameterTypes)) { return SorteggioLocalServiceUtil.countSearch((java.lang.String)arguments[0], (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue(), @@ -505,69 +436,58 @@ public class SorteggioLocalServiceClpInvoker { (java.lang.Long)arguments[7], (java.lang.String)arguments[8]); } - if (_methodName205.equals(name) && - Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { - return SorteggioLocalServiceUtil.isDettPraticaSorteggiata(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); - } - - if (_methodName206.equals(name) && - Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { - return SorteggioLocalServiceUtil.fetchByOldSorteggioId(((Long)arguments[0]).longValue()); - } - - if (_methodName207.equals(name) && - Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { + if (_methodName200.equals(name) && + Arrays.deepEquals(_methodParameterTypes200, parameterTypes)) { return SorteggioLocalServiceUtil.findByC_DettPratica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName208.equals(name) && - Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { + if (_methodName201.equals(name) && + Arrays.deepEquals(_methodParameterTypes201, parameterTypes)) { return SorteggioLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue()); } - if (_methodName209.equals(name) && - Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { + if (_methodName202.equals(name) && + Arrays.deepEquals(_methodParameterTypes202, parameterTypes)) { return SorteggioLocalServiceUtil.findByGroupId_Anno_Mese_Settimana(((Long)arguments[0]).longValue(), (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Integer)arguments[3]).intValue()); } - if (_methodName210.equals(name) && - Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { + if (_methodName203.equals(name) && + Arrays.deepEquals(_methodParameterTypes203, parameterTypes)) { return SorteggioLocalServiceUtil.findByCompanyIdGroupId(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName211.equals(name) && - Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { + if (_methodName204.equals(name) && + Arrays.deepEquals(_methodParameterTypes204, parameterTypes)) { return SorteggioLocalServiceUtil.findByAnno_Mese_Settimana((java.lang.String)arguments[0], (java.lang.String)arguments[1], ((Integer)arguments[2]).intValue()); } - if (_methodName212.equals(name) && - Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { + if (_methodName205.equals(name) && + Arrays.deepEquals(_methodParameterTypes205, parameterTypes)) { return SorteggioLocalServiceUtil.findSorteggiGroupByAnnoMeseSettimana(((Integer)arguments[0]).intValue(), ((Integer)arguments[1]).intValue()); } - if (_methodName213.equals(name) && - Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { + if (_methodName206.equals(name) && + Arrays.deepEquals(_methodParameterTypes206, parameterTypes)) { return SorteggioLocalServiceUtil.countSorteggiGroupByAnnoMeseSettimana(); } - if (_methodName214.equals(name) && - Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { + if (_methodName207.equals(name) && + Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { return SorteggioLocalServiceUtil.countSorteggioMese((java.util.Date)arguments[0], (java.util.Date)arguments[1], (java.util.List)arguments[2], (java.util.List)arguments[3]); } - if (_methodName215.equals(name) && - Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { + if (_methodName208.equals(name) && + Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { return SorteggioLocalServiceUtil.findSorteggioMese((java.util.Date)arguments[0], (java.util.Date)arguments[1], (java.util.List)arguments[2], @@ -576,8 +496,8 @@ public class SorteggioLocalServiceClpInvoker { ((Integer)arguments[5]).intValue()); } - if (_methodName216.equals(name) && - Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { + if (_methodName209.equals(name) && + Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { return SorteggioLocalServiceUtil.findSorteggioAnno((java.util.Date)arguments[0], (java.util.Date)arguments[1], (java.util.List)arguments[2], @@ -586,26 +506,26 @@ public class SorteggioLocalServiceClpInvoker { ((Integer)arguments[5]).intValue()); } - if (_methodName217.equals(name) && - Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { + if (_methodName210.equals(name) && + Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { SorteggioLocalServiceUtil.updateDataSorteggioPraticaEsterna(((Long)arguments[0]).longValue(), (java.util.Date)arguments[1]); return null; } - if (_methodName218.equals(name) && - Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { + if (_methodName211.equals(name) && + Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { return SorteggioLocalServiceUtil.getTecnicoSorteggioPraticaEsterna(((Long)arguments[0]).longValue()); } - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { + if (_methodName212.equals(name) && + Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { return SorteggioLocalServiceUtil.findTipoPraticaIdSorteggioPraticaEsterna(((Long)arguments[0]).longValue()); } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName213.equals(name) && + Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { return SorteggioLocalServiceUtil.search((java.lang.Long)arguments[0], (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Integer)arguments[3]).intValue(), @@ -616,8 +536,8 @@ public class SorteggioLocalServiceClpInvoker { ((Integer)arguments[11]).intValue()); } - if (_methodName221.equals(name) && - Arrays.deepEquals(_methodParameterTypes221, parameterTypes)) { + if (_methodName214.equals(name) && + Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { return SorteggioLocalServiceUtil.count((java.lang.Long)arguments[0], (java.lang.String)arguments[1], (java.lang.String)arguments[2], ((Integer)arguments[3]).intValue(), @@ -691,6 +611,8 @@ public class SorteggioLocalServiceClpInvoker { private String[] _methodParameterTypes202; private String _methodName203; private String[] _methodParameterTypes203; + private String _methodName204; + private String[] _methodParameterTypes204; private String _methodName205; private String[] _methodParameterTypes205; private String _methodName206; @@ -711,18 +633,4 @@ public class SorteggioLocalServiceClpInvoker { private String[] _methodParameterTypes213; private String _methodName214; private String[] _methodParameterTypes214; - private String _methodName215; - private String[] _methodParameterTypes215; - private String _methodName216; - private String[] _methodParameterTypes216; - private String _methodName217; - private String[] _methodParameterTypes217; - private String _methodName218; - private String[] _methodParameterTypes218; - private String _methodName219; - private String[] _methodParameterTypes219; - private String _methodName220; - private String[] _methodParameterTypes220; - private String _methodName221; - private String[] _methodParameterTypes221; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java index cbd05b22..d55de3f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/StoricoSoggettoPraticaLocalServiceClpInvoker.java @@ -121,25 +121,13 @@ public class StoricoSoggettoPraticaLocalServiceClpInvoker { "java.lang.String", "com.liferay.portal.service.ServiceContext" }; - _methodName191 = "addStoricoSoggettoPraticaForImport"; + _methodName191 = "findByIntPratica"; - _methodParameterTypes191 = new String[] { - "long", "java.lang.String", "java.lang.String", - "java.lang.String", "long", - "com.liferay.portal.service.ServiceContext" - }; - - _methodName192 = "fetchByOldStoricoSoggettoPraticaId"; - - _methodParameterTypes192 = new String[] { "long" }; + _methodParameterTypes191 = new String[] { "long", "long", "int", "int" }; - _methodName193 = "findByIntPratica"; + _methodName192 = "countByIntPratica"; - _methodParameterTypes193 = new String[] { "long", "long", "int", "int" }; - - _methodName194 = "countByIntPratica"; - - _methodParameterTypes194 = new String[] { "long", "long" }; + _methodParameterTypes192 = new String[] { "long", "long" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -253,28 +241,14 @@ public class StoricoSoggettoPraticaLocalServiceClpInvoker { if (_methodName191.equals(name) && Arrays.deepEquals(_methodParameterTypes191, parameterTypes)) { - return StoricoSoggettoPraticaLocalServiceUtil.addStoricoSoggettoPraticaForImport(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1], (java.lang.String)arguments[2], - (java.lang.String)arguments[3], - ((Long)arguments[4]).longValue(), - (com.liferay.portal.service.ServiceContext)arguments[5]); - } - - if (_methodName192.equals(name) && - Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { - return StoricoSoggettoPraticaLocalServiceUtil.fetchByOldStoricoSoggettoPraticaId(((Long)arguments[0]).longValue()); - } - - if (_methodName193.equals(name) && - Arrays.deepEquals(_methodParameterTypes193, parameterTypes)) { return StoricoSoggettoPraticaLocalServiceUtil.findByIntPratica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), ((Integer)arguments[3]).intValue()); } - if (_methodName194.equals(name) && - Arrays.deepEquals(_methodParameterTypes194, parameterTypes)) { + if (_methodName192.equals(name) && + Arrays.deepEquals(_methodParameterTypes192, parameterTypes)) { return StoricoSoggettoPraticaLocalServiceUtil.countByIntPratica(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } @@ -324,8 +298,4 @@ public class StoricoSoggettoPraticaLocalServiceClpInvoker { private String[] _methodParameterTypes191; private String _methodName192; private String[] _methodParameterTypes192; - private String _methodName193; - private String[] _methodParameterTypes193; - private String _methodName194; - private String[] _methodParameterTypes194; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java index 11642904..cb903d2c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/TempisticaLocalServiceClpInvoker.java @@ -195,61 +195,57 @@ public class TempisticaLocalServiceClpInvoker { _methodParameterTypes206 = new String[] { "long", "long" }; - _methodName207 = "fetchByOldTempisticaId"; + _methodName207 = "findByIntPratica_Tipo"; - _methodParameterTypes207 = new String[] { "long" }; + _methodParameterTypes207 = new String[] { "long", "java.lang.String" }; - _methodName208 = "findByIntPratica_Tipo"; + _methodName208 = "countPraticheScaduteAutorizzazione"; - _methodParameterTypes208 = new String[] { "long", "java.lang.String" }; + _methodParameterTypes208 = new String[] { "long", "long" }; - _methodName209 = "countPraticheScaduteAutorizzazione"; + _methodName209 = "countPraticheScaduteSorteggiate"; _methodParameterTypes209 = new String[] { "long", "long" }; - _methodName210 = "countPraticheScaduteSorteggiate"; + _methodName210 = "countPraticheScaduteControlloObbligatorio"; _methodParameterTypes210 = new String[] { "long", "long" }; - _methodName211 = "countPraticheScaduteControlloObbligatorio"; + _methodName211 = "countPraticheInScadenzaAutorizzazioni"; _methodParameterTypes211 = new String[] { "long", "long" }; - _methodName212 = "countPraticheInScadenzaAutorizzazioni"; + _methodName212 = "countPraticheInScadenzaSorteggiate"; _methodParameterTypes212 = new String[] { "long", "long" }; - _methodName213 = "countPraticheInScadenzaSorteggiate"; + _methodName213 = "countPraticheInScadenzaControlloObbligatorio"; _methodParameterTypes213 = new String[] { "long", "long" }; - _methodName214 = "countPraticheInScadenzaControlloObbligatorio"; + _methodName214 = "praticheAttiveAutorizzazioni"; _methodParameterTypes214 = new String[] { "long", "long" }; - _methodName215 = "praticheAttiveAutorizzazioni"; + _methodName215 = "praticheAttiveSorteggiate"; _methodParameterTypes215 = new String[] { "long", "long" }; - _methodName216 = "praticheAttiveSorteggiate"; + _methodName216 = "praticheAttiveControlloObbligatorio"; _methodParameterTypes216 = new String[] { "long", "long" }; - _methodName217 = "praticheAttiveControlloObbligatorio"; + _methodName217 = "getDtSottopostaAParere"; - _methodParameterTypes217 = new String[] { "long", "long" }; + _methodParameterTypes217 = new String[] { "long" }; - _methodName218 = "getDtSottopostaAParere"; + _methodName218 = "countPraticheAttivePerDiscriminazione"; - _methodParameterTypes218 = new String[] { "long" }; + _methodParameterTypes218 = new String[] { "long", "long" }; - _methodName219 = "countPraticheAttivePerDiscriminazione"; + _methodName219 = "scadenzePraticheForBackwardCompatibility"; - _methodParameterTypes219 = new String[] { "long", "long" }; - - _methodName220 = "scadenzePraticheForBackwardCompatibility"; - - _methodParameterTypes220 = new String[] { "long", "long", "int", "int" }; + _methodParameterTypes219 = new String[] { "long", "long", "int", "int" }; } public Object invokeMethod(String name, String[] parameterTypes, @@ -470,82 +466,77 @@ public class TempisticaLocalServiceClpInvoker { if (_methodName207.equals(name) && Arrays.deepEquals(_methodParameterTypes207, parameterTypes)) { - return TempisticaLocalServiceUtil.fetchByOldTempisticaId(((Long)arguments[0]).longValue()); + return TempisticaLocalServiceUtil.findByIntPratica_Tipo(((Long)arguments[0]).longValue(), + (java.lang.String)arguments[1]); } if (_methodName208.equals(name) && Arrays.deepEquals(_methodParameterTypes208, parameterTypes)) { - return TempisticaLocalServiceUtil.findByIntPratica_Tipo(((Long)arguments[0]).longValue(), - (java.lang.String)arguments[1]); + return TempisticaLocalServiceUtil.countPraticheScaduteAutorizzazione(((Long)arguments[0]).longValue(), + ((Long)arguments[1]).longValue()); } if (_methodName209.equals(name) && Arrays.deepEquals(_methodParameterTypes209, parameterTypes)) { - return TempisticaLocalServiceUtil.countPraticheScaduteAutorizzazione(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.countPraticheScaduteSorteggiate(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName210.equals(name) && Arrays.deepEquals(_methodParameterTypes210, parameterTypes)) { - return TempisticaLocalServiceUtil.countPraticheScaduteSorteggiate(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.countPraticheScaduteControlloObbligatorio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName211.equals(name) && Arrays.deepEquals(_methodParameterTypes211, parameterTypes)) { - return TempisticaLocalServiceUtil.countPraticheScaduteControlloObbligatorio(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.countPraticheInScadenzaAutorizzazioni(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName212.equals(name) && Arrays.deepEquals(_methodParameterTypes212, parameterTypes)) { - return TempisticaLocalServiceUtil.countPraticheInScadenzaAutorizzazioni(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.countPraticheInScadenzaSorteggiate(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName213.equals(name) && Arrays.deepEquals(_methodParameterTypes213, parameterTypes)) { - return TempisticaLocalServiceUtil.countPraticheInScadenzaSorteggiate(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.countPraticheInScadenzaControlloObbligatorio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName214.equals(name) && Arrays.deepEquals(_methodParameterTypes214, parameterTypes)) { - return TempisticaLocalServiceUtil.countPraticheInScadenzaControlloObbligatorio(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.praticheAttiveAutorizzazioni(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName215.equals(name) && Arrays.deepEquals(_methodParameterTypes215, parameterTypes)) { - return TempisticaLocalServiceUtil.praticheAttiveAutorizzazioni(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.praticheAttiveSorteggiate(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName216.equals(name) && Arrays.deepEquals(_methodParameterTypes216, parameterTypes)) { - return TempisticaLocalServiceUtil.praticheAttiveSorteggiate(((Long)arguments[0]).longValue(), + return TempisticaLocalServiceUtil.praticheAttiveControlloObbligatorio(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } if (_methodName217.equals(name) && Arrays.deepEquals(_methodParameterTypes217, parameterTypes)) { - return TempisticaLocalServiceUtil.praticheAttiveControlloObbligatorio(((Long)arguments[0]).longValue(), - ((Long)arguments[1]).longValue()); + return TempisticaLocalServiceUtil.getDtSottopostaAParere(((Long)arguments[0]).longValue()); } if (_methodName218.equals(name) && Arrays.deepEquals(_methodParameterTypes218, parameterTypes)) { - return TempisticaLocalServiceUtil.getDtSottopostaAParere(((Long)arguments[0]).longValue()); - } - - if (_methodName219.equals(name) && - Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return TempisticaLocalServiceUtil.countPraticheAttivePerDiscriminazione(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue()); } - if (_methodName220.equals(name) && - Arrays.deepEquals(_methodParameterTypes220, parameterTypes)) { + if (_methodName219.equals(name) && + Arrays.deepEquals(_methodParameterTypes219, parameterTypes)) { return TempisticaLocalServiceUtil.scadenzePraticheForBackwardCompatibility(((Long)arguments[0]).longValue(), ((Long)arguments[1]).longValue(), ((Integer)arguments[2]).intValue(), @@ -651,6 +642,4 @@ public class TempisticaLocalServiceClpInvoker { private String[] _methodParameterTypes218; private String _methodName219; private String[] _methodParameterTypes219; - private String _methodName220; - private String[] _methodParameterTypes220; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DettPraticaServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DettPraticaServiceSoap.java index 17a8286b..28ab6cf0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DettPraticaServiceSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/DettPraticaServiceSoap.java @@ -204,12 +204,12 @@ public class DettPraticaServiceSoap { java.lang.String importoSpeseIstruttoria, java.util.Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, - long oldDettPraticaId, java.lang.String destinazione, - java.lang.String ag, java.lang.String descLongIntervento, - java.lang.String via, java.lang.String localita, - java.lang.String estremiCatastali, java.lang.String estremiPratCom, - long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, + java.lang.String destinazione, java.lang.String ag, + java.lang.String descLongIntervento, java.lang.String via, + java.lang.String localita, java.lang.String estremiCatastali, + java.lang.String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, + boolean collaudoStatico, java.lang.String codiceFiscaleDelegatoCommittente, java.lang.String codiceFiscaleDelegatoFineLavori, java.lang.String codiceFiscaleDelegatoCollaudo, @@ -345,11 +345,11 @@ public class DettPraticaServiceSoap { tipoIntegrazione, completa, gestita, codicePagamento, causalePagamento, mezzoPagamento, importoBolli, importoSpeseIstruttoria, dataEffettuazione, statusTask, - workflowForzato, soggettoSostituitoId, oldDettPraticaId, - destinazione, ag, descLongIntervento, via, localita, - estremiCatastali, estremiPratCom, variataDa, - varianteNumero, varianteSostanziale, operaConforme, - collaudoStatico, codiceFiscaleDelegatoCommittente, + workflowForzato, soggettoSostituitoId, destinazione, ag, + descLongIntervento, via, localita, estremiCatastali, + estremiPratCom, variataDa, varianteNumero, + varianteSostanziale, operaConforme, collaudoStatico, + codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java index 5460fa9c..b3a03e45 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/AvvisoServiceImpl.java @@ -1,19 +1,18 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; import it.tref.liferay.portos.bo.model.Avviso; -import it.tref.liferay.portos.bo.service.ComuneLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.AvvisoServiceBaseImpl; import it.tref.liferay.portos.bo.shared.util.Constants; @@ -26,13 +25,12 @@ import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; * The implementation of the avviso remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.AvvisoService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.AvvisoService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -40,28 +38,31 @@ import com.liferay.portal.service.UserGroupRoleLocalServiceUtil; * @see it.tref.liferay.portos.bo.service.AvvisoServiceUtil */ public class AvvisoServiceImpl extends AvvisoServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.AvvisoServiceUtil} to access the avviso remote service. - */ + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link it.tref.liferay.portos.bo.service.AvvisoServiceUtil} + * to access the avviso remote service. + */ - public Avviso rilasciaFirma(long avvisoId, String cf) throws SystemException, PortalException { - Avviso avviso = avvisoPersistence.fetchByPrimaryKey(avvisoId); + @Override + public Avviso rilasciaFirma(long avvisoId, String cf) throws SystemException, PortalException { - if (!avviso.getUserCodiceFiscalePrimaFirma().equalsIgnoreCase(getUser().getScreenName())) { - throw new SystemException("assegnazione non possibile perche' non assengato a " + cf); - } - return avvisoLocalService.rilasciaFirma(avvisoId); - } + Avviso avviso = avvisoPersistence.fetchByPrimaryKey(avvisoId); + if (!avviso.getUserCodiceFiscalePrimaFirma().equalsIgnoreCase(getUser().getScreenName())) { + throw new SystemException("assegnazione non possibile perche' non assengato a " + cf); + } + return avvisoLocalService.rilasciaFirma(avvisoId); + } - public Avviso assegnaFirma(long avvisoId, String cf) throws SystemException, PrincipalException, PortalException { - Avviso avviso = avvisoPersistence.fetchByPrimaryKey(avvisoId); - if (!UserGroupRoleLocalServiceUtil.hasUserGroupRole(getUserId(), avviso.getGroupId(), Constants.ROLE_NAME_FIRMA, - true)) { - throw new SystemException("assegnazione non possibile per problemi di permessi"); - } - return avvisoLocalService.assegnaFirma(avvisoId, cf); - } + @Override + public Avviso assegnaFirma(long avvisoId, String cf) throws SystemException, PrincipalException, PortalException { + + Avviso avviso = avvisoPersistence.fetchByPrimaryKey(avvisoId); + if (!UserGroupRoleLocalServiceUtil.hasUserGroupRole(getUserId(), avviso.getGroupId(), + Constants.ROLE_NAME_FIRMA, true)) { + throw new SystemException("assegnazione non possibile per problemi di permessi"); + } + return avvisoLocalService.assegnaFirma(avvisoId, cf); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java index 8af70e48..e44906db 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/CollaudoLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -56,13 +56,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the collaudo local service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.CollaudoLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.CollaudoLocalService} interface. * *

- * This is a local service. Methods of this service will not have security checks based on the - * propagated JAAS credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -70,398 +69,371 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil */ public class CollaudoLocalServiceImpl extends CollaudoLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil} to access the collaudo local - * service. - */ - private Collaudo initCollaudo(ServiceContext serviceContext) throws PortalException, SystemException { + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil} to access the collaudo local service. + */ + private Collaudo initCollaudo(ServiceContext serviceContext) throws PortalException, SystemException { + + User user = userLocalService.getUser(serviceContext.getUserId()); + Date now = new Date(); + Collaudo collaudo = collaudoPersistence.create(counterLocalService.increment(DettPratica.class.getName())); + collaudo.setCompanyId(serviceContext.getCompanyId()); + collaudo.setGroupId(serviceContext.getScopeGroupId()); + collaudo.setUserId(serviceContext.getUserId()); + collaudo.setUserName(user.getFullName()); + collaudo.setCreateDate(serviceContext.getCreateDate(now)); + collaudo.setModifiedDate(serviceContext.getModifiedDate(now)); + // setto parametri di default + collaudo.setParziale(false); + collaudo.setDataEffettuazione(null); + collaudo.setDataCollaudo(null); + collaudo.setCodiceFiscaleDelegato(StringPool.BLANK); + return collaudo; + } + + @Override + @Indexable(type = IndexableType.REINDEX) + public Collaudo addCollaudo(long intPraticaId, ServiceContext serviceContext) throws PortalException, + SystemException { + + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + Collaudo collaudo = initCollaudo(serviceContext); + collaudo.setGroupId(intPratica.getGroupId()); + collaudo.setIntPraticaId(intPraticaId); + collaudoPersistence.update(collaudo); + return collaudo; + } + + @Override + @Indexable(type = IndexableType.DELETE) + public Collaudo deleteCollaudo(Collaudo collaudo) throws SystemException, PortalException { + + List docPraticas = docPraticaLocalService.findByClassPk(collaudo.getCollaudoId(), + QueryUtil.ALL_POS, QueryUtil.ALL_POS); + for (DocPratica docPratica : docPraticas) { + docPraticaLocalService.deleteDocPratica(docPratica); + } + List pagamenti = pagamentoLocalService.findByClassPk(collaudo.getCollaudoId()); + for (Pagamento pagamento : pagamenti) { + pagamentoLocalService.deletePagamento(pagamento); + } + return super.deleteCollaudo(collaudo); + } + + @Override + @Indexable(type = IndexableType.DELETE) + public Collaudo deleteCollaudo(long collaudoId) throws PortalException, SystemException { + + Collaudo collaudo = collaudoPersistence.findByPrimaryKey(collaudoId); + return deleteCollaudo(collaudo); + } + + @Override + @Indexable(type = IndexableType.REINDEX) + public Collaudo updateCollaudo(long userId, long collaudoId, long intPraticaId, boolean parziale, + boolean completata, Date dataCollaudo, String codiceFiscaleDelegato, boolean normEsenteBollo, + String noteCollaudo) throws NoSuchCollaudoException, SystemException { + + Collaudo collaudo = collaudoPersistence.findByPrimaryKey(collaudoId); + collaudo.setParziale(parziale); + collaudo.setCompletata(completata); + collaudo.setDataCollaudo(dataCollaudo); + collaudo.setCodiceFiscaleDelegato(codiceFiscaleDelegato); + collaudo.setNormEsenteBollo(normEsenteBollo); + collaudo.setNoteCollaudo(noteCollaudo); + collaudo = collaudoPersistence.update(collaudo); + return collaudo; + } + + @Override + public Collaudo getLastEditable(long intPraticaId) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", false)); + dynamicQuery.addOrder(OrderFactoryUtil.desc("collaudoId")); + List collaudoList = dynamicQuery(dynamicQuery, 0, 1); + if (!collaudoList.isEmpty()) + return collaudoList.get(0); + return null; + } + + @Override + public Collaudo getLastCompleted(long intPraticaId) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.addOrder(OrderFactoryUtil.desc("collaudoId")); + List collaudoList = dynamicQuery(dynamicQuery, 0, 1); + if (!collaudoList.isEmpty()) + return collaudoList.get(0); + return null; + } + + @Override + public void updateEsitoPagamento(long pagamentoId, long collaudoId, String stato) throws SystemException, + PortalException { + + updateEsitoPagamento(pagamentoId, collaudoId, 0l, stato); + } + + @Override + public void updateEsitoPagamento(long pagamentoId, long collaudoId, long fileEntryId, String stato) + throws SystemException, PortalException { + + Date now = new Date(); + Collaudo collaudo = collaudoPersistence.fetchByPrimaryKey(collaudoId); + collaudo.setModifiedDate(now); + if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) { + collaudo.setCompletata(true); + collaudo.setDataEffettuazione(now); + collaudo.setNumero(collaudoPersistence.countByIntPraticaId_Completata(collaudo.getIntPraticaId(), true) + 1); + collaudo = updateCollaudo(collaudo); + updateIntPraticaStatus(collaudo, collaudo.getIntPraticaId()); + docPraticaLocalService.completeInvalidation(collaudo.getIntPraticaId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(collaudo.getIntPraticaId()); + if (WorkflowUtil.isWorkflowDisattivabile(collaudo.getIntPraticaId()) + && Validator.isNotNull(intPratica.getStatusByUserId())) { + inviaMailnotifica(collaudoId, intPratica.getStatusByUserId(), now); + } + pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); + } else if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) + || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA) + || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_ANNULLATO)) { + pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); + } + } + + @Override + public Collaudo updateEsito(long collaudoId, int stato) throws SystemException, PortalException { + + Date now = new Date(); + Collaudo collaudo = collaudoPersistence.fetchByPrimaryKey(collaudoId); + collaudo.setModifiedDate(now); + collaudo.setCompletata(true); + collaudo.setDataEffettuazione(now); + collaudo.setNumero(collaudoPersistence.countByIntPraticaId_Completata(collaudo.getIntPraticaId(), true) + 1); + collaudo = updateCollaudo(collaudo); + updateIntPraticaStatus(collaudo, collaudo.getIntPraticaId()); + docPraticaLocalService.completeInvalidation(collaudo.getIntPraticaId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(collaudo.getIntPraticaId()); + if (WorkflowUtil.isWorkflowDisattivabile(collaudo.getIntPraticaId()) + && Validator.isNotNull(intPratica.getStatusByUserId())) { + inviaMailnotifica(collaudoId, intPratica.getStatusByUserId(), now); + } + return collaudo; + } + + private void inviaMailnotifica(long collaudoId, long tecnicoIstruttoreId, Date date) throws SystemException, + PortalException { + + Collaudo collaudo = collaudoPersistence.fetchByPrimaryKey(collaudoId); + User tecnicoIstruttore = userLocalService.getUser(tecnicoIstruttoreId); + String[] to = { tecnicoIstruttore.getEmailAddress() }; + String[] cc = new String[0]; + String[] ccn = new String[0]; + String tipoPratica = StringPool.BLANK; + long intPraticaId = collaudo.getIntPraticaId(); + if (AzioniPraticheUtil.isDeposito(intPraticaId)) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); + } else if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); + } + JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); + templateVariables.put("receiver", tecnicoIstruttore.getFullName()); + templateVariables.put("tipoPratica", tipoPratica); + templateVariables.put("tipoOggetto", + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + (collaudo.getParziale() ? "10" : "08"))); + templateVariables.put("dataInvio", + FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(date)); + ServiceContext serviceContext = new ServiceContext(); + serviceContext.setScopeGroupId(collaudo.getGroupId()); + serviceContext.setCompanyId(collaudo.getCompanyId()); + serviceContext.setUserId(collaudo.getUserId()); + MailUtil.invioMailNotifica(collaudo.getIntPraticaId(), 0l, collaudoId, Collaudo.class.getName(), to, cc, ccn, + "NOTIFICA-BO", templateVariables, null, serviceContext); + } + + private IntPratica updateIntPraticaStatus(Collaudo collaudo, long intPraticaId) throws PortalException, + SystemException { + + IntPratica intPratica = intPraticaLocalService.getIntPratica(collaudo.getIntPraticaId()); + if (collaudo.isParziale()) { + intPratica.setCollaudoParziale(true); + } else { + intPratica.setCollaudoTotale(true); + } + intPratica = intPraticaLocalService.updateIntPratica(intPratica); + return intPratica; + } + + @Override + public Collaudo updateCollaudoProtocollo(long collaudoId, String protocollo) throws PortalException, + SystemException { + + Collaudo collaudo = collaudoLocalService.fetchCollaudo(collaudoId); + collaudo.setModifiedDate(new Date()); + collaudo.setProtocollo(protocollo); + collaudo.setDtProtocollo(new Date()); + collaudo = collaudoLocalService.updateCollaudo(collaudo); + return collaudo; + } + + @Override + public Collaudo findByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, + SystemException { + + return collaudoPersistence.findByC_G_Protocollo(companyId, groupId, protocollo); + } + + @Override + public Collaudo fetchByProtocollo(String protocollo) throws PortalException, SystemException { + + return collaudoPersistence.fetchByProtocollo(protocollo); + } + + @Override + public Collaudo pagaInvia(long collaudoId, String codiceFiscaleCommittente, String currentURL, + ServiceContext serviceContext) throws SystemException, PortalException { + + Collaudo collaudo = collaudoPersistence.findByPrimaryKey(collaudoId); + BigDecimal importoBolli = PagamentiCommonUtil.getImportoBolli(collaudo.getCompanyId(), + collaudo.getCollaudoId(), Collaudo.class.getName(), TipoIntegrazioneUtil.COLLAUDO); + collaudo.setImportoBolli(importoBolli.toString()); + collaudo = updateCollaudo(collaudo); + PagamentiUtil.nuovoPagamento(currentURL, collaudo.getCollaudoId(), Collaudo.class.getName(), + PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); + return collaudo; + } + + @Override + public List findByIntPraticaId(long intPraticaId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + + return collaudoPersistence.findByIntPraticaId(intPraticaId, start, end, orderByComparator); + } + + @Override + public int countByIntPraticaId(long intPraticaId) throws SystemException { + + return collaudoPersistence.countByIntPraticaId(intPraticaId); + } + + @Override + public List findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return collaudoPersistence.findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator); + } + + @Override + public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException { + + return collaudoPersistence.countByIntPraticaId_Parziale(intPraticaId, parziale); + } + + @Override + public List findByIntPraticaId_Completata(long intPraticaId, boolean completata, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return collaudoPersistence.findByIntPraticaId_Completata(intPraticaId, completata, start, end, + orderByComparator); + } + + @Override + public int countByIntPraticaId_Completata(long intPraticaId, boolean completata) throws SystemException { + + return collaudoPersistence.countByIntPraticaId_Completata(intPraticaId, completata); + } + + @Override + public List findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start, + int end, OrderByComparator orderByComparator) throws SystemException { + + return collaudoPersistence.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end, + orderByComparator); + } + + @Override + public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException { + + return collaudoPersistence.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata); + } + + @Override + public List findByIntPraticaId_Parziale_leCollaudoId(long collaudoId, long intPraticaId, + boolean parziale, int start, int end, OrderByComparator orderByComparator) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.lt("collaudoId", collaudoId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); + return dynamicQuery(dynamicQuery, start, end, orderByComparator); + } + + @Override + public int countByIntPraticaId_Parziale_leCollaudoId(long collaudoId, long intPraticaId, boolean parziale) + throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.lt("collaudoId", collaudoId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); + List results = dynamicQuery(dynamicQuery); + return results.size(); + } + + @Override + public List findCollaudiCompletiNotProtocollo(int start, int end) throws SystemException { + + DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotProtocollo(); + dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); + return collaudoPersistence.findWithDynamicQuery(dynamicQuery, start, end); + } + + @Override + public int countCollaudiCompletiNotProtocollo() throws SystemException { + + DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotProtocollo(); + return (int) collaudoPersistence.countWithDynamicQuery(dynamicQuery); + } + + private DynamicQuery getDynamicQueryCollaudiCompletiNotProtocollo() { + + DynamicQuery dynamicQuery = collaudoLocalService.dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); + Disjunction or = RestrictionsFactoryUtil.disjunction(); + or.add(RestrictionsFactoryUtil.eq("protocollo", StringPool.BLANK)); + or.add(RestrictionsFactoryUtil.isNull("protocollo")); + dynamicQuery.add(or); + return dynamicQuery; + } - User user = userLocalService.getUser(serviceContext.getUserId()); - - Date now = new Date(); - - Collaudo collaudo = collaudoPersistence.create(counterLocalService.increment(DettPratica.class.getName())); - - collaudo.setCompanyId(serviceContext.getCompanyId()); - collaudo.setGroupId(serviceContext.getScopeGroupId()); - collaudo.setUserId(serviceContext.getUserId()); - collaudo.setUserName(user.getFullName()); - collaudo.setCreateDate(serviceContext.getCreateDate(now)); - collaudo.setModifiedDate(serviceContext.getModifiedDate(now)); - - // setto parametri di default - collaudo.setParziale(false); - collaudo.setDataEffettuazione(null); - collaudo.setDataCollaudo(null); - collaudo.setCodiceFiscaleDelegato(StringPool.BLANK); + @Override + public List findCollaudiCompletiNotGestiti(int start, int end) throws SystemException { - - return collaudo; - } - - @Indexable(type = IndexableType.REINDEX) - public Collaudo addCollaudo(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - - Collaudo collaudo = initCollaudo(serviceContext); - - collaudo.setGroupId(intPratica.getGroupId()); - collaudo.setIntPraticaId(intPraticaId); - - collaudoPersistence.update(collaudo); - return collaudo; - } - - @Override - @Indexable(type = IndexableType.DELETE) - public Collaudo deleteCollaudo(Collaudo collaudo) throws SystemException, PortalException { - - List docPraticas = - docPraticaLocalService.findByClassPk(collaudo.getCollaudoId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS); - for (DocPratica docPratica : docPraticas) { - docPraticaLocalService.deleteDocPratica(docPratica); - } - - List pagamenti = pagamentoLocalService.findByClassPk(collaudo.getCollaudoId()); - for (Pagamento pagamento : pagamenti) { - pagamentoLocalService.deletePagamento(pagamento); - } - - return super.deleteCollaudo(collaudo); - } - - @Override - @Indexable(type = IndexableType.DELETE) - public Collaudo deleteCollaudo(long collaudoId) throws PortalException, SystemException { - - Collaudo collaudo = collaudoPersistence.findByPrimaryKey(collaudoId); - - return deleteCollaudo(collaudo); - } - - @Indexable(type = IndexableType.REINDEX) - public Collaudo updateCollaudo(long userId, long collaudoId, long intPraticaId, boolean parziale, boolean completata, - Date dataCollaudo, String codiceFiscaleDelegato, boolean normEsenteBollo, String noteCollaudo) - throws NoSuchCollaudoException, SystemException { - - Collaudo collaudo = collaudoPersistence.findByPrimaryKey(collaudoId); - - collaudo.setParziale(parziale); - collaudo.setCompletata(completata); - collaudo.setDataCollaudo(dataCollaudo); - collaudo.setCodiceFiscaleDelegato(codiceFiscaleDelegato); - collaudo.setNormEsenteBollo(normEsenteBollo); - collaudo.setNoteCollaudo(noteCollaudo); - - collaudo = collaudoPersistence.update(collaudo); - - return collaudo; - } - - public Collaudo getLastEditable(long intPraticaId) throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", false)); - dynamicQuery.addOrder(OrderFactoryUtil.desc("collaudoId")); - List collaudoList = dynamicQuery(dynamicQuery, 0, 1); - if (!collaudoList.isEmpty()) return collaudoList.get(0); - return null; - } - - public Collaudo getLastCompleted(long intPraticaId) throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.addOrder(OrderFactoryUtil.desc("collaudoId")); - List collaudoList = dynamicQuery(dynamicQuery, 0, 1); - if (!collaudoList.isEmpty()) return collaudoList.get(0); - return null; - } - - public void updateEsitoPagamento(long pagamentoId, long collaudoId, String stato) throws SystemException, - PortalException { - - updateEsitoPagamento(pagamentoId, collaudoId, 0l, stato); - } - - public void updateEsitoPagamento(long pagamentoId, long collaudoId, long fileEntryId, String stato) - throws SystemException, PortalException { - - Date now = new Date(); - Collaudo collaudo = collaudoPersistence.fetchByPrimaryKey(collaudoId); - - collaudo.setModifiedDate(now); - if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) { - - collaudo.setCompletata(true); - collaudo.setDataEffettuazione(now); - collaudo.setNumero(collaudoPersistence.countByIntPraticaId_Completata(collaudo.getIntPraticaId(), true) + 1); - collaudo = updateCollaudo(collaudo); - - updateIntPraticaStatus(collaudo, collaudo.getIntPraticaId()); - - docPraticaLocalService.completeInvalidation(collaudo.getIntPraticaId()); - - IntPratica intPratica = intPraticaLocalService.getIntPratica(collaudo.getIntPraticaId()); - if (WorkflowUtil.isWorkflowDisattivabile(collaudo.getIntPraticaId()) - && Validator.isNotNull(intPratica.getStatusByUserId())) { - inviaMailnotifica(collaudoId, intPratica.getStatusByUserId(), now); - } - pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); - - } else if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) - || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA) - || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_ANNULLATO)) { - pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); - } - - } - - public Collaudo updateEsito(long collaudoId, int stato) throws SystemException, PortalException { - - Date now = new Date(); - Collaudo collaudo = collaudoPersistence.fetchByPrimaryKey(collaudoId); - collaudo.setModifiedDate(now); - - collaudo.setCompletata(true); - collaudo.setDataEffettuazione(now); - collaudo.setNumero(collaudoPersistence.countByIntPraticaId_Completata(collaudo.getIntPraticaId(), true) + 1); - collaudo = updateCollaudo(collaudo); - - updateIntPraticaStatus(collaudo, collaudo.getIntPraticaId()); - - docPraticaLocalService.completeInvalidation(collaudo.getIntPraticaId()); - - IntPratica intPratica = intPraticaLocalService.getIntPratica(collaudo.getIntPraticaId()); - if (WorkflowUtil.isWorkflowDisattivabile(collaudo.getIntPraticaId()) - && Validator.isNotNull(intPratica.getStatusByUserId())) { - inviaMailnotifica(collaudoId, intPratica.getStatusByUserId(), now); - } - - return collaudo; - } - - private void inviaMailnotifica(long collaudoId, long tecnicoIstruttoreId, Date date) throws SystemException, - PortalException { - - Collaudo collaudo = collaudoPersistence.fetchByPrimaryKey(collaudoId); - - User tecnicoIstruttore = userLocalService.getUser(tecnicoIstruttoreId); - - String[] to = {tecnicoIstruttore.getEmailAddress()}; - String[] cc = new String[0]; - String[] ccn = new String[0]; - - String tipoPratica = StringPool.BLANK; - long intPraticaId = collaudo.getIntPraticaId(); - if (AzioniPraticheUtil.isDeposito(intPraticaId)) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); - } else if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); - } - - JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); - templateVariables.put("receiver", tecnicoIstruttore.getFullName()); - templateVariables.put("tipoPratica", tipoPratica); - templateVariables.put("tipoOggetto", LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" - + (collaudo.getParziale() ? "10" : "08"))); - templateVariables.put("dataInvio", FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(date)); - - ServiceContext serviceContext = new ServiceContext(); - serviceContext.setScopeGroupId(collaudo.getGroupId()); - serviceContext.setCompanyId(collaudo.getCompanyId()); - serviceContext.setUserId(collaudo.getUserId()); - - MailUtil.invioMailNotifica(collaudo.getIntPraticaId(), 0l, collaudoId, Collaudo.class.getName(), to, cc, ccn, - "NOTIFICA-BO", templateVariables, null, serviceContext); - } - - private IntPratica updateIntPraticaStatus(Collaudo collaudo, long intPraticaId) throws PortalException, - SystemException { - - IntPratica intPratica = intPraticaLocalService.getIntPratica(collaudo.getIntPraticaId()); - if (collaudo.isParziale()) { - intPratica.setCollaudoParziale(true); - } else { - intPratica.setCollaudoTotale(true); - } - intPratica = intPraticaLocalService.updateIntPratica(intPratica); - return intPratica; - } - - public Collaudo updateCollaudoProtocollo(long collaudoId, String protocollo) throws PortalException, SystemException { - - Collaudo collaudo = collaudoLocalService.fetchCollaudo(collaudoId); - collaudo.setModifiedDate(new Date()); - collaudo.setProtocollo(protocollo); - collaudo.setDtProtocollo(new Date()); - collaudo = collaudoLocalService.updateCollaudo(collaudo); - - return collaudo; - } - - public Collaudo findByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, - SystemException { - - return collaudoPersistence.findByC_G_Protocollo(companyId, groupId, protocollo); - } - - public Collaudo fetchByProtocollo(String protocollo) throws PortalException, SystemException { - - return collaudoPersistence.fetchByProtocollo(protocollo); - } - - public Collaudo pagaInvia(long collaudoId, String codiceFiscaleCommittente, String currentURL, - ServiceContext serviceContext) throws SystemException, PortalException { - - Collaudo collaudo = collaudoPersistence.findByPrimaryKey(collaudoId); - - BigDecimal importoBolli = - PagamentiCommonUtil.getImportoBolli(collaudo.getCompanyId(), collaudo.getCollaudoId(), - Collaudo.class.getName(), TipoIntegrazioneUtil.COLLAUDO); - - collaudo.setImportoBolli(importoBolli.toString()); - collaudo = updateCollaudo(collaudo); - - PagamentiUtil.nuovoPagamento(currentURL, collaudo.getCollaudoId(), Collaudo.class.getName(), - PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); - - return collaudo; - } - - public List findByIntPraticaId(long intPraticaId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { - - return collaudoPersistence.findByIntPraticaId(intPraticaId, start, end, orderByComparator); - } - - public int countByIntPraticaId(long intPraticaId) throws SystemException { - - return collaudoPersistence.countByIntPraticaId(intPraticaId); - } - - public List findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - - return collaudoPersistence.findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator); - } - - public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException { - - return collaudoPersistence.countByIntPraticaId_Parziale(intPraticaId, parziale); - } - - public List findByIntPraticaId_Completata(long intPraticaId, boolean completata, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - - return collaudoPersistence.findByIntPraticaId_Completata(intPraticaId, completata, start, end, orderByComparator); - } - - public int countByIntPraticaId_Completata(long intPraticaId, boolean completata) throws SystemException { - - return collaudoPersistence.countByIntPraticaId_Completata(intPraticaId, completata); - } - - public List findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start, - int end, OrderByComparator orderByComparator) throws SystemException { - - return collaudoPersistence.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end, - orderByComparator); - } - - public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException { - - return collaudoPersistence.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata); - } - - public List findByIntPraticaId_Parziale_leCollaudoId(long collaudoId, long intPraticaId, boolean parziale, - int start, int end, OrderByComparator orderByComparator) throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.lt("collaudoId", collaudoId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); - - return dynamicQuery(dynamicQuery, start, end, orderByComparator); - } - - public int countByIntPraticaId_Parziale_leCollaudoId(long collaudoId, long intPraticaId, boolean parziale) - throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.lt("collaudoId", collaudoId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); - - List results = dynamicQuery(dynamicQuery); - return results.isEmpty() ? 0 : results.size(); - } - - public List findCollaudiCompletiNotProtocollo(int start, int end) throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotProtocollo(); - dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); - return collaudoPersistence.findWithDynamicQuery(dynamicQuery, start, end); - } - - public int countCollaudiCompletiNotProtocollo() throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotProtocollo(); - return (int) collaudoPersistence.countWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery getDynamicQueryCollaudiCompletiNotProtocollo() { - - DynamicQuery dynamicQuery = collaudoLocalService.dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); - Disjunction or = RestrictionsFactoryUtil.disjunction(); - or.add(RestrictionsFactoryUtil.eq("protocollo", StringPool.BLANK)); - or.add(RestrictionsFactoryUtil.isNull("protocollo")); - dynamicQuery.add(or); - return dynamicQuery; - } - - public List findCollaudiCompletiNotGestiti(int start, int end) throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotGestiti(); - dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); - return collaudoPersistence.findWithDynamicQuery(dynamicQuery, start, end); - } - - public int countCollaudiCompletiNotGestiti() throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotGestiti(); - return (int) collaudoPersistence.countWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery getDynamicQueryCollaudiCompletiNotGestiti() { - - DynamicQuery dynamicQuery = collaudoLocalService.dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); - dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("protocollo")); - return dynamicQuery; - } - - // public List findIntPraticaByCodiceFiscaleSoggetto(String codiceFiscale) throws - // PortalException, SystemException { - // - // DynamicQuery dynamicQuery = collaudoLocalService.dynamicQuery(); - // dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscale", codiceFiscale)); - // dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); - // List ids = collaudoPersistence.findWithDynamicQuery(dynamicQuery); - // - // return ids; - // } - - public Collaudo fetchByOldDettPraticaId(long oldDettPraticaId) throws SystemException { - - return collaudoPersistence.fetchByOldDettPraticaId(oldDettPraticaId); - } + DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotGestiti(); + dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); + return collaudoPersistence.findWithDynamicQuery(dynamicQuery, start, end); + } + + @Override + public int countCollaudiCompletiNotGestiti() throws SystemException { + + DynamicQuery dynamicQuery = getDynamicQueryCollaudiCompletiNotGestiti(); + return (int) collaudoPersistence.countWithDynamicQuery(dynamicQuery); + } + + private DynamicQuery getDynamicQueryCollaudiCompletiNotGestiti() { + + DynamicQuery dynamicQuery = collaudoLocalService.dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); + dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); + dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("protocollo")); + return dynamicQuery; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java index f5ce2446..652330e8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ComunicazioneServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -23,13 +23,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the comunicazione remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.ComunicazioneService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.ComunicazioneService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -37,21 +36,24 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil */ public class ComunicazioneServiceImpl extends ComunicazioneServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil} to access the comunicazione remote - * service. - */ - - public Comunicazione addComunicazione(long userId, long intPraticaId, String domanda, ServiceContext serviceContext) - throws SystemException, PortalException { - return comunicazioneLocalService.addComunicazione(userId, intPraticaId, domanda, serviceContext); - } - - public Comunicazione updateComunicazione(long comunicazioneId, String risposta) throws SystemException, - PortalException { - return comunicazioneLocalService.updateComunicazione(comunicazioneId, risposta); - } + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil} to access the comunicazione remote service. + */ + + @Override + public Comunicazione addComunicazione(long userId, long intPraticaId, String domanda, ServiceContext serviceContext) + throws SystemException, PortalException { + + return comunicazioneLocalService.addComunicazione(userId, intPraticaId, domanda, serviceContext); + } + + @Override + public Comunicazione updateComunicazione(long comunicazioneId, String risposta) throws SystemException, + PortalException { + + return comunicazioneLocalService.updateComunicazione(comunicazioneId, risposta); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java index 85a6f643..44aea9b4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ConfigurazioneLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -29,13 +29,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the configurazione local service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.ConfigurazioneLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.ConfigurazioneLocalService} interface. * *

- * This is a local service. Methods of this service will not have security checks based on the - * propagated JAAS credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -43,80 +42,83 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil */ public class ConfigurazioneLocalServiceImpl extends ConfigurazioneLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil} to access the configurazione - * local service. - */ - private static final Log _log = LogFactoryUtil.getLog(ConfigurazioneLocalServiceImpl.class); + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.ConfigurazioneLocalServiceUtil} to access the configurazione local service. + */ + private static final Log _log = LogFactoryUtil.getLog(ConfigurazioneLocalServiceImpl.class); - public long findByC_ChiaveLong(long companyId, String chiave) throws SystemException { + @Override + public long findByC_ChiaveLong(long companyId, String chiave) throws SystemException { - try { - Configurazione configurazione = configurazionePersistence.fetchByC_Chiave(companyId, chiave); - if (configurazione == null) { - return 0L; - } - return Long.parseLong(configurazione.getValore()); - } catch (NumberFormatException e) { - return 0L; - } - } + try { + Configurazione configurazione = configurazionePersistence.fetchByC_Chiave(companyId, chiave); + if (configurazione == null) { + return 0L; + } + return Long.parseLong(configurazione.getValore()); + } catch (NumberFormatException e) { + return 0L; + } + } - public String findByC_ChiaveString(long companyId, String chiave) throws SystemException { + @Override + public String findByC_ChiaveString(long companyId, String chiave) throws SystemException { - Configurazione configurazione = configurazionePersistence.fetchByC_Chiave(companyId, chiave); - if (configurazione == null) { - return StringPool.BLANK; - } else if (configurazione.getValore() == null) { - return StringPool.BLANK; - } - return configurazione.getValore(); - } + Configurazione configurazione = configurazionePersistence.fetchByC_Chiave(companyId, chiave); + if (configurazione == null) { + return StringPool.BLANK; + } else if (configurazione.getValore() == null) { + return StringPool.BLANK; + } + return configurazione.getValore(); + } - public Configurazione storeConfig(String chiave, String valore, ServiceContext serviceContext) - throws SystemException, PortalException { + @Override + public Configurazione storeConfig(String chiave, String valore, ServiceContext serviceContext) + throws SystemException, PortalException { - Configurazione configurazione = null; - try { - configurazione = configurazionePersistence.findByC_Chiave(serviceContext.getCompanyId(), chiave); - } catch (NoSuchConfigurazioneException e) { - } - if (configurazione == null) { - configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class.getName())); - configurazione.setChiave(chiave); - configurazione.setCompanyId(serviceContext.getCompanyId()); - configurazione.setCreateDate(new Date()); - configurazione.setGroupId(serviceContext.getScopeGroupId()); - configurazione.setUserId(serviceContext.getUserId()); - configurazione.setUserName(userLocalService.getUser(serviceContext.getUserId()).getFullName()); - } - configurazione.setValore(valore); - return configurazioneLocalService.updateConfigurazione(configurazione); - } + Configurazione configurazione = null; + try { + configurazione = configurazionePersistence.findByC_Chiave(serviceContext.getCompanyId(), chiave); + } catch (NoSuchConfigurazioneException e) { + } + if (configurazione == null) { + configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class.getName())); + configurazione.setChiave(chiave); + configurazione.setCompanyId(serviceContext.getCompanyId()); + configurazione.setCreateDate(new Date()); + configurazione.setGroupId(serviceContext.getScopeGroupId()); + configurazione.setUserId(serviceContext.getUserId()); + configurazione.setUserName(userLocalService.getUser(serviceContext.getUserId()).getFullName()); + } + configurazione.setValore(valore); + return configurazioneLocalService.updateConfigurazione(configurazione); + } - public long getAndIncrement(long companyId, String chiave) throws SystemException { + @Override + public long getAndIncrement(long companyId, String chiave) throws SystemException { - try { - Configurazione configurazione = configurazionePersistence.findByC_Chiave(companyId, chiave); - long current = Long.parseLong(configurazione.getValore()); - configurazione.setValore(String.valueOf((current + 1))); - configurazioneLocalService.updateConfigurazione(configurazione); - return current; - } catch (NoSuchConfigurazioneException e) { - Configurazione configurazione = - createConfigurazione(counterLocalService.increment(Configurazione.class.getName())); - configurazione.setChiave(chiave); - configurazione.setCompanyId(companyId); - configurazione.setCreateDate(new Date()); - configurazione.setGroupId(-1); - configurazione.setUserId(0l); - configurazione.setValore("2"); - configurazioneLocalService.updateConfigurazione(configurazione); - return 1l; - } catch (NumberFormatException e) { - _log.error("error", e); - throw new SystemException("Errore imprevisto", e); - } - } + try { + Configurazione configurazione = configurazionePersistence.findByC_Chiave(companyId, chiave); + long current = Long.parseLong(configurazione.getValore()); + configurazione.setValore(String.valueOf((current + 1))); + configurazioneLocalService.updateConfigurazione(configurazione); + return current; + } catch (NoSuchConfigurazioneException e) { + Configurazione configurazione = createConfigurazione(counterLocalService.increment(Configurazione.class + .getName())); + configurazione.setChiave(chiave); + configurazione.setCompanyId(companyId); + configurazione.setCreateDate(new Date()); + configurazione.setGroupId(-1); + configurazione.setUserId(0l); + configurazione.setValore("2"); + configurazioneLocalService.updateConfigurazione(configurazione); + return 1l; + } catch (NumberFormatException e) { + _log.error("error", e); + throw new SystemException("Errore imprevisto", e); + } + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java index d70daed9..c5837de6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/ControlloPraticaLocalServiceImpl.java @@ -60,6 +60,8 @@ import com.liferay.portal.kernel.json.JSONObject; import com.liferay.portal.kernel.json.JSONSerializer; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.search.Indexable; +import com.liferay.portal.kernel.search.IndexableType; import com.liferay.portal.kernel.search.Indexer; import com.liferay.portal.kernel.search.IndexerRegistryUtil; import com.liferay.portal.kernel.util.ContentTypes; @@ -108,36 +110,28 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi private static final Log _log = LogFactoryUtil.getLog(ControlloPraticaLocalServiceImpl.class); @Override + @Indexable(type = IndexableType.REINDEX) public ControlloPratica addControlloPratica(long groupId, long userId, long intPraticaId, long dettPraticaId, boolean updateFlagControlloObbligatorio, ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - long controlloPraticaId = counterLocalService.increment(ControlloPratica.class.getName()); - ControlloPratica entry = controlloPraticaPersistence.create(controlloPraticaId); - entry.setCompanyId(user.getCompanyId()); entry.setUserId(user.getUserId()); entry.setUserName(user.getFullName()); - _log.info("User Full Name: " + user.getFullName()); entry.setCreateDate(serviceContext.getCreateDate(now)); entry.setModifiedDate(serviceContext.getModifiedDate(now)); - entry.setGroupId(groupId); entry.setIntPraticaId(intPraticaId); entry.setDettPraticaId(dettPraticaId); // Workflow entry.setStatus(WorkflowConstants.STATUS_DRAFT); - controlloPraticaPersistence.update(entry); - // Resources resourceLocalService.addModelResources(entry, serviceContext); - // aggiorno int e dett pratica per avvio workflow IntPratica intPratica = intPraticaLocalService.updateStatoPratica(intPraticaId, StatoPraticaConstants.SOTTOPOSTA_A_PARERE); @@ -145,62 +139,50 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi intPratica.setControlloObbligatorio(true); intPratica = intPraticaLocalService.updateIntPratica(intPratica); } - // Asset updateAsset(userId, entry, serviceContext.getAssetCategoryIds(), serviceContext.getAssetTagNames(), serviceContext.getAssetLinkEntryIds(), now); - // ADT: BUG BO GESTIONE WORKFLOW Map wfContextMap = new HashMap(); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); if (dettPratica != null && dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) { wfContextMap.put("wf_variante", "OK"); } - // /////////// - // Workflow WorkflowHandlerRegistryUtil.startWorkflowInstance(entry.getCompanyId(), entry.getGroupId(), entry.getUserId(), ControlloPratica.class.getName(), entry.getPrimaryKey(), entry, serviceContext, wfContextMap); - Date dtInvio = null; if (intPratica.getDtSorteggio() != null) { dtInvio = intPratica.getDtSorteggio(); } else { dtInvio = entry.getCreateDate(); } - TempisticaLocalServiceUtil.addTempistica(intPraticaId, dettPraticaId, TempisticaConstants.TIPO_PRATICA, dtInvio, serviceContext); - return entry; } @Override + @Indexable(type = IndexableType.DELETE) public ControlloPratica deleteControlloPratica(long controlloPraticaId) throws PortalException, SystemException { ControlloPratica entry = controlloPraticaPersistence.findByPrimaryKey(controlloPraticaId); - return deleteControlloPratica(entry); } @Override + @Indexable(type = IndexableType.DELETE) public ControlloPratica deleteControlloPratica(ControlloPratica entry) throws SystemException, PortalException { // Resources resourceLocalService.deleteResource(entry.getCompanyId(), ControlloPratica.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL, entry.getControlloPraticaId()); - // Asset - deleteAsset(entry); - // Workflow - workflowInstanceLinkLocalService.deleteWorkflowInstanceLinks(entry.getCompanyId(), entry.getGroupId(), ControlloPratica.class.getName(), entry.getControlloPraticaId()); - controlloPraticaPersistence.remove(entry); - return entry; } @@ -221,26 +203,20 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi long[] assetLinkEntryIds, Date now) throws PortalException, SystemException { boolean visible = false; - try { - AssetEntry assetEntry = assetEntryLocalService.getEntry(ControlloPratica.class.getName(), entry.getControlloPraticaId()); - if (assetEntry != null) { visible = assetEntry.isVisible(); } - } catch (NoSuchEntryException e) { // do nothing } - AssetEntry assetEntry = assetEntryLocalService.updateEntry(userId, entry.getGroupId(), now, now, ControlloPratica.class.getName(), entry.getControlloPraticaId(), entry.getUuid(), 0, assetCategoryIds, assetTagNames, visible, null, null, null, null, ContentTypes.TEXT_PLAIN, String.valueOf(entry.getPrimaryKey()), String.valueOf(entry.getPrimaryKey()), null, null, 0, 0, null, false); - assetLinkLocalService.updateLinks(userId, assetEntry.getEntryId(), assetLinkEntryIds, AssetLinkConstants.TYPE_RELATED); } @@ -252,23 +228,19 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi } @Override + @Indexable(type = IndexableType.REINDEX) public ControlloPratica updateStatus(long userId, long resourcePrimKey, int status, ServiceContext serviceContext, List wfNewListVarianti) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); Date now = new Date(); - ControlloPratica entry = controlloPraticaPersistence.findByPrimaryKey(resourcePrimKey); - entry.setStatus(status); entry.setStatusByUserId(userId); entry.setStatusByUserName(user.getFullName()); entry.setStatusDate(serviceContext.getModifiedDate(now)); - intPraticaLocalService.updateStatus(entry.getIntPraticaId(), status); - if (status == WorkflowConstants.STATUS_APPROVED) { - assetEntryLocalService.updateVisible(ControlloPratica.class.getName(), resourcePrimKey, true); IntPratica intPratica = intPraticaLocalService.getIntPratica(entry.getIntPraticaId()); List successivePratiche = dettPraticaLocalService @@ -283,7 +255,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi avvioWorkflow = true; } } - if (avvioWorkflow) { ServiceContext serviceContextNuovo = (ServiceContext) serviceContext.clone(); serviceContextNuovo.setScopeGroupId(entry.getGroupId()); @@ -292,20 +263,15 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi ControlloPratica cp = addControlloPratica(entry.getGroupId(), userId, lastDettPratica.getIntPraticaId(), lastDettPratica.getDettPraticaId(), false, serviceContextNuovo); - // ADT: bug BO id=7 GESTIONE WORKFLOW - // ControlloPraticaLocalServiceUtil.gestioneWFVarianti(cp); wfNewListVarianti.add(cp); } } else { assetEntryLocalService.updateVisible(ControlloPratica.class.getName(), resourcePrimKey, false); } - entry = controlloPraticaPersistence.update(entry); - Indexer indexer = IndexerRegistryUtil.getIndexer(ControlloPratica.class); indexer.reindex(entry); - return entry; } @@ -315,68 +281,47 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); - ServiceContext serviceContext = new ServiceContext(); serviceContext.setCompanyId(controlloPratica.getCompanyId()); serviceContext.setScopeGroupId(controlloPratica.getGroupId()); serviceContext.setUserId(controlloPratica.getUserId()); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(dettPratica.getIntPraticaId()); - String userCodiceFiscale = GestioneFirmeUtil.getCodiceFiscaleFirma(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), intPratica.getStatoPratica()); - if (Validator.isNull(intPratica.getDtSorteggio()) || !intPratica.getStatoPratica().equalsIgnoreCase(StatoPraticaConstants.CONFORME)) { avvisoLocalService.createStandardAvvisoPratica(intPratica, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext, tipoAvviso, userCodiceFiscale, jsonParams, controlloPraticaId); } - return true; } - @Override - @Deprecated - public boolean updateStatoPraticaGeneraDocumentoFinale(long controlloPraticaId, String jsonParams, - long userIdFirma, Map workflowContext) throws PortalException, SystemException { - - return generaDocumentoFinale(controlloPraticaId, jsonParams, userIdFirma, workflowContext); - } - @Override public boolean generaDocumentoFinale(long controlloPraticaId, String jsonParams, long userIdFirma, Map workflowContext) throws PortalException, SystemException { ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); - ServiceContext serviceContext = new ServiceContext(); serviceContext.setCompanyId(controlloPratica.getCompanyId()); serviceContext.setScopeGroupId(controlloPratica.getGroupId()); serviceContext.setUserId(controlloPratica.getUserId()); - // IntPratica intPratica = - // intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); - // intPratica.setStatoPratica(getEsitoFinale(controlloPraticaId, - // workflowContext)); - // intPratica = intPraticaLocalService.updateIntPratica(intPratica); String statoPratica = getEsitoFinale(controlloPraticaId, workflowContext); - User user = UserLocalServiceUtil.fetchUser(userIdFirma); - String codiceFiscale = ""; + String codiceFiscale = StringPool.BLANK; if (user != null) { codiceFiscale = user.getScreenName(); } else { codiceFiscale = GestioneFirmeUtil.getCodiceFiscaleFirma(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), statoPratica); } - // TODO Da riempire // XXX Di cosa? Di caramelle? String jsonParameters = StringPool.BLANK; avvisoLocalService.createStandardAvvisoPratica(controlloPratica.getIntPraticaId(), statoPratica, jsonParameters, dettPratica.getDettPraticaId(), DettPratica.class.getName(), serviceContext, AvvisoUtil.TIPO_AVVISO_FIRMA, codiceFiscale, controlloPraticaId); - return true; } @@ -392,22 +337,10 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi intPratica.setStatusByUserId(istruttore); intPratica.setStatusDate(new Date()); intPraticaLocalService.updateIntPratica(intPratica); - - } - - @Override - @Deprecated - public String valutazioneEsitoFinale(long controlloPraticaId, Map workflowContext) - throws PortalException, SystemException { - - return valutazioneEsitoFinaleUpdateStatoPratica(controlloPraticaId, workflowContext); } /** * I valori di ritorno possibili sono: approvato,non_approvato,annullato,richiesta_integrazione - * - * @throws SystemException - * @throws PortalException */ @Override public String valutazioneEsitoFinaleUpdateStatoPratica(long controlloPraticaId, @@ -416,15 +349,12 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi String esito = getEsitoFinale(controlloPraticaId, workflowContext); String ramoWorkflow = StringPool.BLANK; ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); - Avviso avviso = avvisoLocalService .fetchLastAvvisoByIntPraticaPerStatoFinale(controlloPratica.getIntPraticaId()); if (avviso != null && avviso.getRifiutato()) { ramoWorkflow = "rifiuto_firma"; } else { - boolean updateIntPratica = true; - switch (esito) { case StatoPraticaConstants.CONFORME: case StatoPraticaConstants.AUTORIZZATA: @@ -446,12 +376,10 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi default: break; } - if (updateIntPratica) { intPraticaLocalService.updateStatoPratica(controlloPratica.getIntPraticaId(), esito); } } - IndexerRegistryUtil.getIndexer(ControlloPratica.class).reindex(controlloPratica); return ramoWorkflow; } @@ -459,12 +387,9 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi private String getEsitoFinale(long controlloPraticaId, Map workflowContext) throws PortalException, SystemException { - // Map parametri = (Map) - // workflowContext.get("CONTEXT_TASK_FORM_PARAMETERS"); ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.getControlloPratica(controlloPraticaId); Map parametri = WorkflowUtil.getFormParameters(controlloPratica); String esitoScelta = (String) parametri.get("esito"); - if (AzioniPraticheUtil.isAutorizzazione(controlloPratica.getIntPraticaId())) { if (StatoPraticaConstants.CONFORME.equalsIgnoreCase(esitoScelta)) { esitoScelta = StatoPraticaConstants.AUTORIZZATA; @@ -472,7 +397,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi esitoScelta = StatoPraticaConstants.NON_AUTORIZZATA; } } - return esitoScelta; } @@ -499,13 +423,10 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi .getUnitaOperativa(); boolean preassegnazione = (0 == unitaOperativa); long companyId = controlloPratica.getCompanyId(); - long roleId = RoleLocalServiceUtil.getRole(companyId, preassegnazione ? "portos_assegnatore" : "portos_istruttore").getRoleId(); - List userGroupRoles = UserGroupRoleLocalServiceUtil.getUserGroupRolesByGroupAndRole( controlloPratica.getGroupId(), roleId); - Map sorted = new TreeMap<>(); if (preassegnazione) { Set unitaOperative = new HashSet<>(); @@ -534,14 +455,12 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi } } } - JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); JSONArray jsonArray = JSONFactoryUtil.createJSONArray(); jsonObject.put("istruttore", jsonArray); for (JSONObject istruttore : sorted.values()) { jsonArray.put(istruttore); } - return jsonObject.toString(); } @@ -619,6 +538,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi } @Override + @Indexable(type = IndexableType.REINDEX) public ControlloPratica addPraticheAlControllo(long controlloPraticaId, long dettPraticaId) throws PortalException, SystemException { ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); @@ -629,14 +549,9 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi /** * ADT: BUG ID=5 - tracciamento operazione aggiungi varianti al controllo - * - * @param controlloPraticaId - * @param dettPraticaId - * @return - * @throws PortalException - * @throws SystemException */ @Override + @Indexable(type = IndexableType.REINDEX) public ControlloPratica addPraticheAlControlloVarianti(long controlloPraticaId, long dettPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { _log.info("start addPraticheAlControlloVarianti per controlloPraticaId=" + controlloPraticaId); @@ -644,7 +559,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi controlloPratica.setDettPraticaId(dettPraticaId); controlloPratica.setModifiedDate(new Date()); ControlloPratica result = controlloPraticaPersistence.update(controlloPratica); - try { WorkflowTask lastTask = WorkflowUtil.getLastTask(controlloPratica.getCompanyId(), controlloPratica.getGroupId(), null, controlloPratica); @@ -659,7 +573,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi _log.error("Errore in addPraticheAlControlloVarianti - inserimento log non riuscito -controlloPraticaId = " + controlloPraticaId, e); } - return result; } @@ -667,9 +580,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public String getReturnValueScriptIniziale(long controlloPraticaId) throws PortalException, SystemException { ControlloPratica controlloPratica = controlloPraticaLocalService.getControlloPratica(controlloPraticaId); - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(controlloPratica.getDettPraticaId()); - if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { return "portos1_integrazioni"; } else { @@ -681,32 +592,24 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi public String getTipoEsito(long controlloPraticaId) throws SystemException, PortalException { String tipoEsito = StringPool.BLANK; - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil.fetchControlloPratica(controlloPraticaId); - ClassLoader classLoaderKaleo = (ClassLoader) PortletBeanLocatorUtil.locate( com.liferay.portal.workflow.kaleo.service.ClpSerializer.getServletContextName(), "portletClassLoader"); - DynamicQuery dqKaleo = DynamicQueryFactoryUtil.forClass(KaleoInstance.class, classLoaderKaleo); dqKaleo.add(RestrictionsFactoryUtil.eq("classPK", controlloPraticaId)); dqKaleo.add(RestrictionsFactoryUtil.eq("className", ControlloPratica.class.getName())); - List listaKaleo = KaleoInstanceLocalServiceUtil.dynamicQuery(dqKaleo); if (listaKaleo != null && !listaKaleo.isEmpty()) { KaleoInstance kaleoInstance = listaKaleo.get(0); if (kaleoInstance != null) { - ClassLoader classLoaderKaleoLog = (ClassLoader) PortletBeanLocatorUtil.locate( it.tref.liferay.portos.kaleo.service.ClpSerializer.getServletContextName(), "portletClassLoader"); - DynamicQuery dqKaleoLog = DynamicQueryFactoryUtil.forClass(FormLog.class, classLoaderKaleoLog); dqKaleoLog.add(RestrictionsFactoryUtil.eq("workflowInstanceId", kaleoInstance.getKaleoInstanceId())); dqKaleoLog.add(RestrictionsFactoryUtil.eq("transitionName", "registra-esito")); - Order defaultOrder = OrderFactoryUtil.desc("createDate"); dqKaleoLog.addOrder(defaultOrder); - List listaKaleoLog = FormLogLocalServiceUtil.dynamicQuery(dqKaleoLog); if (listaKaleoLog != null && !listaKaleoLog.isEmpty()) { FormLog formLog = listaKaleoLog.get(0); @@ -721,17 +624,18 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi } } } - return tipoEsito; } @Override public List findByIntPratica(long intPraticaId) throws SystemException { + return controlloPraticaPersistence.findByIntPraticaId(intPraticaId); } @Override public Long calculateDateAvvioProcedimento(long controlloPraticaId) throws SystemException, PortalException { + ControlloPratica controllo = ControlloPraticaLocalServiceUtil.fetchControlloPratica(controlloPraticaId); IntPratica pratica = IntPraticaLocalServiceUtil.fetchIntPratica(controllo.getIntPraticaId()); Date apertura = pratica.getDtPratica(); @@ -805,9 +709,6 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi /** * ADT: gestione workflow varianti - * - * @param dettPraticaId - * @throws Exception */ @Override public void gestioneWFVarianti(ControlloPratica cp) { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java index ccc0dcfd..10ce88a3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -55,14 +55,12 @@ import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; * The implementation of the delega local service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.DelegaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.DelegaLocalService} interface. * *

- * This is a local service. Methods of this service will not have security - * checks based on the propagated JAAS credentials because this service can only - * be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -72,41 +70,36 @@ import com.liferay.portlet.documentlibrary.service.DLFolderLocalServiceUtil; public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl { /* * NOTE FOR DEVELOPERS: - * + * * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil} to access the - * delega local service. + * it.tref.liferay.portos.bo.service.DelegaLocalServiceUtil} to access the delega local service. */ private Log _log = LogFactoryUtil.getLog(DelegaLocalServiceImpl.class); - public Delega addDelega(long userId, long intPraticaId, long dettPraticaId, String tipologia, - String codiceFiscale, ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public Delega addDelega(long userId, long intPraticaId, long dettPraticaId, String tipologia, String codiceFiscale, + ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - Delega delega = delegaPersistence.create(counterLocalService.increment(Delega.class.getName())); - delega.setCompanyId(serviceContext.getCompanyId()); delega.setUserId(user.getUserId()); delega.setUserName(user.getFullName()); delega.setCreateDate(serviceContext.getCreateDate(now)); delega.setModifiedDate(serviceContext.getModifiedDate(now)); delega.setGroupId(serviceContext.getScopeGroupId()); - delega.setIntPraticaId(intPraticaId); delega.setDettPraticaId(dettPraticaId); delega.setTipologia(tipologia); delega.setEsito(DelegheUtil.STATO_ASSEGNATA); delega.setCodiceFiscale(codiceFiscale); - delega = delegaPersistence.update(delega); - return delega; } + @Override public Delega cambioStato(long delegaId, String esito) throws PortalException, SystemException { Date now = new Date(); @@ -120,7 +113,9 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl { return delega; } + @Override public void concludiDeleghePagamento(long dettPraticaId) throws PortalException, SystemException { + List deleghe = this.findByDettPratica_Tipologia_InEsito(dettPraticaId, new String[] { DelegheUtil.TIPO_PAGAMENTO }, new String[] { DelegheUtil.STATO_ASSEGNATA }); for (Delega delega : deleghe) { @@ -130,6 +125,7 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl { @Override public Delega deleteDelega(Delega delega) throws SystemException { + // TODO cancellare il file quando ci sarà return super.deleteDelega(delega); } @@ -141,246 +137,286 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl { return deleteDelega(delega); } - public List findByIntPratica(long intPraticaId, int start, int end, - OrderByComparator orderByComparator) throws SystemException { + @Override + public List findByIntPratica(long intPraticaId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + return delegaPersistence.findByIntPratica(intPraticaId, start, end, orderByComparator); } - public List findByDettPratica(long dettPraticaId, int start, int end, - OrderByComparator orderByComparator) throws SystemException { + @Override + public List findByDettPratica(long dettPraticaId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + return delegaPersistence.findByDettPratica(dettPraticaId, start, end, orderByComparator); } + @Override public int countByIntPratica(long intPraticaId) throws SystemException { + return delegaPersistence.countByIntPratica(intPraticaId); } + @Override public int countByDettPratica(long dettPraticaId) throws SystemException { + return delegaPersistence.countByIntPratica(dettPraticaId); } - public List findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, int start, - int end, OrderByComparator orderByComparator) throws SystemException { + @Override + public List findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + return delegaPersistence.findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, start, end, orderByComparator); } + @Override public List findByCodiceFiscale(String codiceFiscale) throws SystemException { + return delegaPersistence.findByCodiceFiscale(codiceFiscale); } - public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) - throws SystemException { + @Override + public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException { + return delegaPersistence.countByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale); } + @Override public List findByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByCodiceFiscale_InEsito(codiceFiscale, esiti, start, end, - orderByComparator); + + return delegaPersistence.findByCodiceFiscale_InEsito(codiceFiscale, esiti, start, end, orderByComparator); } + @Override public int countByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti) throws SystemException { + return delegaPersistence.countByCodiceFiscale_InEsito(codiceFiscale, esiti); } - public List findByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, - String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti, - start, end, orderByComparator); + @Override + public List findByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaPersistence.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti, start, end, + orderByComparator); } + @Override public int countByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti) throws SystemException { + return delegaPersistence.countByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti); } + @Override public List findByDettPratica_CodiceFiscale_InEsito(long dettPraticaId, String codiceFiscale, String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByDettPratica_CodiceFiscale_InEsito(dettPraticaId, codiceFiscale, esiti, - start, end, orderByComparator); + + return delegaPersistence.findByDettPratica_CodiceFiscale_InEsito(dettPraticaId, codiceFiscale, esiti, start, + end, orderByComparator); } - public int countByDettPratica_CodiceFiscale_InEsito(long dettPraticaId, String codiceFiscale, - String[] esiti) throws SystemException { - return delegaPersistence - .countByDettPratica_CodiceFiscale_InEsito(dettPraticaId, codiceFiscale, esiti); + @Override + public int countByDettPratica_CodiceFiscale_InEsito(long dettPraticaId, String codiceFiscale, String[] esiti) + throws SystemException { + + return delegaPersistence.countByDettPratica_CodiceFiscale_InEsito(dettPraticaId, codiceFiscale, esiti); } + @Override public List findByIntPratica_InEsito(long intPraticaId, String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { + return delegaPersistence.findByIntPratica_InEsito(intPraticaId, esiti, start, end, orderByComparator); } + @Override public int countByIntPratica_InEsito(long intPraticaId, String[] esiti) throws SystemException { + return delegaPersistence.countByIntPratica_InEsito(intPraticaId, esiti); } + @Override public List findByDettPratica_InEsito(long dettPraticaId, String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, - orderByComparator); + + return delegaPersistence.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, orderByComparator); } - public List findCfByDettPratica_InEsito(long dettPraticaId, String[] esiti) - throws SystemException { + @Override + public List findCfByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException { DynamicQuery dynamicQuery = createQueryByDettPratica_InEsito(dettPraticaId, esiti); - dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil - .property("codiceFiscale"))); - + dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("codiceFiscale"))); return delegaPersistence.findWithDynamicQuery(dynamicQuery); } + @Override public List findByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException { DynamicQuery dynamicQuery = createQueryByDettPratica_InEsito(dettPraticaId, esiti); - return delegaPersistence.findWithDynamicQuery(dynamicQuery); } - public List findCfByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, - String[] esiti) throws SystemException { + @Override + public List findCfByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, String[] esiti) + throws SystemException { DynamicQuery dynamicQuery = createQueryByDettPratica_InEsito(dettPraticaId, esiti); dynamicQuery.add(RestrictionsFactoryUtil.in("tipologia", tipologie)); - dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil - .property("codiceFiscale"))); - + dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("codiceFiscale"))); return delegaPersistence.findWithDynamicQuery(dynamicQuery); } - public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, - String[] esiti) throws SystemException { + @Override + public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, String[] esiti) + throws SystemException { DynamicQuery dynamicQuery = createQueryByDettPratica_InEsito(dettPraticaId, esiti); dynamicQuery.add(RestrictionsFactoryUtil.in("tipologia", tipologie)); - return delegaPersistence.findWithDynamicQuery(dynamicQuery); } private DynamicQuery createQueryByDettPratica_InEsito(long dettPraticaId, String[] esiti) { + DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaId", dettPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.in("esito", esiti)); - return dynamicQuery; } + @Override public int countByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException { + return delegaPersistence.countByDettPratica_InEsito(dettPraticaId, esiti); } - public List findByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, - String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti, - start, end, orderByComparator); + @Override + public List findByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaPersistence.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti, start, end, + orderByComparator); } + @Override public int countByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti) throws SystemException { + return delegaPersistence.countByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti); } - public List findByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, - String codiceFiscale, String tipologia, String[] esiti, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, - codiceFiscale, tipologia, esiti, start, end, orderByComparator); + @Override + public List findByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale, + String tipologia, String[] esiti, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + + return delegaPersistence.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, + tipologia, esiti, start, end, orderByComparator); } + @Override public int countByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale, String tipologia, String[] esiti) throws SystemException { - return delegaPersistence.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, - codiceFiscale, tipologia, esiti); + + return delegaPersistence.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, + tipologia, esiti); } - public List findByDettPratica_CodiceFiscale_Tipologia_InEsito(long dettPraticaId, - String codiceFiscale, String[] tipologie, String[] esiti, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByDettPratica_CodiceFiscale_Tipologia_InEsito(dettPraticaId, - codiceFiscale, tipologie, esiti, start, end, orderByComparator); + @Override + public List findByDettPratica_CodiceFiscale_Tipologia_InEsito(long dettPraticaId, String codiceFiscale, + String[] tipologie, String[] esiti, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + + return delegaPersistence.findByDettPratica_CodiceFiscale_Tipologia_InEsito(dettPraticaId, codiceFiscale, + tipologie, esiti, start, end, orderByComparator); } + @Override public int countByDettPratica_CodiceFiscale_Tipologia_InEsito(long dettPraticaId, String codiceFiscale, String[] tipologie, String[] esiti) throws SystemException { - return delegaPersistence.countByDettPratica_CodiceFiscale_Tipologia_InEsito(dettPraticaId, - codiceFiscale, tipologie, esiti); + + return delegaPersistence.countByDettPratica_CodiceFiscale_Tipologia_InEsito(dettPraticaId, codiceFiscale, + tipologie, esiti); } - public List findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, - String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti, start, - end, orderByComparator); + @Override + public List findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaPersistence.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti, start, end, + orderByComparator); } - public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia, - String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByDettPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti, start, - end, orderByComparator); + @Override + public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaPersistence.findByDettPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti, start, end, + orderByComparator); } + @Override public int countByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti) throws SystemException { + return delegaPersistence.countByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti); } - public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, - String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaPersistence.findByDettPratica_Tipologie_InEsiti(dettPraticaId, tipologie, esiti, start, - end, orderByComparator); + @Override + public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String[] tipologie, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaPersistence.findByDettPratica_Tipologie_InEsiti(dettPraticaId, tipologie, esiti, start, end, + orderByComparator); } + @Override public int countByDettPratica_Tipologia_InEsito(long intPraticaId, String[] tipologie, String[] esiti) throws SystemException { + return delegaPersistence.countByDettPratica_Tipologie_InEsiti(intPraticaId, tipologie, esiti); } /** - * * ADT: nuovo metodo generazione documento conclusione delega */ - public void generaDocumentoConcludiDelegaGeologo(long dettPraticaId, Delega delega, - ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public void generaDocumentoConcludiDelegaGeologo(long dettPraticaId, Delega delega, ServiceContext serviceContext) + throws PortalException, SystemException { try { if (delega.getTipologia().equalsIgnoreCase(DelegheUtil.TIPO_GEOLOGO)) { String tipoDocumento = "D_GEO_"; long userId = serviceContext.getUserId(); - DLFolder folderTemplate = DLFolderLocalServiceUtil.getFolder(serviceContext.getThemeDisplay() .getCompanyGroupId(), 0L, "Template"); - FileEntry fileEntryIdTemplate = DLAppLocalServiceUtil.getFileEntry(serviceContext - .getThemeDisplay().getCompanyGroupId(), folderTemplate.getFolderId(), - "Modello Asseverazione"); + FileEntry fileEntryIdTemplate = DLAppLocalServiceUtil.getFileEntry(serviceContext.getThemeDisplay() + .getCompanyGroupId(), folderTemplate.getFolderId(), "Modello Asseverazione"); DLFolder folderAllegati = DLFolderLocalServiceUtil.getFolder(serviceContext.getThemeDisplay() .getCompanyGroupId(), 0L, "Allegati"); - String fileName = StringUtils.leftPad(String.valueOf(delega.getIntPraticaId()), 10, '0') - + (Validator.isNotNull(tipoDocumento) ? StringPool.UNDERLINE + tipoDocumento - : StringPool.BLANK) + StringPool.UNDERLINE + System.currentTimeMillis() - + ".pdf"; - + + (Validator.isNotNull(tipoDocumento) ? StringPool.UNDERLINE + tipoDocumento : StringPool.BLANK) + + StringPool.UNDERLINE + System.currentTimeMillis() + ".pdf"; Map parameters = new HashMap(); - ReportDto reportDto = new ReportDto(); reportDto.setFileEntryIds(new long[] { fileEntryIdTemplate.getFileEntryId() }); reportDto.setFolderId(folderAllegati.getFolderId()); reportDto.setFileName(fileName); - reportDto.setHeader(""); + reportDto.setHeader(StringPool.BLANK); reportDto.setHeaderHeight(1); - reportDto.setFooter(""); + reportDto.setFooter(StringPool.BLANK); reportDto.setFooterHeight(40); - reportDto.setParameters(parameters); reportDto.setShowNumberOfPage(true); reportDto.setType(ReportConstants.ReportType.VELOCITY_TO_PDF.toString()); - String resourcePath = getClass().getName().replaceAll("\\w+\\.", "../") .replace(getClass().getSimpleName(), "resource/asseverazioni"); reportDto.setPortalURL(getClass().getResource(resourcePath).getPath()); - - String relazioni = ""; + String relazioni = StringPool.BLANK; Map dichiarazioniMap = delega.getDichiarazioniMap(); if (dichiarazioniMap.containsKey("coniugio") && ((Boolean) dichiarazioniMap.get("coniugio")) && dichiarazioniMap.containsKey("relazioni")) { @@ -388,41 +424,25 @@ public class DelegaLocalServiceImpl extends DelegaLocalServiceBaseImpl { } User user = userLocalService.getUser(userId); - parameters.put("html", AsseverazioneLocalServiceUtil.testoAsseverazione( - TipoSoggettoUtil.GEOLOGO, user, dettPraticaId, relazioni)); + parameters.put("html", AsseverazioneLocalServiceUtil.testoAsseverazione(TipoSoggettoUtil.GEOLOGO, user, + dettPraticaId, relazioni)); parameters.put("modello", "AS-GEO"); - - ReportResultDto result = ReportUtil.generateReport(delega.getCompanyId(), userId, reportDto, - null); + ReportResultDto result = ReportUtil.generateReport(delega.getCompanyId(), userId, reportDto, null); long fileEntryId = result.getFileEntryIds()[0]; - - // DLFileEntry fileEntry = - // DLFileEntryLocalServiceUtil.getFileEntry(fileEntryId); - // byte[] fileBytes = - // FileUtil.getBytes(fileEntry.getContentStream()); - // File file = new File(PropsUtil.get("user.home") + - // "/asseverazione.pdf"); - // FileUtils.writeByteArrayToFile(file, fileBytes); - - String sha256 = ""; + String sha256 = StringPool.BLANK; try { - sha256 = DigestUtils.sha256Hex(dlAppLocalService.getFileEntry(fileEntryId) - .getContentStream()); + sha256 = DigestUtils.sha256Hex(dlAppLocalService.getFileEntry(fileEntryId).getContentStream()); } catch (Exception e) { } - FirmeBean firmeBean = new FirmeBean(); String jsonFirmatari = FirmeUtil.addFirma(firmeBean, user.getScreenName()); - docPraticaLocalService.addDocPraticaAnnullamento(userId, Delega.class.getName(), - delega.getDelegaId(), delega.getIntPraticaId(), fileEntryId, fileName, tipoDocumento, - sha256, jsonFirmatari, serviceContext); - _log.info("Documento conclusione delega correttamente generato per delegaid = " - + delega.getDelegaId()); - + docPraticaLocalService.addDocPraticaAnnullamento(userId, Delega.class.getName(), delega.getDelegaId(), + delega.getIntPraticaId(), fileEntryId, fileName, tipoDocumento, sha256, jsonFirmatari, + serviceContext); + _log.info("Documento conclusione delega correttamente generato per delegaid = " + delega.getDelegaId()); } else { _log.info("Impossibile generare documento delega - soggetto non trovato"); } - } catch (Exception e) { _log.error("Errore in generaDocumentoConcludiDelegaGeologo", e); throw new PortalException(e); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java index a4721c80..f9df55d5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DelegaServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -28,13 +28,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the delega remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.DelegaService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.DelegaService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -42,156 +41,210 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.DelegaServiceUtil */ public class DelegaServiceImpl extends DelegaServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.DelegaServiceUtil} to access the delega remote service. - */ - public Delega addDelega(long userId, long intPraticaId, long dettPraticaId, String tipologia, String codiceFiscale, - ServiceContext serviceContext) throws PortalException, SystemException { - if (!DelegheUtil.hasCreazioneDelega(userId, intPraticaId)) { - throw new SystemException("TODO aggiungere eccezione"); - } - return delegaLocalService.addDelega(userId, intPraticaId, dettPraticaId, tipologia, codiceFiscale, serviceContext); - } - - - public Delega annullaDelega(long delegaId) throws PortalException, SystemException { - return annullaDelega(delegaLocalService.getDelega(delegaId)); - } - - public Delega annullaDelega(Delega delega) throws PortalException, SystemException { - IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId()); - if (!DelegheUtil.hasAnnullaDelega(getUserId(), intPratica.getIntPraticaId())) { - throw new SystemException("TODO aggiungere eccezione"); - } - return delegaLocalService.cambioStato(delega.getDelegaId(), DelegheUtil.STATO_ANNULLATA); - } - - public Delega deleteDelega(Delega delega) throws PortalException, SystemException { - IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId()); - if (!DelegheUtil.hasDeleteDelega(getUserId(), intPratica.getIntPraticaId())) { - throw new SystemException("TODO aggiungere eccezione"); - } - return delegaLocalService.deleteDelega(delega); - } - - public Delega deleteDelega(long delegaId) throws PortalException, SystemException { - return deleteDelega(delegaLocalService.getDelega(delegaId)); - } - - public Delega cambioStato(long userId, long delegaId, String esito) throws PortalException, SystemException { - if (!DelegheUtil.hasCambioStatoDelega(userId, delegaId)) { - throw new SystemException("TODO aggiungere eccezione"); - } - return delegaLocalService.cambioStato(delegaId, esito); - } - - public List findByIntPratica(long intPraticaId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { - return delegaLocalService.findByIntPratica(intPraticaId, start, end, orderByComparator); - } - - public List findByDettPratica(long dettPraticaId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { - return delegaLocalService.findByDettPratica(dettPraticaId, start, end, orderByComparator); - } - - public int countByIntPratica(long intPraticaId) throws SystemException { - return delegaLocalService.countByIntPratica(intPraticaId); - } - - public int countByDettPratica(long dettPraticaId) throws SystemException { - return delegaLocalService.countByDettPratica(dettPraticaId); - } - - public List findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService - .findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, start, end, orderByComparator); - } - - public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException { - return delegaLocalService.countByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale); - } - - public List findByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByCodiceFiscale_InEsito(codiceFiscale, esiti, start, end, orderByComparator); - } - - public int countByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti) throws SystemException { - return delegaLocalService.countByCodiceFiscale_InEsito(codiceFiscale, esiti); - } - - public List findByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti, - int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti, start, end, - orderByComparator); - } - - public int countByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti) - throws SystemException { - return delegaLocalService.countByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti); - } - - public List findByIntPratica_InEsito(long intPraticaId, String[] esiti, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByIntPratica_InEsito(intPraticaId, esiti, start, end, orderByComparator); - } - - public int countByIntPratica_InEsito(long intPraticaId, String[] esiti) throws SystemException { - return delegaLocalService.countByIntPratica_InEsito(intPraticaId, esiti); - } - - public List findByDettPratica_InEsito(long dettPraticaId, String[] esiti, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, orderByComparator); - } - - public int countByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException { - return delegaLocalService.countByDettPratica_InEsito(dettPraticaId, esiti); - } - - public List findByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti, - int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti, start, end, - orderByComparator); - } - - public int countByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti) - throws SystemException { - return delegaLocalService.countByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti); - } - - public List findByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale, - String tipologia, String[] esiti, int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, tipologia, - esiti, start, end, orderByComparator); - } - - public int countByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale, - String tipologia, String[] esiti) throws SystemException { - return delegaLocalService.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, tipologia, - esiti); - } - - public List findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti, - int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti, start, end, - orderByComparator); - } - - public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia, String[] esiti, - int start, int end, OrderByComparator orderByComparator) throws SystemException { - return delegaLocalService.findByIntPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti, start, end, - orderByComparator); - } - - public int countByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti) - throws SystemException { - return delegaLocalService.countByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti); - } + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link it.tref.liferay.portos.bo.service.DelegaServiceUtil} + * to access the delega remote service. + */ + @Override + public Delega addDelega(long userId, long intPraticaId, long dettPraticaId, String tipologia, String codiceFiscale, + ServiceContext serviceContext) throws PortalException, SystemException { + if (!DelegheUtil.hasCreazioneDelega(userId, intPraticaId)) { + throw new SystemException("TODO aggiungere eccezione"); + } + return delegaLocalService.addDelega(userId, intPraticaId, dettPraticaId, tipologia, codiceFiscale, + serviceContext); + } + + @Override + public Delega annullaDelega(long delegaId) throws PortalException, SystemException { + + return annullaDelega(delegaLocalService.getDelega(delegaId)); + } + + @Override + public Delega annullaDelega(Delega delega) throws PortalException, SystemException { + + IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId()); + if (!DelegheUtil.hasAnnullaDelega(getUserId(), intPratica.getIntPraticaId())) { + throw new SystemException("TODO aggiungere eccezione"); + } + return delegaLocalService.cambioStato(delega.getDelegaId(), DelegheUtil.STATO_ANNULLATA); + } + + @Override + public Delega deleteDelega(Delega delega) throws PortalException, SystemException { + + IntPratica intPratica = intPraticaLocalService.getIntPratica(delega.getIntPraticaId()); + if (!DelegheUtil.hasDeleteDelega(getUserId(), intPratica.getIntPraticaId())) { + throw new SystemException("TODO aggiungere eccezione"); + } + return delegaLocalService.deleteDelega(delega); + } + + @Override + public Delega deleteDelega(long delegaId) throws PortalException, SystemException { + + return deleteDelega(delegaLocalService.getDelega(delegaId)); + } + + @Override + public Delega cambioStato(long userId, long delegaId, String esito) throws PortalException, SystemException { + + if (!DelegheUtil.hasCambioStatoDelega(userId, delegaId)) { + throw new SystemException("TODO aggiungere eccezione"); + } + return delegaLocalService.cambioStato(delegaId, esito); + } + + @Override + public List findByIntPratica(long intPraticaId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + + return delegaLocalService.findByIntPratica(intPraticaId, start, end, orderByComparator); + } + + @Override + public List findByDettPratica(long dettPraticaId, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + + return delegaLocalService.findByDettPratica(dettPraticaId, start, end, orderByComparator); + } + + @Override + public int countByIntPratica(long intPraticaId) throws SystemException { + + return delegaLocalService.countByIntPratica(intPraticaId); + } + + @Override + public int countByDettPratica(long dettPraticaId) throws SystemException { + + return delegaLocalService.countByDettPratica(dettPraticaId); + } + + @Override + public List findByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, start, end, + orderByComparator); + } + + @Override + public int countByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale) throws SystemException { + + return delegaLocalService.countByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale); + } + + @Override + public List findByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByCodiceFiscale_InEsito(codiceFiscale, esiti, start, end, orderByComparator); + } + + @Override + public int countByCodiceFiscale_InEsito(String codiceFiscale, String[] esiti) throws SystemException { + + return delegaLocalService.countByCodiceFiscale_InEsito(codiceFiscale, esiti); + } + + @Override + public List findByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti, start, + end, orderByComparator); + } + + @Override + public int countByIntPratica_CodiceFiscale_InEsito(long intPraticaId, String codiceFiscale, String[] esiti) + throws SystemException { + + return delegaLocalService.countByIntPratica_CodiceFiscale_InEsito(intPraticaId, codiceFiscale, esiti); + } + + @Override + public List findByIntPratica_InEsito(long intPraticaId, String[] esiti, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByIntPratica_InEsito(intPraticaId, esiti, start, end, orderByComparator); + } + + @Override + public int countByIntPratica_InEsito(long intPraticaId, String[] esiti) throws SystemException { + + return delegaLocalService.countByIntPratica_InEsito(intPraticaId, esiti); + } + + @Override + public List findByDettPratica_InEsito(long dettPraticaId, String[] esiti, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByDettPratica_InEsito(dettPraticaId, esiti, start, end, orderByComparator); + } + + @Override + public int countByDettPratica_InEsito(long dettPraticaId, String[] esiti) throws SystemException { + + return delegaLocalService.countByDettPratica_InEsito(dettPraticaId, esiti); + } + + @Override + public List findByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti, start, end, + orderByComparator); + } + + @Override + public int countByCodiceFiscale_Tipologia_InEsito(String codiceFiscale, String tipologia, String[] esiti) + throws SystemException { + + return delegaLocalService.countByCodiceFiscale_Tipologia_InEsito(codiceFiscale, tipologia, esiti); + } + + @Override + public List findByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale, + String tipologia, String[] esiti, int start, int end, OrderByComparator orderByComparator) + throws SystemException { + + return delegaLocalService.findByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, + tipologia, esiti, start, end, orderByComparator); + } + + @Override + public int countByIntPratica_CodiceFiscale_Tipologia_InEsito(long intPraticaId, String codiceFiscale, + String tipologia, String[] esiti) throws SystemException { + + return delegaLocalService.countByIntPratica_CodiceFiscale_Tipologia_InEsito(intPraticaId, codiceFiscale, + tipologia, esiti); + } + + @Override + public List findByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti, start, end, + orderByComparator); + } + + @Override + public List findByDettPratica_Tipologia_InEsito(long dettPraticaId, String tipologia, String[] esiti, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return delegaLocalService.findByIntPratica_Tipologia_InEsito(dettPraticaId, tipologia, esiti, start, end, + orderByComparator); + } + + @Override + public int countByIntPratica_Tipologia_InEsito(long intPraticaId, String tipologia, String[] esiti) + throws SystemException { + + return delegaLocalService.countByIntPratica_Tipologia_InEsito(intPraticaId, tipologia, esiti); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java index 9b610adc..bb238249 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -81,14 +81,12 @@ import com.liferay.portlet.asset.model.AssetLinkConstants; * The implementation of the dett pratica local service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.DettPraticaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.DettPraticaLocalService} interface. * *

- * This is a local service. Methods of this service will not have security - * checks based on the propagated JAAS credentials because this service can only - * be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -97,42 +95,31 @@ import com.liferay.portlet.asset.model.AssetLinkConstants; */ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use - * {@link it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil} to - * access the dett pratica local service. + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil} to access the dett pratica local service. */ Log _log = LogFactoryUtil.getLog(DettPraticaLocalServiceImpl.class); - private DettPratica initDettPratica(ServiceContext serviceContext) throws PortalException, - SystemException { + private DettPratica initDettPratica(ServiceContext serviceContext) throws PortalException, SystemException { User user = userLocalService.getUser(serviceContext.getUserId()); - Date now = new Date(); - DettPratica dettPratica = dettPraticaLocalService.createDettPratica(counterLocalService .increment(DettPratica.class.getName())); - dettPratica.setCompanyId(serviceContext.getCompanyId()); dettPratica.setGroupId(serviceContext.getScopeGroupId()); dettPratica.setUserId(serviceContext.getUserId()); - // dettPratica.setUserName(user.getFullName()); dettPratica.setUserName(user.getScreenName()); dettPratica.setCreateDate(serviceContext.getCreateDate(now)); dettPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - // setto parametri di default - dettPratica.setIntegrazione(0); dettPratica.setProtocollo(null); dettPratica.setTipoIntegrazione(StringPool.BLANK); dettPratica.setCompleta(false); dettPratica.setGestita(false); - - dettPratica.setOldDettPraticaId(0); dettPratica.setOperaConforme(false); - dettPratica.setInizioLavoriContestualeOpera(false); dettPratica.setDataInizioLavoriOpera(null); dettPratica.setDataInizioEsecuzioneOpera(null); @@ -141,288 +128,185 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setNoteUfficio(StringPool.BLANK); // in avvio in draft -> pratiche sempre controllate nella loro vita dettPratica.setStatus(WorkflowConstants.STATUS_DRAFT); - - // FIXME da rimuovere perché sostituiti con le deleghe? - // dettPratica.setCodiceFiscaleDelegato(codiceFiscaleDelegato); - // dettPratica.setCodiceRuoloDelegato(codiceRuoloDelegato); - // FIXME da rimuovere - // dettPratica.setVariataDa(variataDa); - // dettPratica.setVarianteNumero(varianteNumero); - // dettPratica.setVarianteSostanziale(varianteSostanziale); - - // FIXME capire a cosa servono e poi rimuovere - // dettPratica.setWorkflowForzato(workflowForzato); - // dettPratica.setSoggettoSostituitoId(soggettoSostituitoId); - // dettPratica.setStatusTask(statusTask); - return dettPratica; } + @Override @Indexable(type = IndexableType.REINDEX) public DettPratica addDettPratica(long territorioId, String tipoProcedura, ServiceContext serviceContext) throws SystemException, PortalException { DettPratica dettPratica = initDettPratica(serviceContext); - IntPratica intPratica = intPraticaLocalService.addIntPratica(territorioId, tipoProcedura, - serviceContext); - + IntPratica intPratica = intPraticaLocalService.addIntPratica(territorioId, tipoProcedura, serviceContext); dettPratica.setGroupId(intPratica.getGroupId()); dettPratica.setIntPraticaId(intPratica.getIntPraticaId()); dettPratica.setNormArt3com4(true); dettPratica.setNormArt3com3(true); - dettPratica = dettPraticaPersistence.update(dettPratica); return dettPratica; } + @Override @Indexable(type = IndexableType.REINDEX) public DettPratica addDettPraticaToIntPratica(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); - DettPratica dettPratica = initDettPratica(serviceContext); dettPratica.setGroupId(intPratica.getGroupId()); dettPratica.setIntPraticaId(intPraticaId); - dettPratica = dettPraticaPersistence.update(dettPratica); return dettPratica; } + @Override @Indexable(type = IndexableType.REINDEX) public DettPratica addDettPraticaClonedToIntPratica(long intPraticaId, long dettPraticaToCloneId, String tipoIntegrazione, ServiceContext serviceContext) throws PortalException, SystemException { + _log.info("Cloning dettPratica " + dettPraticaToCloneId); IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); - DettPratica dettPratica = initDettPratica(serviceContext); dettPratica = dettPraticaPersistence.update(dettPratica); DettPratica dettPraticaToClone = dettPraticaPersistence.findByPrimaryKey(dettPraticaToCloneId); - dettPratica = copyDettPratica(dettPratica, dettPraticaToClone, tipoIntegrazione, serviceContext); dettPratica.setIntPraticaId(intPratica.getGroupId()); dettPratica.setIntPraticaId(intPraticaId); - dettPratica = dettPraticaPersistence.update(dettPratica); return dettPratica; } - private DettPratica copyDettPratica(DettPratica copy, DettPratica dettPraticaToClone, - String tipoIntegrazione, ServiceContext serviceContext) throws PortalException, SystemException { - - copy = updateDettPraticaDatiDomanda(copy.getUserId(), copy.getDettPraticaId(), - copy.getIntPraticaId(), tipoIntegrazione, dettPraticaToClone.getDestinazione(), - dettPraticaToClone.getAg(), dettPraticaToClone.getDescLongIntervento(), - dettPraticaToClone.getVia(), dettPraticaToClone.getLocalita(), - dettPraticaToClone.getEstremiCatastali(), dettPraticaToClone.getEstremiPratCom(), - dettPraticaToClone.getVarianteSostanziale(), dettPraticaToClone.getCollaudoStatico(), - dettPraticaToClone.getCodiceFiscaleDelegatoCommittente(), - dettPraticaToClone.getCodiceFiscaleDelegatoFineLavori(), - dettPraticaToClone.getCodiceFiscaleDelegatoCollaudo(), - dettPraticaToClone.getLavoriInEconomiaCommittente(), dettPraticaToClone.getMetratura(), - dettPraticaToClone.getLavoriPubblici(), 0l, - dettPraticaToClone.getLavoriPubbliciPercentuale(), dettPraticaToClone.getNumeroCivico(), - dettPraticaToClone.getDcParticelle(), dettPraticaToClone.getDcFoglio(), - dettPraticaToClone.getDcAllegato(), dettPraticaToClone.getDePiani(), - dettPraticaToClone.getDeAltezza(), dettPraticaToClone.getDeInterrati(), - dettPraticaToClone.getDeSuperficie(), dettPraticaToClone.getDeCostruzione(), - dettPraticaToClone.getDeRistrutturazione(), dettPraticaToClone.getDeUso(), - dettPraticaToClone.getDePubblica(), dettPraticaToClone.getDePrivata(), - dettPraticaToClone.getDeUtilizzazione(), dettPraticaToClone.getDePosizioneEdificio(), - dettPraticaToClone.getDeInfStradalePonte(), dettPraticaToClone.getDeInfStradaleStrada(), - dettPraticaToClone.getDeInfStradaleAltro(), dettPraticaToClone.getDeInfIdraulicaLong(), - dettPraticaToClone.getDeInfIdraulicaTrasv(), dettPraticaToClone.getDeInfIdraulicaAltro(), - dettPraticaToClone.getDeInfOperaAccStradale(), - dettPraticaToClone.getDeInfOperaAccIdraulica(), dettPraticaToClone.getDeInfOperaAccAltro(), - dettPraticaToClone.getDeInfAltraInfrastruttura(), dettPraticaToClone.getDeInfAltro(), - dettPraticaToClone.getDeInfAltroDesc(), dettPraticaToClone.getDccFondazioni(), - dettPraticaToClone.getDccStruttureEleMuraturePietrame(), - dettPraticaToClone.getDccStruttureEleMuratureLaterizio(), - dettPraticaToClone.getDccStruttureEleMuratureMisto(), - dettPraticaToClone.getDccStruttureEleMuratureStoriche(), - dettPraticaToClone.getDccStruttureEleAcciaio(), dettPraticaToClone.getDccStruttureEleCA(), - dettPraticaToClone.getDccStruttureEleLegno(), dettPraticaToClone.getDccStruttureEleMistoCA(), - dettPraticaToClone.getDccStruttureEleMistoAcciaio(), - dettPraticaToClone.getDccStruttureEleMistoMuratura(), - dettPraticaToClone.getDccStruttureEleMistoLegno(), - dettPraticaToClone.getDccStruttureElePrefabbricato(), - dettPraticaToClone.getDccStruttureEleAltro(), - dettPraticaToClone.getDccStruttureEleAltroDescrizione(), - dettPraticaToClone.getDccOrizzontamentiCAAcciaio(), - dettPraticaToClone.getDccOrizzontamentiLegno(), - dettPraticaToClone.getDccOrizzontamentiLegnoCA(), - dettPraticaToClone.getDccOrizzontamentiLamieraGrecata(), - dettPraticaToClone.getDccOrizzontamentiVolte(), - dettPraticaToClone.getDccOrizzontamentiAltro(), - dettPraticaToClone.getDccOrizzontamentiAltroDescrizione(), - dettPraticaToClone.getDccCopertura(), dettPraticaToClone.getDccCoperturaCAAcciaio(), - dettPraticaToClone.getDccCoperturaLegno(), dettPraticaToClone.getDccCoperturaLegnoCA(), - dettPraticaToClone.getDccCoperturaLamieraGrecata(), - dettPraticaToClone.getDccCoperturaPannelli(), - dettPraticaToClone.getDccCoperturaPVCTelonati(), dettPraticaToClone.getDccCoperturaLeggere(), - dettPraticaToClone.getDccCoperturaAltro(), - dettPraticaToClone.getDccCoperturaAltroDesrizione(), - dettPraticaToClone.getDccElemNonStrutLaterizio(), - dettPraticaToClone.getDccElemNonStrutCartongesso(), - dettPraticaToClone.getDccElemNonStrutCalcestruzzo(), - dettPraticaToClone.getDccElemNonStrutLegno(), dettPraticaToClone.getDccElemNonStrutAltro(), - dettPraticaToClone.getDccElemNonStrutAltroDescrizione(), - dettPraticaToClone.getDccOpereDiRinforzoInsCatene(), - dettPraticaToClone.getDccOpereDiRinforzoInsCordoli(), - dettPraticaToClone.getDccOpereDiRinforzoIniArmate(), - dettPraticaToClone.getDccOpereDiRinforzoPlaccaggi(), - dettPraticaToClone.getDccOpereDiRinforzoIrrSolai(), - dettPraticaToClone.getDccOpereDiRinforzoRinforziFRP(), - dettPraticaToClone.getDccOpereDiRinforzoTelaiECerchiature(), - dettPraticaToClone.getDccOpereDiRinforzoInsRompitratta(), - dettPraticaToClone.getDccOpereDiRinforzoAltro(), - dettPraticaToClone.getDccOpereDiRinforzoAltroDescrizione(), - dettPraticaToClone.getLocalizzazioneGeografica(), dettPraticaToClone.getTcNuovaCostruzione(), - dettPraticaToClone.getTcAdeguamentoSismico(), dettPraticaToClone.getTcMiglioramentoSismico(), - dettPraticaToClone.getTcRiparazioneInterventoLocale(), dettPraticaToClone.getTcInCA(), - dettPraticaToClone.getTcInOpera(), dettPraticaToClone.getTcPrefabbricato(), - dettPraticaToClone.getTcInAcciaio(), dettPraticaToClone.getTcMista(), - dettPraticaToClone.getTcInMuratura(), dettPraticaToClone.getTcInMuraturaOrdinaria(), - dettPraticaToClone.getTcInMuraturaArmata(), dettPraticaToClone.getTcInMuraturaMista(), - dettPraticaToClone.getTcInLegno(), dettPraticaToClone.getTcAltro(), - dettPraticaToClone.getTcAltroDescrizione(), dettPraticaToClone.getTcConDispositivi(), - dettPraticaToClone.getNormLavoriInProprio(), dettPraticaToClone.getNormEsenteBollo(), - dettPraticaToClone.getNormEsenteSpese(), dettPraticaToClone.getNormDpr01Dep(), - dettPraticaToClone.getNormDpr02Dep(), dettPraticaToClone.getNormDpr01Aut(), - dettPraticaToClone.getNormDpr02Aut(), dettPraticaToClone.getNormDm01(), - dettPraticaToClone.getNormDm02(), dettPraticaToClone.getNormDm03(), - dettPraticaToClone.getNormDm2018(), dettPraticaToClone.getNormDprg01(), - dettPraticaToClone.getNormDprg02(), dettPraticaToClone.getNormAnr(), - dettPraticaToClone.getNormArt3com3(), dettPraticaToClone.getNormArt3com4(), - dettPraticaToClone.getNormOrd01(), dettPraticaToClone.getNormDm04(), - dettPraticaToClone.getNormDm05(), dettPraticaToClone.getNormCI01(), - dettPraticaToClone.getNormLTC01(), dettPraticaToClone.getSuap(), - dettPraticaToClone.getNormSismaBonus(), dettPraticaToClone.getClRischioPreInt(), - dettPraticaToClone.getClRischioPostInt(), dettPraticaToClone.getIntervFinPub(), - dettPraticaToClone.getIntervFinPubDesc(), serviceContext, true, - dettPraticaToClone.getPaesaggioLocale(), dettPraticaToClone.getLivelloDiTutela(), - dettPraticaToClone.getVincoli(), dettPraticaToClone.getDestinazioneAltroIntervento(), - dettPraticaToClone.getTcCostruzioniEsistenti(), dettPraticaToClone.getTcManutOrdStraord(), - dettPraticaToClone.getTcAltriInterventi(), dettPraticaToClone.getTcAltriInterventiDesc(), - dettPraticaToClone.getNoCollaudo(), dettPraticaToClone.getTcNuovaCostruzionePertinenza(), - dettPraticaToClone.getTcInterventoOpereEscavazione(), dettPraticaToClone.getTcViarch(), - dettPraticaToClone.getTcOperaA25(), dettPraticaToClone.getSanatoriaEdilizia47(), - dettPraticaToClone.getSanatoriaEdilizia724(), dettPraticaToClone.getSanatoriaEdilizia326(), - dettPraticaToClone.getNormLavoriNoDirettore(), dettPraticaToClone.getInterventoVoceP7()); + private DettPratica copyDettPratica(DettPratica copy, DettPratica source, String tipoIntegrazione, + ServiceContext serviceContext) throws PortalException, SystemException { + copy = updateDettPraticaDatiDomanda(copy.getUserId(), copy.getDettPraticaId(), copy.getIntPraticaId(), + tipoIntegrazione, source.getDestinazione(), source.getAg(), source.getDescLongIntervento(), + source.getVia(), source.getLocalita(), source.getEstremiCatastali(), source.getEstremiPratCom(), + source.getVarianteSostanziale(), source.getCollaudoStatico(), + source.getCodiceFiscaleDelegatoCommittente(), source.getCodiceFiscaleDelegatoFineLavori(), + source.getCodiceFiscaleDelegatoCollaudo(), source.getLavoriInEconomiaCommittente(), + source.getMetratura(), source.getLavoriPubblici(), 0l, source.getLavoriPubbliciPercentuale(), + source.getNumeroCivico(), source.getDcParticelle(), source.getDcFoglio(), source.getDcAllegato(), + source.getDePiani(), source.getDeAltezza(), source.getDeInterrati(), source.getDeSuperficie(), + source.getDeCostruzione(), source.getDeRistrutturazione(), source.getDeUso(), source.getDePubblica(), + source.getDePrivata(), source.getDeUtilizzazione(), source.getDePosizioneEdificio(), + source.getDeInfStradalePonte(), source.getDeInfStradaleStrada(), source.getDeInfStradaleAltro(), + source.getDeInfIdraulicaLong(), source.getDeInfIdraulicaTrasv(), source.getDeInfIdraulicaAltro(), + source.getDeInfOperaAccStradale(), source.getDeInfOperaAccIdraulica(), source.getDeInfOperaAccAltro(), + source.getDeInfAltraInfrastruttura(), source.getDeInfAltro(), source.getDeInfAltroDesc(), + source.getDccFondazioni(), source.getDccStruttureEleMuraturePietrame(), + source.getDccStruttureEleMuratureLaterizio(), source.getDccStruttureEleMuratureMisto(), + source.getDccStruttureEleMuratureStoriche(), source.getDccStruttureEleAcciaio(), + source.getDccStruttureEleCA(), source.getDccStruttureEleLegno(), source.getDccStruttureEleMistoCA(), + source.getDccStruttureEleMistoAcciaio(), source.getDccStruttureEleMistoMuratura(), + source.getDccStruttureEleMistoLegno(), source.getDccStruttureElePrefabbricato(), + source.getDccStruttureEleAltro(), source.getDccStruttureEleAltroDescrizione(), + source.getDccOrizzontamentiCAAcciaio(), source.getDccOrizzontamentiLegno(), + source.getDccOrizzontamentiLegnoCA(), source.getDccOrizzontamentiLamieraGrecata(), + source.getDccOrizzontamentiVolte(), source.getDccOrizzontamentiAltro(), + source.getDccOrizzontamentiAltroDescrizione(), source.getDccCopertura(), + source.getDccCoperturaCAAcciaio(), source.getDccCoperturaLegno(), source.getDccCoperturaLegnoCA(), + source.getDccCoperturaLamieraGrecata(), source.getDccCoperturaPannelli(), + source.getDccCoperturaPVCTelonati(), source.getDccCoperturaLeggere(), source.getDccCoperturaAltro(), + source.getDccCoperturaAltroDesrizione(), source.getDccElemNonStrutLaterizio(), + source.getDccElemNonStrutCartongesso(), source.getDccElemNonStrutCalcestruzzo(), + source.getDccElemNonStrutLegno(), source.getDccElemNonStrutAltro(), + source.getDccElemNonStrutAltroDescrizione(), source.getDccOpereDiRinforzoInsCatene(), + source.getDccOpereDiRinforzoInsCordoli(), source.getDccOpereDiRinforzoIniArmate(), + source.getDccOpereDiRinforzoPlaccaggi(), source.getDccOpereDiRinforzoIrrSolai(), + source.getDccOpereDiRinforzoRinforziFRP(), source.getDccOpereDiRinforzoTelaiECerchiature(), + source.getDccOpereDiRinforzoInsRompitratta(), source.getDccOpereDiRinforzoAltro(), + source.getDccOpereDiRinforzoAltroDescrizione(), source.getLocalizzazioneGeografica(), + source.getTcNuovaCostruzione(), source.getTcAdeguamentoSismico(), source.getTcMiglioramentoSismico(), + source.getTcRiparazioneInterventoLocale(), source.getTcInCA(), source.getTcInOpera(), + source.getTcPrefabbricato(), source.getTcInAcciaio(), source.getTcMista(), source.getTcInMuratura(), + source.getTcInMuraturaOrdinaria(), source.getTcInMuraturaArmata(), source.getTcInMuraturaMista(), + source.getTcInLegno(), source.getTcAltro(), source.getTcAltroDescrizione(), + source.getTcConDispositivi(), source.getNormLavoriInProprio(), source.getNormEsenteBollo(), + source.getNormEsenteSpese(), source.getNormDpr01Dep(), source.getNormDpr02Dep(), + source.getNormDpr01Aut(), source.getNormDpr02Aut(), source.getNormDm01(), source.getNormDm02(), + source.getNormDm03(), source.getNormDm2018(), source.getNormDprg01(), source.getNormDprg02(), + source.getNormAnr(), source.getNormArt3com3(), source.getNormArt3com4(), source.getNormOrd01(), + source.getNormDm04(), source.getNormDm05(), source.getNormCI01(), source.getNormLTC01(), + source.getSuap(), source.getNormSismaBonus(), source.getClRischioPreInt(), + source.getClRischioPostInt(), source.getIntervFinPub(), source.getIntervFinPubDesc(), serviceContext, + true, source.getPaesaggioLocale(), source.getLivelloDiTutela(), source.getVincoli(), + source.getDestinazioneAltroIntervento(), source.getTcCostruzioniEsistenti(), + source.getTcManutOrdStraord(), source.getTcAltriInterventi(), source.getTcAltriInterventiDesc(), + source.getNoCollaudo(), source.getTcNuovaCostruzionePertinenza(), + source.getTcInterventoOpereEscavazione(), source.getTcViarch(), source.getTcOperaA25(), + source.getSanatoriaEdilizia47(), source.getSanatoriaEdilizia724(), source.getSanatoriaEdilizia326(), + source.getNormLavoriNoDirettore(), source.getInterventoVoceP7()); copy = updateDettPraticaGeologo(copy.getUserId(), copy.getDettPraticaId(), copy.getIntPraticaId(), - dettPraticaToClone.getGeoClasseIndagine(), dettPraticaToClone.getGeoCategoriaSottosuolo(), - dettPraticaToClone.getGeoCategoriaTopografica(), dettPraticaToClone.getGeoConsolidamento(), - dettPraticaToClone.getGeoPericolositaGeologica(), - dettPraticaToClone.getGeoRischioGeomorfologicoPai(), - dettPraticaToClone.getGeoPericolositaIdraulicaPai(), - dettPraticaToClone.getGeoRischioIdraulicoPai(), - dettPraticaToClone.getGeoPericolositaSismica(), - dettPraticaToClone.getGeoPericolositaIdraulica(), - dettPraticaToClone.getGeoPericolositaGeomorfica(), - dettPraticaToClone.getGeoFattibilitaGeologica(), - dettPraticaToClone.getGeoFattibilitaSismica(), - dettPraticaToClone.getGeoFattibilitaIdraulica(), dettPraticaToClone.getGeoOperaRilevante(), - dettPraticaToClone.getGeoOpereDiSostegno(), dettPraticaToClone.getGeoOpereInSotterranea(), - dettPraticaToClone.getGeoPresenzaPrescrizioni(), dettPraticaToClone.getGeoNotePrescrizioni(), - dettPraticaToClone.getGeoNoteIndagini(), dettPraticaToClone.getGeoEvidenzeGeomorfiche(), - dettPraticaToClone.getGeoEvidenzeGeologiche(), dettPraticaToClone.getGeoDtRelazione(), - serviceContext, false); - - copy.setCodiceFiscaleDelegatoCommittente(dettPraticaToClone.getCodiceFiscaleDelegatoCommittente()); - copy.setCodiceFiscaleDelegatoFineLavori(dettPraticaToClone.getCodiceFiscaleDelegatoFineLavori()); - copy.setCodiceFiscaleDelegatoCollaudo(dettPraticaToClone.getCodiceFiscaleDelegatoCollaudo()); - - copy.setCodiceFiscalePrincipaleCollaudatore(dettPraticaToClone - .getCodiceFiscalePrincipaleCollaudatore()); - copy.setCodiceFiscalePrincipaleCommittente(dettPraticaToClone.getCodiceFiscalePrincipaleCommittente()); - copy.setCodiceFiscalePrincipaleDirettoreLavori(dettPraticaToClone - .getCodiceFiscalePrincipaleDirettoreLavori()); - copy.setCodiceFiscalePrincipaleDitta(dettPraticaToClone.getCodiceFiscalePrincipaleDitta()); - copy.setCodiceFiscalePrincipaleGeologo(dettPraticaToClone.getCodiceFiscalePrincipaleGeologo()); - copy.setCodiceFiscalePrincipaleProgettista(dettPraticaToClone.getCodiceFiscalePrincipaleProgettista()); - + source.getGeoClasseIndagine(), source.getGeoCategoriaSottosuolo(), source.getGeoCategoriaTopografica(), + source.getGeoConsolidamento(), source.getGeoPericolositaGeologica(), + source.getGeoRischioGeomorfologicoPai(), source.getGeoPericolositaIdraulicaPai(), + source.getGeoRischioIdraulicoPai(), source.getGeoPericolositaSismica(), + source.getGeoPericolositaIdraulica(), source.getGeoPericolositaGeomorfica(), + source.getGeoFattibilitaGeologica(), source.getGeoFattibilitaSismica(), + source.getGeoFattibilitaIdraulica(), source.getGeoOperaRilevante(), source.getGeoOpereDiSostegno(), + source.getGeoOpereInSotterranea(), source.getGeoPresenzaPrescrizioni(), + source.getGeoNotePrescrizioni(), source.getGeoNoteIndagini(), source.getGeoEvidenzeGeomorfiche(), + source.getGeoEvidenzeGeologiche(), source.getGeoDtRelazione(), serviceContext, false); + copy.setCodiceFiscaleDelegatoCommittente(source.getCodiceFiscaleDelegatoCommittente()); + copy.setCodiceFiscaleDelegatoFineLavori(source.getCodiceFiscaleDelegatoFineLavori()); + copy.setCodiceFiscaleDelegatoCollaudo(source.getCodiceFiscaleDelegatoCollaudo()); + copy.setCodiceFiscalePrincipaleCollaudatore(source.getCodiceFiscalePrincipaleCollaudatore()); + copy.setCodiceFiscalePrincipaleCommittente(source.getCodiceFiscalePrincipaleCommittente()); + copy.setCodiceFiscalePrincipaleDirettoreLavori(source.getCodiceFiscalePrincipaleDirettoreLavori()); + copy.setCodiceFiscalePrincipaleDitta(source.getCodiceFiscalePrincipaleDitta()); + copy.setCodiceFiscalePrincipaleGeologo(source.getCodiceFiscalePrincipaleGeologo()); + copy.setCodiceFiscalePrincipaleProgettista(source.getCodiceFiscalePrincipaleProgettista()); return copy; } - public DettPratica cloneDettagliSoggetti(long dettPraticaId, long dettPraticaToCloneId) - throws NoSuchDettPraticaException, SystemException { + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica cloneDettagliSoggetti(long dettPraticaId, long sourceId) throws NoSuchDettPraticaException, + SystemException { DettPratica copy = dettPraticaPersistence.findByPrimaryKey(dettPraticaId); - DettPratica dettPraticaToClone = dettPraticaPersistence.findByPrimaryKey(dettPraticaToCloneId); - - copy.setCodiceFiscaleDelegatoCommittente(dettPraticaToClone.getCodiceFiscaleDelegatoCommittente()); - copy.setCodiceFiscaleDelegatoFineLavori(dettPraticaToClone.getCodiceFiscaleDelegatoFineLavori()); - copy.setCodiceFiscaleDelegatoCollaudo(dettPraticaToClone.getCodiceFiscaleDelegatoCollaudo()); - - copy.setCodiceFiscalePrincipaleCollaudatore(dettPraticaToClone - .getCodiceFiscalePrincipaleCollaudatore()); - copy.setCodiceFiscalePrincipaleCommittente(dettPraticaToClone.getCodiceFiscalePrincipaleCommittente()); - copy.setCodiceFiscalePrincipaleDirettoreLavori(dettPraticaToClone - .getCodiceFiscalePrincipaleDirettoreLavori()); - copy.setCodiceFiscalePrincipaleDitta(dettPraticaToClone.getCodiceFiscalePrincipaleDitta()); - copy.setCodiceFiscalePrincipaleGeologo(dettPraticaToClone.getCodiceFiscalePrincipaleGeologo()); - copy.setCodiceFiscalePrincipaleProgettista(dettPraticaToClone.getCodiceFiscalePrincipaleProgettista()); - + DettPratica source = dettPraticaPersistence.findByPrimaryKey(sourceId); + copy.setCodiceFiscaleDelegatoCommittente(source.getCodiceFiscaleDelegatoCommittente()); + copy.setCodiceFiscaleDelegatoFineLavori(source.getCodiceFiscaleDelegatoFineLavori()); + copy.setCodiceFiscaleDelegatoCollaudo(source.getCodiceFiscaleDelegatoCollaudo()); + copy.setCodiceFiscalePrincipaleCollaudatore(source.getCodiceFiscalePrincipaleCollaudatore()); + copy.setCodiceFiscalePrincipaleCommittente(source.getCodiceFiscalePrincipaleCommittente()); + copy.setCodiceFiscalePrincipaleDirettoreLavori(source.getCodiceFiscalePrincipaleDirettoreLavori()); + copy.setCodiceFiscalePrincipaleDitta(source.getCodiceFiscalePrincipaleDitta()); + copy.setCodiceFiscalePrincipaleGeologo(source.getCodiceFiscalePrincipaleGeologo()); + copy.setCodiceFiscalePrincipaleProgettista(source.getCodiceFiscalePrincipaleProgettista()); copy = dettPraticaPersistence.update(copy); return copy; } - // public void cloneSoggettiByDettPratica(long dettPraticaIdToClone, long - // dettPraticaIdCloned, - // ServiceContext serviceContext) throws NoSuchDettPraticaException, - // SystemException{ - // - // User user = userLocalService.getUser(serviceContext.getUserId()); - // - // DettPratica dettPraticaToClone = - // dettPraticaPersistence.findByPrimaryKey(dettPraticaIdToClone); - // DettPratica dettPraticaCloned = - // dettPraticaPersistence.findByPrimaryKey(dettPraticaIdCloned); - // - // List soggettiToClone = - // soggettoLocalService.findByDettPratica(dettPraticaIdToClone); - // for (Soggetto soggetto : soggettiToClone) { - // soggettoLocalService.cloneSoggetto(user.getUserId(), - // dettPraticaIdToClone, - // dettPraticaToClone.getIntPraticaId(), soggetto, serviceContext); - // } - // - // } - + @Override @Indexable(type = IndexableType.REINDEX) - public DettPratica addDettPraticaForImport(ServiceContext serviceContext) throws SystemException, - PortalException { + public DettPratica addDettPraticaForImport(ServiceContext serviceContext) throws SystemException, PortalException { DettPratica dettPratica = dettPraticaLocalService.createDettPratica(counterLocalService .increment(DettPratica.class.getName())); - dettPratica.setCompanyId(serviceContext.getCompanyId()); dettPratica.setGroupId(serviceContext.getScopeGroupId()); dettPratica.setUserId(serviceContext.getUserId()); dettPratica.setUserName(StringPool.BLANK); dettPratica.setCreateDate(serviceContext.getCreateDate()); dettPratica.setModifiedDate(serviceContext.getModifiedDate()); - // in avvio in draft -> pratiche sempre controllate nella loro vita dettPratica.setStatus(WorkflowConstants.STATUS_DRAFT); dettPraticaPersistence.update(dettPratica); - return dettPratica; } + @Override public DettPratica getLastEditableByIntPratica(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - // dynamicQuery.add(RestrictionsFactoryUtil.eq("status", - // WorkflowConstants.STATUS_DRAFT)); - Disjunction disjunction = RestrictionsFactoryUtil.disjunction(); disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_DRAFT)); disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_INCOMPLETE)); dynamicQuery.add(disjunction); - dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); List ritorno = dynamicQuery(dynamicQuery, 0, 1); if (ritorno.isEmpty()) { @@ -432,13 +316,13 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } + @Override public DettPratica getLastCompletedByIntPratica(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_DRAFT)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); - // togliere commento dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); List ritorno = dynamicQuery(dynamicQuery, 0, 1); if (ritorno.isEmpty()) { @@ -448,6 +332,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } + @Override public DettPratica getLastCompletedBeforeDettPraticaByIntPratica(long intPraticaId, long dettPraticaId) throws SystemException { @@ -456,7 +341,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dynamicQuery.add(RestrictionsFactoryUtil.lt("dettPraticaId", dettPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_DRAFT)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); - // togliere commento dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); List ritorno = dynamicQuery(dynamicQuery, 0, 1); if (ritorno.isEmpty()) { @@ -466,16 +350,14 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } - public DettPratica getLastCompletedByIntPraticaAndProtocolloNotEmpty(long intPraticaId) - throws SystemException { + @Override + public DettPratica getLastCompletedByIntPraticaAndProtocolloNotEmpty(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_DRAFT)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); - - // togliere commento dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); List ritorno = dynamicQuery(dynamicQuery, 0, 1); if (ritorno.isEmpty()) { @@ -485,6 +367,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } + @Override public DettPratica getLastdByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { @@ -502,18 +385,17 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } + @Override public DettPratica getLastEditabledByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.in("tipoIntegrazione", tipoPratiche)); - Disjunction disjunction = RestrictionsFactoryUtil.disjunction(); disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_DRAFT)); disjunction.add(RestrictionsFactoryUtil.eq("status", WorkflowConstants.STATUS_INCOMPLETE)); dynamicQuery.add(disjunction); - dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); List ritorno = dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, 0, 1); if (ritorno.isEmpty()) { @@ -523,47 +405,43 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } } - public List findCompletedByIntPraticaAndTipoPratica(long intPraticaId, - List tipoPratiche) throws SystemException { + @Override + public List findCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) + throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_DRAFT)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); - dynamicQuery.add(RestrictionsFactoryUtil.in("tipoIntegrazione", tipoPratiche)); dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); return dynamicQuery(dynamicQuery); } + @Override public int countCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_DRAFT)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); - dynamicQuery.add(RestrictionsFactoryUtil.in("tipoIntegrazione", tipoPratiche)); dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); int size = dynamicQuery(dynamicQuery).size(); return size; } - public List findCompletedByIntPraticaAndSuccessivoDettPratica(long intPraticaId, - long dettPraticaId) throws SystemException { + @Override + public List findCompletedByIntPraticaAndSuccessivoDettPratica(long intPraticaId, long dettPraticaId) + throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_DRAFT)); dynamicQuery.add(RestrictionsFactoryUtil.ne("status", WorkflowConstants.STATUS_INCOMPLETE)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("tipoIntegrazione", - TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)); + dynamicQuery.add(RestrictionsFactoryUtil.ne("tipoIntegrazione", TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO)); dynamicQuery.add(RestrictionsFactoryUtil.ne("tipoIntegrazione", TipoIntegrazioneUtil.ANNULLA)); - dynamicQuery.add(RestrictionsFactoryUtil.gt("dettPraticaId", dettPraticaId)); dynamicQuery.addOrder(OrderFactoryUtil.desc("dettPraticaId")); return dynamicQuery(dynamicQuery); @@ -574,29 +452,24 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl public DettPratica deleteDettPratica(DettPratica dettPratica) throws SystemException, PortalException { deleteAsset(dettPratica); - List soggetti = soggettoLocalService.findByDettPratica(dettPratica.getDettPraticaId()); for (Soggetto soggetto : soggetti) { soggettoLocalService.deleteSoggetto(soggetto); } - List allegati = docPraticaLocalService.findByClassPk(dettPratica.getDettPraticaId()); for (DocPratica allegato : allegati) { docPraticaLocalService.deleteDocPratica(allegato); } - - List asseverazioni = asseverazioneLocalService.findByDettPratica( - dettPratica.getDettPraticaId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + List asseverazioni = asseverazioneLocalService.findByDettPratica(dettPratica.getDettPraticaId(), + QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); for (Asseverazione asseverazione : asseverazioni) { asseverazioneLocalService.deleteAsseverazione(asseverazione); } - - List deleghe = delegaLocalService.findByDettPratica(dettPratica.getDettPraticaId(), - QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + List deleghe = delegaLocalService.findByDettPratica(dettPratica.getDettPraticaId(), QueryUtil.ALL_POS, + QueryUtil.ALL_POS, null); for (Delega delega : deleghe) { delegaLocalService.deleteDelega(delega); } - List pagamenti = pagamentoLocalService.findByClassPk(dettPratica.getDettPraticaId()); for (Pagamento pagamento : pagamenti) { pagamentoLocalService.deletePagamento(pagamento); @@ -609,45 +482,37 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl public DettPratica deleteDettPratica(long dettPraticaId) throws PortalException, SystemException { DettPratica dettPratica = dettPraticaPersistence.findByPrimaryKey(dettPraticaId); - return deleteDettPratica(dettPratica); } - public DettPratica getByOldDettPraticaId(long oldDettPraticaId) throws PortalException, SystemException { - - return dettPraticaPersistence.fetchByOldDettPratica(oldDettPraticaId); - } - + @Override public List search(SearchContext searchContext) throws PortalException, SystemException { Indexer indexer = IndexerRegistryUtil.nullSafeGetIndexer(DettPratica.class); Hits hits = indexer.search(searchContext); - List list = new ArrayList<>(); for (Document document : hits.getDocs()) { long dettPraticaId = GetterUtil.getLong(document.get(Field.ENTRY_CLASS_PK)); - DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); if (dettPratica != null) { list.add(dettPratica); } else { long companyId = GetterUtil.getLong(document.get(Field.COMPANY_ID)); - indexer.delete(companyId, document.getUID()); } } - return list; } + @Override public int searchCount(SearchContext searchContext) throws PortalException { Indexer indexer = IndexerRegistryUtil.nullSafeGetIndexer(DettPratica.class); Hits hits = indexer.search(searchContext); - return hits.getLength(); } + @Override @Indexable(type = IndexableType.REINDEX) public DettPratica updateDettPraticaSoggetti(long userId, long dettPraticaId, long intPraticaId, String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, @@ -655,73 +520,62 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl SystemException { Date now = new Date(); - validate(userId, dettPraticaId, intPraticaId, codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, serviceContext); - DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); - dettPratica.setModifiedDate(serviceContext.getModifiedDate(now)); dettPratica.setIntPraticaId(intPraticaId); dettPratica.setCodiceFiscaleDelegatoCommittente(codiceFiscaleDelegatoCommittente); dettPratica.setCodiceFiscaleDelegatoFineLavori(codiceFiscaleDelegatoFineLavori); dettPratica.setCodiceFiscaleDelegatoCollaudo(codiceFiscaleDelegatoCollaudo); - dettPratica = dettPraticaPersistence.update(dettPratica); - resourceLocalService.updateModelResources(dettPratica, serviceContext); - updateAsset(dettPratica, serviceContext); return dettPratica; } + @Override @Indexable(type = IndexableType.REINDEX) - public DettPratica updateDettPratica(long userId, long dettPraticaId, long intPraticaId, - long integrazione, String protocollo, String tipoIntegrazione, boolean completa, boolean gestita, - String codicePagamentoOneri, String causalePagamentoOneri, String mezzoPagamentoOneri, - String importoBolli, String importoSpeseIstruttoria, Date dataEffettuazione, int statusTask, - boolean workflowForzato, long soggettoSostituitoId, long oldDettPraticaId, String destinazione, - String ag, String descLongIntervento, String via, String localita, String estremiCatastali, - String estremiPratCom, long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, String codiceFiscaleDelegatoCommittente, - String codiceFiscaleDelegatoFineLavori, String codiceFiscaleDelegatoCollaudo, - String codiceRuoloDelegato, boolean lavoriInEconomiaCommittente, + public DettPratica updateDettPratica(long userId, long dettPraticaId, long intPraticaId, long integrazione, + String protocollo, String tipoIntegrazione, boolean completa, boolean gestita, String codicePagamentoOneri, + String causalePagamentoOneri, String mezzoPagamentoOneri, String importoBolli, + String importoSpeseIstruttoria, Date dataEffettuazione, int statusTask, boolean workflowForzato, + long soggettoSostituitoId, String destinazione, String ag, String descLongIntervento, String via, + String localita, String estremiCatastali, String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, boolean collaudoStatico, + String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, + String codiceFiscaleDelegatoCollaudo, String codiceRuoloDelegato, boolean lavoriInEconomiaCommittente, boolean inizioLavoriContestualeOpera, Date dataInizioLavoriOpera, Date dataInizioEsecuzioneOpera, Date dataFineEsecuzioneOpera, String metratura, boolean lavoriPubblici, long pagamentoIdOneri, int lavoriPubbliciPercentuale, String numeroCivico, String dcParticelle, String dcFoglio, String dcAllegato, String dePiani, String deAltezza, String deInterrati, String deSuperficie, - String deCostruzione, String deRistrutturazione, String deUso, String dePubblica, - String dePrivata, String deUtilizzazione, String dePosizioneEdificio, boolean deInfStradalePonte, + String deCostruzione, String deRistrutturazione, String deUso, String dePubblica, String dePrivata, + String deUtilizzazione, String dePosizioneEdificio, boolean deInfStradalePonte, boolean deInfStradaleStrada, boolean deInfStradaleAltro, boolean deInfIdraulicaLong, boolean deInfIdraulicaTrasv, boolean deInfIdraulicaAltro, boolean deInfOperaAccStradale, boolean deInfOperaAccIdraulica, boolean deInfOperaAccAltro, boolean deInfAltraInfrastruttura, - boolean deInfAltro, String deInfAltroDesc, String dccFondazioni, - boolean dccStruttureEleMuraturePietrame, boolean dccStruttureEleMuratureLaterizio, - boolean dccStruttureEleMuratureMisto, boolean dccStruttureEleMuratureStoriche, - String dccStruttureEleAcciaio, String dccStruttureEleCA, String dccStruttureEleLegno, - boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, + boolean deInfAltro, String deInfAltroDesc, String dccFondazioni, boolean dccStruttureEleMuraturePietrame, + boolean dccStruttureEleMuratureLaterizio, boolean dccStruttureEleMuratureMisto, + boolean dccStruttureEleMuratureStoriche, String dccStruttureEleAcciaio, String dccStruttureEleCA, + String dccStruttureEleLegno, boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, boolean dccStruttureEleMistoMuratura, boolean dccStruttureEleMistoLegno, - boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, - String dccStruttureEleAltroDescrizione, boolean dccOrizzontamentiCAAcciaio, - boolean dccOrizzontamentiLegno, boolean dccOrizzontamentiLegnoCA, - boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, - boolean dccOrizzontamentiAltro, String dccOrizzontamentiAltroDescrizione, String dccCopertura, - boolean dccCoperturaCAAcciaio, boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, - boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, - boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, boolean dccCoperturaAltro, - String dccCoperturaAltroDesrizione, boolean dccElemNonStrutLaterizio, - boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, - boolean dccElemNonStrutLegno, boolean dccElemNonStrutAltro, - String dccElemNonStrutAltroDescrizione, boolean dccOpereDiRinforzoInsCatene, + boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, String dccStruttureEleAltroDescrizione, + boolean dccOrizzontamentiCAAcciaio, boolean dccOrizzontamentiLegno, boolean dccOrizzontamentiLegnoCA, + boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, boolean dccOrizzontamentiAltro, + String dccOrizzontamentiAltroDescrizione, String dccCopertura, boolean dccCoperturaCAAcciaio, + boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, boolean dccCoperturaLamieraGrecata, + boolean dccCoperturaPannelli, boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, + boolean dccCoperturaAltro, String dccCoperturaAltroDesrizione, boolean dccElemNonStrutLaterizio, + boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, boolean dccElemNonStrutLegno, + boolean dccElemNonStrutAltro, String dccElemNonStrutAltroDescrizione, boolean dccOpereDiRinforzoInsCatene, boolean dccOpereDiRinforzoInsCordoli, boolean dccOpereDiRinforzoIniArmate, boolean dccOpereDiRinforzoPlaccaggi, boolean dccOpereDiRinforzoIrrSolai, boolean dccOpereDiRinforzoRinforziFRP, boolean dccOpereDiRinforzoTelaiECerchiature, boolean dccOpereDiRinforzoInsRompitratta, boolean dccOpereDiRinforzoAltro, - String dccOpereDiRinforzoAltroDescrizione, String geoClasseIndagine, - String geoCategoriaSottosuolo, String geoCategoriaTopografica, String geoConsolidamento, - String geoPericolositaGeologica, String geoRischioGeomorfologicoPai, - String geoPericolositaIdraulicaPai, String geoRischioIdraulicoPai, String geoPericolositaSismica, - String geoPericolositaIdraulica, String geoPericolositaGeomorfica, + String dccOpereDiRinforzoAltroDescrizione, String geoClasseIndagine, String geoCategoriaSottosuolo, + String geoCategoriaTopografica, String geoConsolidamento, String geoPericolositaGeologica, + String geoRischioGeomorfologicoPai, String geoPericolositaIdraulicaPai, String geoRischioIdraulicoPai, + String geoPericolositaSismica, String geoPericolositaIdraulica, String geoPericolositaGeomorfica, String geoFattibilitaGeologica, String geoFattibilitaSismica, String geoFattibilitaIdraulica, String geoOperaRilevante, String geoOpereDiSostegno, String geoOpereInSotterranea, String geoPresenzaPrescrizioni, String geoNotePrescrizioni, String geoNoteIndagini, @@ -732,30 +586,25 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl Double pagPareriDiMassima, Double pagAltriCasiPaesaggistici, Double pagVariantiPareriResi, Double pagRilascioAttestazioni, Double pagConsultazioniArchivio, String note, String noteUfficio, String localizzazioneGeografica, boolean tcNuovaCostruzione, boolean tcAdeguamentoSismico, - boolean tcMiglioramentoSismico, boolean tcRiparazioneInterventoLocale, boolean tcInCA, - boolean tcInOpera, boolean tcPrefabbricato, boolean tcInAcciaio, boolean tcMista, - boolean tcInMuratura, boolean tcInMuraturaOrdinaria, boolean tcInMuraturaArmata, - boolean tcInMuraturaMista, boolean tcInLegno, boolean tcAltro, String tcAltroDescrizione, - boolean tcConDispositivi, boolean normLavoriInProprio, boolean normEsenteBollo, - boolean normEsenteSpese, boolean normDpr01Dep, boolean normDpr02Dep, boolean normDpr01Aut, - boolean normDpr02Aut, boolean normDm01, boolean normDm02, boolean normDm03, boolean normDm2018, - boolean normDprg01, boolean normDprg02, boolean normAnr, boolean normArt3com3, + boolean tcMiglioramentoSismico, boolean tcRiparazioneInterventoLocale, boolean tcInCA, boolean tcInOpera, + boolean tcPrefabbricato, boolean tcInAcciaio, boolean tcMista, boolean tcInMuratura, + boolean tcInMuraturaOrdinaria, boolean tcInMuraturaArmata, boolean tcInMuraturaMista, boolean tcInLegno, + boolean tcAltro, String tcAltroDescrizione, boolean tcConDispositivi, boolean normLavoriInProprio, + boolean normEsenteBollo, boolean normEsenteSpese, boolean normDpr01Dep, boolean normDpr02Dep, + boolean normDpr01Aut, boolean normDpr02Aut, boolean normDm01, boolean normDm02, boolean normDm03, + boolean normDm2018, boolean normDprg01, boolean normDprg02, boolean normAnr, boolean normArt3com3, boolean normArt3com4, boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, - boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, - String clRischioPostInt, boolean intervFinPub, String intervFinPubDesc, - ServiceContext serviceContext, boolean bozza, String paesaggioLocale, String livelloDiTutela, - String vincoli, String destinazioneAltroIntervento, Boolean tcCostruzioniEsistenti, - Boolean tcManutOrdStraord, Boolean tcAltriInterventi, String tcAltriInterventiDesc, - boolean noCollaudo, boolean tcNuovaCostruzionePertinenza, boolean tcInterventoOpereEscavazione, - boolean tcViarch, boolean tcOperaA25, boolean sanatoriaEdilizia47, boolean sanatoriaEdilizia724, - boolean sanatoriaEdilizia326, boolean normLavoriNoDirettore, double pagSoggettiAdAutorizzazione, - String interventoVoceP7) throws PortalException, - SystemException { + boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, + boolean intervFinPub, String intervFinPubDesc, ServiceContext serviceContext, boolean bozza, + String paesaggioLocale, String livelloDiTutela, String vincoli, String destinazioneAltroIntervento, + Boolean tcCostruzioniEsistenti, Boolean tcManutOrdStraord, Boolean tcAltriInterventi, + String tcAltriInterventiDesc, boolean noCollaudo, boolean tcNuovaCostruzionePertinenza, + boolean tcInterventoOpereEscavazione, boolean tcViarch, boolean tcOperaA25, boolean sanatoriaEdilizia47, + boolean sanatoriaEdilizia724, boolean sanatoriaEdilizia326, boolean normLavoriNoDirettore, + double pagSoggettiAdAutorizzazione, String interventoVoceP7) throws PortalException, SystemException { Date now = new Date(); - DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); - dettPratica.setModifiedDate(serviceContext.getModifiedDate(now)); dettPratica.setIntPraticaId(intPraticaId); dettPratica.setIntegrazione(integrazione); @@ -772,7 +621,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setStatusTask(statusTask); dettPratica.setWorkflowForzato(workflowForzato); dettPratica.setSoggettoSostituitoId(soggettoSostituitoId); - dettPratica.setOldDettPraticaId(oldDettPraticaId); dettPratica.setDestinazione(destinazione); dettPratica.setAg(ag); dettPratica.setDescLongIntervento(descLongIntervento); @@ -946,9 +794,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setNormDpr02Dep(normDpr02Dep); dettPratica.setNormDpr01Aut(normDpr01Aut); dettPratica.setNormDpr02Aut(normDpr02Aut); - // dettPratica.setNormDpr03(normDpr02Dep); - // dettPratica.setNormDpr04(normDpr02Dep); - // dettPratica.setNormDpr05(normDpr02Dep); dettPratica.setNormDm01(normDm01); dettPratica.setNormDm02(normDm02); dettPratica.setNormDm03(normDm03); @@ -963,141 +808,88 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setNormLTC01(normLTC01); dettPratica.setNormArt3com3(normArt3com3); dettPratica.setNormArt3com4(normArt3com4); - dettPratica.setSuap(suap); dettPratica.setNormSismaBonus(normSismaBonus); dettPratica.setClRischioPreInt(clRischioPreInt); dettPratica.setClRischioPostInt(clRischioPostInt); dettPratica.setIntervFinPub(intervFinPub); dettPratica.setIntervFinPubDesc(intervFinPubDesc); - dettPratica.setPaesaggioLocale(paesaggioLocale); dettPratica.setLivelloDiTutela(livelloDiTutela); dettPratica.setVincoli(vincoli); - dettPratica.setDestinazioneAltroIntervento(destinazioneAltroIntervento); dettPratica.setTcCostruzioniEsistenti(tcCostruzioniEsistenti); dettPratica.setTcManutOrdStraord(tcManutOrdStraord); dettPratica.setTcAltriInterventi(tcAltriInterventi); dettPratica.setTcAltriInterventiDesc(tcAltriInterventiDesc); - dettPratica.setSanatoriaEdilizia47(sanatoriaEdilizia47); dettPratica.setSanatoriaEdilizia724(sanatoriaEdilizia724); dettPratica.setSanatoriaEdilizia326(sanatoriaEdilizia326); - dettPratica.setInterventoVoceP7(interventoVoceP7); - dettPratica.setNormLavoriNoDirettore(normLavoriNoDirettore); - dettPratica = dettPraticaPersistence.update(dettPratica); - resourceLocalService.updateModelResources(dettPratica, serviceContext); - updateAsset(dettPratica, serviceContext); return dettPratica; } + @Override @Indexable(type = IndexableType.REINDEX) public DettPratica updateDettPraticaDatiDomanda(long userId, long dettPraticaId, long intPraticaId, String tipoIntegrazione, String destinazione, String ag, String descLongIntervento, String via, String localita, String estremiCatastali, String estremiPratCom, boolean varianteSostanziale, - boolean collaudoStatico, String codiceFiscaleDelegatoCommittente, - String codiceFiscaleDelegatoFineLavori, String codiceFiscaleDelegatoCollaudo, - boolean lavoriInEconomiaCommittente, String metratura, boolean lavoriPubblici, - long pagamentoIdOneri, int lavoriPubbliciPercentuale, String numeroCivico, String dcParticelle, - String dcFoglio, String dcAllegato, String dePiani, String deAltezza, String deInterrati, - String deSuperficie, String deCostruzione, String deRistrutturazione, String deUso, + boolean collaudoStatico, String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, + String codiceFiscaleDelegatoCollaudo, boolean lavoriInEconomiaCommittente, String metratura, + boolean lavoriPubblici, long pagamentoIdOneri, int lavoriPubbliciPercentuale, String numeroCivico, + String dcParticelle, String dcFoglio, String dcAllegato, String dePiani, String deAltezza, + String deInterrati, String deSuperficie, String deCostruzione, String deRistrutturazione, String deUso, String dePubblica, String dePrivata, String deUtilizzazione, String dePosizioneEdificio, boolean deInfStradalePonte, boolean deInfStradaleStrada, boolean deInfStradaleAltro, boolean deInfIdraulicaLong, boolean deInfIdraulicaTrasv, boolean deInfIdraulicaAltro, boolean deInfOperaAccStradale, boolean deInfOperaAccIdraulica, boolean deInfOperaAccAltro, - boolean deInfAltraInfrastruttura, boolean deInfAltro, String deInfAltroDesc, - String dccFondazioni, boolean dccStruttureEleMuraturePietrame, - boolean dccStruttureEleMuratureLaterizio, boolean dccStruttureEleMuratureMisto, - boolean dccStruttureEleMuratureStoriche, String dccStruttureEleAcciaio, String dccStruttureEleCA, - String dccStruttureEleLegno, boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, - boolean dccStruttureEleMistoMuratura, boolean dccStruttureEleMistoLegno, - boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, - String dccStruttureEleAltroDescrizione, boolean dccOrizzontamentiCAAcciaio, - boolean dccOrizzontamentiLegno, boolean dccOrizzontamentiLegnoCA, - boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, + boolean deInfAltraInfrastruttura, boolean deInfAltro, String deInfAltroDesc, String dccFondazioni, + boolean dccStruttureEleMuraturePietrame, boolean dccStruttureEleMuratureLaterizio, + boolean dccStruttureEleMuratureMisto, boolean dccStruttureEleMuratureStoriche, + String dccStruttureEleAcciaio, String dccStruttureEleCA, String dccStruttureEleLegno, + boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, boolean dccStruttureEleMistoMuratura, + boolean dccStruttureEleMistoLegno, boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, + String dccStruttureEleAltroDescrizione, boolean dccOrizzontamentiCAAcciaio, boolean dccOrizzontamentiLegno, + boolean dccOrizzontamentiLegnoCA, boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, boolean dccOrizzontamentiAltro, String dccOrizzontamentiAltroDescrizione, String dccCopertura, boolean dccCoperturaCAAcciaio, boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, - boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, - boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, boolean dccCoperturaAltro, - String dccCoperturaAltroDesrizione, boolean dccElemNonStrutLaterizio, - boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, - boolean dccElemNonStrutLegno, boolean dccElemNonStrutAltro, - String dccElemNonStrutAltroDescrizione, boolean dccOpereDiRinforzoInsCatene, - boolean dccOpereDiRinforzoInsCordoli, boolean dccOpereDiRinforzoIniArmate, - boolean dccOpereDiRinforzoPlaccaggi, boolean dccOpereDiRinforzoIrrSolai, - boolean dccOpereDiRinforzoRinforziFRP, boolean dccOpereDiRinforzoTelaiECerchiature, - boolean dccOpereDiRinforzoInsRompitratta, boolean dccOpereDiRinforzoAltro, - String dccOpereDiRinforzoAltroDescrizione, String localizzazioneGeografica, - boolean tcNuovaCostruzione, boolean tcAdeguamentoSismico, boolean tcMiglioramentoSismico, - boolean tcRiparazioneInterventoLocale, boolean tcInCA, boolean tcInOpera, + boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, boolean dccCoperturaPVCTelonati, + boolean dccCoperturaLeggere, boolean dccCoperturaAltro, String dccCoperturaAltroDesrizione, + boolean dccElemNonStrutLaterizio, boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, + boolean dccElemNonStrutLegno, boolean dccElemNonStrutAltro, String dccElemNonStrutAltroDescrizione, + boolean dccOpereDiRinforzoInsCatene, boolean dccOpereDiRinforzoInsCordoli, + boolean dccOpereDiRinforzoIniArmate, boolean dccOpereDiRinforzoPlaccaggi, + boolean dccOpereDiRinforzoIrrSolai, boolean dccOpereDiRinforzoRinforziFRP, + boolean dccOpereDiRinforzoTelaiECerchiature, boolean dccOpereDiRinforzoInsRompitratta, + boolean dccOpereDiRinforzoAltro, String dccOpereDiRinforzoAltroDescrizione, + String localizzazioneGeografica, boolean tcNuovaCostruzione, boolean tcAdeguamentoSismico, + boolean tcMiglioramentoSismico, boolean tcRiparazioneInterventoLocale, boolean tcInCA, boolean tcInOpera, boolean tcPrefabbricato, boolean tcInAcciaio, boolean tcMista, boolean tcInMuratura, - boolean tcInMuraturaOrdinaria, boolean tcInMuraturaArmata, boolean tcInMuraturaMista, - boolean tcInLegno, boolean tcAltro, String tcAltroDescrizione, boolean tcConDispositivi, - boolean normLavoriInProprio, boolean normEsenteBollo, boolean normEsenteSpese, - boolean normDpr01Dep, boolean normDpr02Dep, boolean normDpr01Aut, boolean normDpr02Aut, - boolean normDm01, boolean normDm02, boolean normDm03, boolean normDm2018, boolean normDprg01, - boolean normDprg02, boolean normAnr, boolean normArt3com3, boolean normArt3com4, - boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, boolean normLTC01, - boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, + boolean tcInMuraturaOrdinaria, boolean tcInMuraturaArmata, boolean tcInMuraturaMista, boolean tcInLegno, + boolean tcAltro, String tcAltroDescrizione, boolean tcConDispositivi, boolean normLavoriInProprio, + boolean normEsenteBollo, boolean normEsenteSpese, boolean normDpr01Dep, boolean normDpr02Dep, + boolean normDpr01Aut, boolean normDpr02Aut, boolean normDm01, boolean normDm02, boolean normDm03, + boolean normDm2018, boolean normDprg01, boolean normDprg02, boolean normAnr, boolean normArt3com3, + boolean normArt3com4, boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, + boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, boolean intervFinPub, String intervFinPubDesc, ServiceContext serviceContext, boolean bozza, - String paesaggioLocale, String livelloDiTutela, String vincoli, - String destinazioneAltroIntervento, Boolean tcCostruzioniEsistenti, Boolean tcManutOrdStraord, - Boolean tcAltriInterventi, String tcAltriInterventiDesc, boolean noCollaudo, - boolean tcNuovaCostruzionePertinenza, boolean tcInterventoOpereEscavazione, boolean tcViarch, - boolean tcOperaA25, boolean sanatoriaEdilizia47, boolean sanatoriaEdilizia724, - boolean sanatoriaEdilizia326, boolean normLavoriNoDirettore, String interventoVoceP7) throws PortalException, - SystemException { + String paesaggioLocale, String livelloDiTutela, String vincoli, String destinazioneAltroIntervento, + Boolean tcCostruzioniEsistenti, Boolean tcManutOrdStraord, Boolean tcAltriInterventi, + String tcAltriInterventiDesc, boolean noCollaudo, boolean tcNuovaCostruzionePertinenza, + boolean tcInterventoOpereEscavazione, boolean tcViarch, boolean tcOperaA25, boolean sanatoriaEdilizia47, + boolean sanatoriaEdilizia724, boolean sanatoriaEdilizia326, boolean normLavoriNoDirettore, + String interventoVoceP7) throws PortalException, SystemException { Date now = new Date(); - - validateDatiDomanda(userId, dettPraticaId, intPraticaId, tipoIntegrazione, metratura, lavoriPubblici, - pagamentoIdOneri, lavoriPubbliciPercentuale, numeroCivico, dcParticelle, dcFoglio, - dcAllegato, dePiani, deAltezza, deInterrati, deSuperficie, deCostruzione, deRistrutturazione, - deUso, dePubblica, dePrivata, deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, - deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, - deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, dccFondazioni, - dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, - dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, - dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, - dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, dccStruttureElePrefabbricato, - dccStruttureEleAltro, dccStruttureEleAltroDescrizione, dccOrizzontamentiCAAcciaio, - dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, dccOrizzontamentiLamieraGrecata, - dccOrizzontamentiVolte, dccOrizzontamentiAltro, dccOrizzontamentiAltroDescrizione, - dccCopertura, dccCoperturaCAAcciaio, dccCoperturaLegno, dccCoperturaLegnoCA, - dccCoperturaLamieraGrecata, dccCoperturaPannelli, dccCoperturaPVCTelonati, - dccCoperturaLeggere, dccCoperturaAltro, dccCoperturaAltroDesrizione, - dccElemNonStrutLaterizio, dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, - dccElemNonStrutLegno, dccElemNonStrutAltro, dccElemNonStrutAltroDescrizione, - dccOpereDiRinforzoInsCatene, dccOpereDiRinforzoInsCordoli, dccOpereDiRinforzoIniArmate, - dccOpereDiRinforzoPlaccaggi, dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - dccOpereDiRinforzoTelaiECerchiature, dccOpereDiRinforzoInsRompitratta, - dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, localizzazioneGeografica, - tcNuovaCostruzione, tcAdeguamentoSismico, tcMiglioramentoSismico, - tcRiparazioneInterventoLocale, tcInCA, tcInOpera, tcPrefabbricato, tcInAcciaio, tcMista, - tcInMuratura, tcInMuraturaOrdinaria, tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, - tcAltro, tcAltroDescrizione, tcConDispositivi, normLavoriInProprio, normEsenteBollo, - normEsenteSpese, normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, - normDm03, normDm2018, normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, - normDm04, normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, - clRischioPostInt, intervFinPub, intervFinPubDesc, sanatoriaEdilizia47, sanatoriaEdilizia724, - sanatoriaEdilizia326, normLavoriNoDirettore, interventoVoceP7, serviceContext, bozza); - DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); - dettPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - dettPratica.setIntPraticaId(intPraticaId); - dettPratica.setTipoIntegrazione(tipoIntegrazione); dettPratica.setVarianteSostanziale(varianteSostanziale); - dettPratica.setDestinazione(destinazione); dettPratica.setAg(ag); dettPratica.setDescLongIntervento(descLongIntervento); @@ -1216,9 +1008,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setNormDpr02Dep(normDpr02Dep); dettPratica.setNormDpr01Aut(normDpr01Aut); dettPratica.setNormDpr02Aut(normDpr02Aut); - // dettPratica.setNormDpr03(normDpr02Dep); - // dettPratica.setNormDpr04(normDpr02Dep); - // dettPratica.setNormDpr05(normDpr02Dep); dettPratica.setNormDm01(normDm01); dettPratica.setNormDm02(normDm02); dettPratica.setNormDm03(normDm03); @@ -1233,163 +1022,76 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setNormLTC01(normLTC01); dettPratica.setNormArt3com3(normArt3com3); dettPratica.setNormArt3com4(normArt3com4); - dettPratica.setSuap(suap); dettPratica.setNormSismaBonus(normSismaBonus); dettPratica.setClRischioPreInt(clRischioPreInt); dettPratica.setClRischioPostInt(clRischioPostInt); dettPratica.setIntervFinPub(intervFinPub); dettPratica.setIntervFinPubDesc(intervFinPubDesc); - dettPratica.setCodiceFiscaleDelegatoCommittente(codiceFiscaleDelegatoCommittente); dettPratica.setCodiceFiscaleDelegatoFineLavori(codiceFiscaleDelegatoFineLavori); dettPratica.setCodiceFiscaleDelegatoCollaudo(codiceFiscaleDelegatoCollaudo); - dettPratica.setPaesaggioLocale(paesaggioLocale); dettPratica.setLivelloDiTutela(livelloDiTutela); dettPratica.setVincoli(vincoli); - dettPratica.setDestinazioneAltroIntervento(destinazioneAltroIntervento); dettPratica.setTcCostruzioniEsistenti(tcCostruzioniEsistenti); dettPratica.setTcManutOrdStraord(tcManutOrdStraord); dettPratica.setTcAltriInterventi(tcAltriInterventi); dettPratica.setTcAltriInterventiDesc(tcAltriInterventiDesc); - dettPratica.setSanatoriaEdilizia326(sanatoriaEdilizia326); dettPratica.setSanatoriaEdilizia47(sanatoriaEdilizia47); dettPratica.setSanatoriaEdilizia724(sanatoriaEdilizia724); - dettPratica.setInterventoVoceP7(interventoVoceP7); - dettPratica.setNormLavoriNoDirettore(normLavoriNoDirettore); - dettPratica = dettPraticaPersistence.update(dettPratica); - resourceLocalService.updateModelResources(dettPratica, serviceContext); - updateAsset(dettPratica, serviceContext); return dettPratica; } + @Override @Indexable(type = IndexableType.REINDEX) public DettPratica updateDettPraticaDatiIntegrazione(long userId, long dettPraticaId, long intPraticaId, String tipoIntegrazione, String destinazione, String descLongIntervento, boolean collaudoStatico, String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, - String codiceFiscaleDelegatoCollaudo, boolean lavoriInEconomiaCommittente, - boolean lavoriPubblici, boolean deInfStradalePonte, boolean deInfStradaleStrada, - boolean deInfStradaleAltro, boolean deInfIdraulicaLong, boolean deInfIdraulicaTrasv, - boolean deInfIdraulicaAltro, boolean deInfOperaAccStradale, boolean deInfOperaAccIdraulica, - boolean deInfOperaAccAltro, boolean deInfAltraInfrastruttura, boolean deInfAltro, - String deInfAltroDesc, String dccFondazioni, boolean dccStruttureEleMuraturePietrame, - boolean dccStruttureEleMuratureLaterizio, boolean dccStruttureEleMuratureMisto, - boolean dccStruttureEleMuratureStoriche, String dccStruttureEleAcciaio, String dccStruttureEleCA, - String dccStruttureEleLegno, boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, - boolean dccStruttureEleMistoMuratura, boolean dccStruttureEleMistoLegno, - boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, - String dccStruttureEleAltroDescrizione, boolean dccOrizzontamentiCAAcciaio, - boolean dccOrizzontamentiLegno, boolean dccOrizzontamentiLegnoCA, - boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, + String codiceFiscaleDelegatoCollaudo, boolean lavoriInEconomiaCommittente, boolean lavoriPubblici, + boolean deInfStradalePonte, boolean deInfStradaleStrada, boolean deInfStradaleAltro, + boolean deInfIdraulicaLong, boolean deInfIdraulicaTrasv, boolean deInfIdraulicaAltro, + boolean deInfOperaAccStradale, boolean deInfOperaAccIdraulica, boolean deInfOperaAccAltro, + boolean deInfAltraInfrastruttura, boolean deInfAltro, String deInfAltroDesc, String dccFondazioni, + boolean dccStruttureEleMuraturePietrame, boolean dccStruttureEleMuratureLaterizio, + boolean dccStruttureEleMuratureMisto, boolean dccStruttureEleMuratureStoriche, + String dccStruttureEleAcciaio, String dccStruttureEleCA, String dccStruttureEleLegno, + boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, boolean dccStruttureEleMistoMuratura, + boolean dccStruttureEleMistoLegno, boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, + String dccStruttureEleAltroDescrizione, boolean dccOrizzontamentiCAAcciaio, boolean dccOrizzontamentiLegno, + boolean dccOrizzontamentiLegnoCA, boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, boolean dccOrizzontamentiAltro, String dccOrizzontamentiAltroDescrizione, String dccCopertura, boolean dccCoperturaCAAcciaio, boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, - boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, - boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, boolean dccCoperturaAltro, - String dccCoperturaAltroDesrizione, boolean dccElemNonStrutLaterizio, - boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, - boolean dccElemNonStrutLegno, boolean dccElemNonStrutAltro, - String dccElemNonStrutAltroDescrizione, boolean dccOpereDiRinforzoInsCatene, - boolean dccOpereDiRinforzoInsCordoli, boolean dccOpereDiRinforzoIniArmate, - boolean dccOpereDiRinforzoPlaccaggi, boolean dccOpereDiRinforzoIrrSolai, - boolean dccOpereDiRinforzoRinforziFRP, boolean dccOpereDiRinforzoTelaiECerchiature, - boolean dccOpereDiRinforzoInsRompitratta, boolean dccOpereDiRinforzoAltro, - String dccOpereDiRinforzoAltroDescrizione, boolean tcNuovaCostruzione, - boolean tcAdeguamentoSismico, boolean tcMiglioramentoSismico, - boolean tcRiparazioneInterventoLocale, boolean normLavoriInProprio, boolean normEsenteBollo, - boolean normEsenteSpese, boolean normDpr01Dep, boolean normDpr02Dep, boolean normDpr01Aut, - boolean normDpr02Aut, boolean normArt3com3, boolean normArt3com4, ServiceContext serviceContext, - boolean bozza, boolean noCollaudo, boolean tcNuovaCostruzionePertinenza, - boolean tcInterventoOpereEscavazione, boolean tcViarch, boolean tcOperaA25, - boolean sanatoriaEdilizia47, boolean sanatoriaEdilizia724, boolean sanatoriaEdilizia326, - boolean normLavoriNoDirettore, String interventoVoceP7) throws PortalException, SystemException { + boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, boolean dccCoperturaPVCTelonati, + boolean dccCoperturaLeggere, boolean dccCoperturaAltro, String dccCoperturaAltroDesrizione, + boolean dccElemNonStrutLaterizio, boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, + boolean dccElemNonStrutLegno, boolean dccElemNonStrutAltro, String dccElemNonStrutAltroDescrizione, + boolean dccOpereDiRinforzoInsCatene, boolean dccOpereDiRinforzoInsCordoli, + boolean dccOpereDiRinforzoIniArmate, boolean dccOpereDiRinforzoPlaccaggi, + boolean dccOpereDiRinforzoIrrSolai, boolean dccOpereDiRinforzoRinforziFRP, + boolean dccOpereDiRinforzoTelaiECerchiature, boolean dccOpereDiRinforzoInsRompitratta, + boolean dccOpereDiRinforzoAltro, String dccOpereDiRinforzoAltroDescrizione, boolean tcNuovaCostruzione, + boolean tcAdeguamentoSismico, boolean tcMiglioramentoSismico, boolean tcRiparazioneInterventoLocale, + boolean normLavoriInProprio, boolean normEsenteBollo, boolean normEsenteSpese, boolean normDpr01Dep, + boolean normDpr02Dep, boolean normDpr01Aut, boolean normDpr02Aut, boolean normArt3com3, + boolean normArt3com4, ServiceContext serviceContext, boolean bozza, boolean noCollaudo, + boolean tcNuovaCostruzionePertinenza, boolean tcInterventoOpereEscavazione, boolean tcViarch, + boolean tcOperaA25, boolean sanatoriaEdilizia47, boolean sanatoriaEdilizia724, + boolean sanatoriaEdilizia326, boolean normLavoriNoDirettore, String interventoVoceP7) + throws PortalException, SystemException { Date now = new Date(); - - // validateDatiDomanda(userId, dettPraticaId, intPraticaId, - // tipoIntegrazione, metratura, - // lavoriPubblici, - // pagamentoIdOneri, lavoriPubbliciPercentuale, numeroCivico, - // dcParticelle, dcFoglio, - // dcAllegato, dePiani, - // deAltezza, deInterrati, deSuperficie, deCostruzione, - // deRistrutturazione, deUso, dePubblica, - // dePrivata, - // deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, - // deInfStradaleStrada, - // deInfStradaleAltro, - // deInfIdraulicaLong, deInfIdraulicaTrasv, deInfIdraulicaAltro, - // deInfOperaAccStradale, - // deInfOperaAccIdraulica, - // deInfOperaAccAltro, deInfAltraInfrastruttura, deInfAltro, - // deInfAltroDesc, dccFondazioni, - // dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, - // dccStruttureEleMuratureMisto, - // dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, - // dccStruttureEleCA, - // dccStruttureEleLegno, - // dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, - // dccStruttureEleMistoMuratura, - // dccStruttureEleMistoLegno, - // dccStruttureElePrefabbricato, dccStruttureEleAltro, - // dccStruttureEleAltroDescrizione, - // dccOrizzontamentiCAAcciaio, dccOrizzontamentiLegno, - // dccOrizzontamentiLegnoCA, - // dccOrizzontamentiLamieraGrecata, - // dccOrizzontamentiVolte, dccOrizzontamentiAltro, - // dccOrizzontamentiAltroDescrizione, - // dccCopertura, - // dccCoperturaCAAcciaio, dccCoperturaLegno, dccCoperturaLegnoCA, - // dccCoperturaLamieraGrecata, - // dccCoperturaPannelli, dccCoperturaPVCTelonati, dccCoperturaLeggere, - // dccCoperturaAltro, - // dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, - // dccElemNonStrutCartongesso, - // dccElemNonStrutCalcestruzzo, - // dccElemNonStrutLegno, dccElemNonStrutAltro, - // dccElemNonStrutAltroDescrizione, - // dccOpereDiRinforzoInsCatene, - // dccOpereDiRinforzoInsCordoli, dccOpereDiRinforzoIniArmate, - // dccOpereDiRinforzoPlaccaggi, - // dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - // dccOpereDiRinforzoTelaiECerchiature, - // dccOpereDiRinforzoInsRompitratta, dccOpereDiRinforzoAltro, - // dccOpereDiRinforzoAltroDescrizione, - // localizzazioneGeografica, tcNuovaCostruzione, tcAdeguamentoSismico, - // tcMiglioramentoSismico, - // tcRiparazioneInterventoLocale, tcInCA, tcInOpera, tcPrefabbricato, - // tcInAcciaio, tcMista, - // tcInMuratura, - // tcInMuraturaOrdinaria, tcInMuraturaArmata, tcInMuraturaMista, - // tcInLegno, tcAltro, - // tcAltroDescrizione, - // tcConDispositivi, normLavoriInProprio, normEsenteBollo, - // normEsenteSpese, normDpr01Dep, - // normDpr02Dep, - // normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, normDprg01, - // normDprg02, normAnr, - // normArt3com3, - // normArt3com4, normOrd01, normDm04, normDm05, normCI01, normLTC01, - // suap, normSismaBonus, - // clRischioPreInt, - // clRischioPostInt, intervFinPub, intervFinPubDesc, serviceContext, - // bozza); - DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); - dettPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - dettPratica.setIntPraticaId(intPraticaId); - dettPratica.setTipoIntegrazione(tipoIntegrazione); - dettPratica.setDestinazione(destinazione); dettPratica.setDescLongIntervento(descLongIntervento); dettPratica.setLavoriInEconomiaCommittente(lavoriInEconomiaCommittente); @@ -1473,102 +1175,36 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setNormDpr02Aut(normDpr02Aut); dettPratica.setNormArt3com3(normArt3com3); dettPratica.setNormArt3com4(normArt3com4); - dettPratica.setCodiceFiscaleDelegatoCommittente(codiceFiscaleDelegatoCommittente); dettPratica.setCodiceFiscaleDelegatoFineLavori(codiceFiscaleDelegatoFineLavori); dettPratica.setCodiceFiscaleDelegatoCollaudo(codiceFiscaleDelegatoCollaudo); - dettPratica.setSanatoriaEdilizia47(sanatoriaEdilizia47); dettPratica.setSanatoriaEdilizia326(sanatoriaEdilizia326); dettPratica.setSanatoriaEdilizia724(sanatoriaEdilizia724); - dettPratica.setInterventoVoceP7(interventoVoceP7); - dettPratica.setNormLavoriNoDirettore(normLavoriNoDirettore); - dettPratica = dettPraticaPersistence.update(dettPratica); - resourceLocalService.updateModelResources(dettPratica, serviceContext); - updateAsset(dettPratica, serviceContext); return dettPratica; } - private void validateDatiDomanda(long userId, long dettPraticaId, long intPraticaId, - String tipoIntegrazione, String metratura, boolean lavoriPubblici, long pagamentoId, - int lavoriPubbliciPercentuale, String numeroCivico, String dcParticelle, String dcFoglio, - String dcAllegato, String dePiani, String deAltezza, String deInterrati, String deSuperficie, - String deCostruzione, String deRistrutturazione, String deUso, String dePubblica, - String dePrivata, String deUtilizzazione, String dePosizioneEdificio, boolean deInfStradalePonte, - boolean deInfStradaleStrada, boolean deInfStradaleAltro, boolean deInfIdraulicaLong, - boolean deInfIdraulicaTrasv, boolean deInfIdraulicaAltro, boolean deInfOperaAccStradale, - boolean deInfOperaAccIdraulica, boolean deInfOperaAccAltro, boolean deInfAltraInfrastruttura, - boolean deInfAltro, String deInfAltroDesc, String dccFondazioni, - boolean dccStruttureEleMuraturePietrame, boolean dccStruttureEleMuratureLaterizio, - boolean dccStruttureEleMuratureMisto, boolean dccStruttureEleMuratureStoriche, - String dccStruttureEleAcciaio, String dccStruttureEleCA, String dccStruttureEleLegno, - boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, - boolean dccStruttureEleMistoMuratura, boolean dccStruttureEleMistoLegno, - boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, - String dccStruttureEleAltroDescrizione, boolean dccOrizzontamentiCAAcciaio, - boolean dccOrizzontamentiLegno, boolean dccOrizzontamentiLegnoCA, - boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, - boolean dccOrizzontamentiAltro, String dccOrizzontamentiAltroDescrizione, String dccCopertura, - boolean dccCoperturaCAAcciaio, boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, - boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, - boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, boolean dccCoperturaAltro, - String dccCoperturaAltroDesrizione, boolean dccElemNonStrutLaterizio, - boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, - boolean dccElemNonStrutLegno, boolean dccElemNonStrutAltro, - String dccElemNonStrutAltroDescrizione, boolean dccOpereDiRinforzoInsCatene, - boolean dccOpereDiRinforzoInsCordoli, boolean dccOpereDiRinforzoIniArmate, - boolean dccOpereDiRinforzoPlaccaggi, boolean dccOpereDiRinforzoIrrSolai, - boolean dccOpereDiRinforzoRinforziFRP, boolean dccOpereDiRinforzoTelaiECerchiature, - boolean dccOpereDiRinforzoInsRompitratta, boolean dccOpereDiRinforzoAltro, - String dccOpereDiRinforzoAltroDescrizione, String localizzazioneGeografica, - boolean tcNuovaCostruzione, boolean tcAdeguamentoSismico, boolean tcMiglioramentoSismico, - boolean tcRiparazioneInterventoLocale, boolean tcInCA, boolean tcInOpera, - boolean tcPrefabbricato, boolean tcInAcciaio, boolean tcMista, boolean tcInMuratura, - boolean tcInMuraturaOrdinaria, boolean tcInMuraturaArmata, boolean tcInMuraturaMista, - boolean tcInLegno, boolean tcAltro, String tcAltroDescrizione, boolean tcConDispositivi, - boolean normLavoriInProprio, boolean normEsenteBollo, boolean normEsenteSpese, - boolean normDpr01Dep, boolean normDpr02Dep, boolean normDpr01Aut, boolean normDpr02Aut, - boolean normDm01, boolean normDm02, boolean normDm03, boolean normDm2018, boolean normDprg01, - boolean normDprg02, boolean normAnr, boolean normArt3com3, boolean normArt3com4, - boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, boolean normLTC01, - boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, - boolean intervFinPub, String intervFinPubDesc, boolean sanatoriaEdilizia47, - boolean sanatoriaEdilizia724, boolean sanatoriaEdilizia326, boolean normLavoriNoDirettore, - String interventoVoceP7, ServiceContext serviceContext, boolean bozza) { - } - + @Override @Indexable(type = IndexableType.REINDEX) public DettPratica updateDettPraticaGeologo(long userId, long dettPraticaId, long intPraticaId, String geoClasseIndagine, String geoCategoriaSottosuolo, String geoCategoriaTopografica, String geoConsolidamento, String geoPericolositaGeologica, String geoRischioGeomorfologicoPai, String geoPericolositaIdraulicaPai, String geoRischioIdraulicoPai, String geoPericolositaSismica, - String geoPericolositaIdraulica, String geoPericolositaGeomorfica, - String geoFattibilitaGeologica, String geoFattibilitaSismica, String geoFattibilitaIdraulica, - String geoOperaRilevante, String geoOpereDiSostegno, String geoOpereInSotterranea, - String geoPresenzaPrescrizioni, String geoNotePrescrizioni, String geoNoteIndagini, - String geoEvidenzeGeomorfiche, String geoEvidenzeGeologiche, Date geoDtRelazione, - ServiceContext serviceContext, boolean bozza) throws PortalException, SystemException { + String geoPericolositaIdraulica, String geoPericolositaGeomorfica, String geoFattibilitaGeologica, + String geoFattibilitaSismica, String geoFattibilitaIdraulica, String geoOperaRilevante, + String geoOpereDiSostegno, String geoOpereInSotterranea, String geoPresenzaPrescrizioni, + String geoNotePrescrizioni, String geoNoteIndagini, String geoEvidenzeGeomorfiche, + String geoEvidenzeGeologiche, Date geoDtRelazione, ServiceContext serviceContext, boolean bozza) + throws PortalException, SystemException { Date now = new Date(); - - validateDatiGeologo(userId, dettPraticaId, intPraticaId, geoClasseIndagine, geoCategoriaSottosuolo, - geoCategoriaTopografica, geoConsolidamento, geoPericolositaGeologica, - geoRischioGeomorfologicoPai, geoPericolositaIdraulicaPai, geoRischioIdraulicoPai, - geoPericolositaSismica, geoPericolositaIdraulica, geoPericolositaGeomorfica, - geoFattibilitaGeologica, geoFattibilitaSismica, geoFattibilitaIdraulica, geoOperaRilevante, - geoOpereDiSostegno, geoOpereInSotterranea, geoPresenzaPrescrizioni, geoNotePrescrizioni, - geoNoteIndagini, geoEvidenzeGeomorfiche, geoEvidenzeGeologiche, geoDtRelazione, - serviceContext, bozza); - DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); - dettPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - dettPratica.setGeoClasseIndagine(geoClasseIndagine); dettPratica.setGeoCategoriaSottosuolo(geoCategoriaSottosuolo); dettPratica.setGeoCategoriaTopografica(geoCategoriaTopografica); @@ -1592,15 +1228,14 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setGeoEvidenzeGeomorfiche(geoEvidenzeGeomorfiche); dettPratica.setGeoEvidenzeGeologiche(geoEvidenzeGeologiche); dettPratica.setGeoDtRelazione(geoDtRelazione); - dettPratica = dettPraticaPersistence.update(dettPratica); - resourceLocalService.updateModelResources(dettPratica, serviceContext); - updateAsset(dettPratica, serviceContext); return dettPratica; } + @Override + @Indexable(type = IndexableType.REINDEX) public DettPratica updateDettPraticaPagamento(long dettPraticaId, String importoSpeseIstruttoria, String importoBolli, Double pagInterventiRestauroManufatti, Double pagAltriCasiCulturali, Double pagLottizzazioni, Double pagGrandiStrutture, Double pagCondotte, Double pagPalificazioni, @@ -1610,11 +1245,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl Double pagSoggettiAdAutorizzazione, ServiceContext serviceContext) throws SystemException, PortalException { Date now = new Date(); - DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); - dettPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - dettPratica.setImportoSpeseIstruttoria(importoSpeseIstruttoria); dettPratica.setImportoBolli(importoBolli); dettPratica.setPagInterventiRestauroManufatti(pagInterventiRestauroManufatti); @@ -1633,17 +1265,16 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPratica.setPagRilascioAttestazioni(pagRilascioAttestazioni); dettPratica.setPagConsultazioniArchivio(pagConsultazioniArchivio); dettPratica.setPagSoggettiAdAutorizzazione(pagSoggettiAdAutorizzazione); - dettPratica = dettPraticaPersistence.update(dettPratica); - resourceLocalService.updateModelResources(dettPratica, serviceContext); - updateAsset(dettPratica, serviceContext); return dettPratica; } - public DettPratica updateCheckPagamenti(long dettPraticaId, boolean normEsenteSpese, - boolean normEsenteBollo) throws SystemException, PortalException { + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica updateCheckPagamenti(long dettPraticaId, boolean normEsenteSpese, boolean normEsenteBollo) + throws SystemException, PortalException { DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); dettPratica.setNormEsenteSpese(normEsenteSpese); @@ -1652,49 +1283,43 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPratica; } - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, String stato) throws IOException, + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica updateEsitoPagamento(long pagamentoId, long dettPraticaId, String stato) throws IOException, SystemException, PortalException { - updateEsitoPagamento(pagamentoId, dettPraticaId, 0l, stato); + return updateEsitoPagamento(pagamentoId, dettPraticaId, 0l, stato); } - public void updateEsitoPagamento(long pagamentoId, long dettPraticaId, long fileEntryId, String stato) + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica updateEsitoPagamento(long pagamentoId, long dettPraticaId, long fileEntryId, String stato) throws IOException, SystemException, PortalException { Date now = new Date(); DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); dettPratica.setModifiedDate(now); - Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); String tipoPagamento = pagamento.getTipoPagamento(); - if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) { boolean completed = false; if (!dettPratica.isNormEsenteBollo() && !dettPratica.isNormEsenteSpese()) { if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { - Pagamento pagamentoBolli = pagamentoLocalService.getPagamento(dettPratica - .getPagamentoIdBolli()); - completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoBolli - .getUtilizzata()); + Pagamento pagamentoBolli = pagamentoLocalService.getPagamento(dettPratica.getPagamentoIdBolli()); + completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoBolli.getUtilizzata()); } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { - Pagamento pagamentoSpese = pagamentoLocalService.getPagamento(dettPratica - .getPagamentoIdOneri()); - completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoSpese - .getUtilizzata()); + Pagamento pagamentoSpese = pagamentoLocalService.getPagamento(dettPratica.getPagamentoIdOneri()); + completed = PagamentoConstants.UTILIZZATA_PAGATA.equalsIgnoreCase(pagamentoSpese.getUtilizzata()); } } else { - if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento) - && dettPratica.isNormEsenteBollo()) { + if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento) && dettPratica.isNormEsenteBollo()) { completed = true; - } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) - && dettPratica.isNormEsenteSpese()) { + } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) && dettPratica.isNormEsenteSpese()) { completed = true; } } - if (completed) { dettPratica = updateEsito(dettPraticaId, WorkflowConstants.STATUS_APPROVED); - try { WorkflowUtil.valutaEffettiInvioVariante(dettPratica); } catch (Exception e) { @@ -1703,57 +1328,51 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); delegaLocalService.concludiDeleghePagamento(dettPraticaId); - } else if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA) || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_ANNULLATO)) { pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); } - + return dettPratica; } + @Override public boolean isControlloObbligatorio(DettPratica dettPratica) { boolean isRiparazione = dettPratica.getTcRiparazioneInterventoLocale(); if (isRiparazione && !dettPratica.getTcNuovaCostruzione()) { return false; } - return !dettPratica.getDestinazione().equals("1") && !dettPratica.getDestinazione().equals("2"); } - public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException, SystemException, - PortalException { + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException, SystemException, PortalException { boolean sendMail = false; - Date now = new Date(); DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); dettPratica.setModifiedDate(now); - dettPratica.setStatus(stato); dettPratica.setCompleta(true); dettPratica.setDataEffettuazione(now); - IntPratica intPratica = intPraticaLocalService.updateDelegati(dettPratica.getIntPraticaId(), - dettPratica.getCodiceFiscaleDelegatoFineLavori(), - dettPratica.getCodiceFiscaleDelegatoCollaudo(), isControlloObbligatorio(dettPratica)); + dettPratica.getCodiceFiscaleDelegatoFineLavori(), dettPratica.getCodiceFiscaleDelegatoCollaudo(), + isControlloObbligatorio(dettPratica)); if (intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE) { intPratica.setValidata(true); intPratica = intPraticaLocalService.updateIntPratica(intPratica); } asseverazioneLocalService.concludiAsseverazioniExpired(dettPraticaId); - if (TipoIntegrazioneUtil.VARIANTE.equals(dettPratica.getTipoIntegrazione())) { - dettPratica.setVarianteNumero(dettPraticaPersistence - .countByIntPraticaId_TipoIntegrazione_Completa(dettPratica.getIntPraticaId(), - TipoIntegrazioneUtil.VARIANTE, true) + 1); + dettPratica.setVarianteNumero(dettPraticaPersistence.countByIntPraticaId_TipoIntegrazione_Completa( + dettPratica.getIntPraticaId(), TipoIntegrazioneUtil.VARIANTE, true) + 1); if (AzioniPraticheUtil.isAutorizzazione(dettPratica.getIntPraticaId()) && !dettPratica.getVarianteSostanziale()) { sendMail = true; } - } else if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equals(dettPratica.getTipoIntegrazione())) { dettPratica.setIntegrazione(dettPraticaPersistence.countByIntPraticaId_TipoIntegrazione_Completa( dettPratica.getIntPraticaId(), TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, true) + 1); @@ -1761,10 +1380,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl sendMail = true; } dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica); - docPraticaLocalService.completeInvalidation(dettPratica.getIntPraticaId()); soggettoLocalService.completeInvalidation(dettPratica.getIntPraticaId()); - // chiudo timer pratica se presente if (TipoIntegrazioneUtil.ANNULLA.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { Tempistica tempisticaPratica = tempisticaLocalService.getTempistica(intPratica.getCompanyId(), @@ -1773,51 +1390,41 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl tempisticaLocalService.concludiTempistica(tempisticaPratica.getTempisticaId(), new Date()); } // chiudo timer integrazione se presente - Tempistica tempisticaIntegrazione = tempisticaLocalService.getTempistica( - intPratica.getCompanyId(), intPratica.getIntPraticaId(), - TempisticaConstants.TIPO_INTEGRAZIONE, false); + Tempistica tempisticaIntegrazione = tempisticaLocalService.getTempistica(intPratica.getCompanyId(), + intPratica.getIntPraticaId(), TempisticaConstants.TIPO_INTEGRAZIONE, false); if (tempisticaIntegrazione != null) { - tempisticaLocalService.concludiTempistica(tempisticaIntegrazione.getTempisticaId(), - new Date()); + tempisticaLocalService.concludiTempistica(tempisticaIntegrazione.getTempisticaId(), new Date()); } - } else if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica - .getTipoIntegrazione())) { + } else if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { // chiudo time integrazione Tempistica tempisticaI = tempisticaLocalService.getTempistica(intPratica.getCompanyId(), dettPratica.getIntPraticaId(), TempisticaConstants.TIPO_INTEGRAZIONE, false); if (tempisticaI != null) { tempisticaLocalService.concludiTempistica(tempisticaI.getTempisticaId(), new Date()); } - // gestione tempistica riavvio in caso di integrazione long intPraticaId = dettPratica.getIntPraticaId(); - Tempistica tempisticaP = tempisticaLocalService.getTempistica(intPratica.getCompanyId(), - intPraticaId, TempisticaConstants.TIPO_PRATICA, false); + Tempistica tempisticaP = tempisticaLocalService.getTempistica(intPratica.getCompanyId(), intPraticaId, + TempisticaConstants.TIPO_PRATICA, false); if (tempisticaP != null) { tempisticaLocalService.ravvioTempistica(tempisticaP.getTempisticaId(), new Date()); } - } - if (sendMail && WorkflowUtil.isWorkflowDisattivabile(dettPratica.getIntPraticaId()) && Validator.isNotNull(intPratica.getStatusByUserId())) { inviaMailnotifica(dettPraticaId, intPratica.getStatusByUserId(), now); } - return dettPratica; } - private void inviaMailnotifica(long dettPraticaId, long tecnicoIstruttoreId, Date date) - throws SystemException, PortalException { + private void inviaMailnotifica(long dettPraticaId, long tecnicoIstruttoreId, Date date) throws SystemException, + PortalException { DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); - User tecnicoIstruttore = userLocalService.getUser(tecnicoIstruttoreId); - String[] to = { tecnicoIstruttore.getEmailAddress() }; String[] cc = new String[0]; String[] ccn = new String[0]; - String tipoPratica = StringPool.BLANK; long intPraticaId = dettPratica.getIntPraticaId(); if (AzioniPraticheUtil.isDeposito(intPraticaId)) { @@ -1825,7 +1432,6 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } else if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); } - JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); templateVariables.put("receiver", tecnicoIstruttore.getFullName()); templateVariables.put("tipoPratica", tipoPratica); @@ -1833,112 +1439,85 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl LocaleUtil.ITALIAN, Validator.isNotNull(dettPratica.getTipoIntegrazione()) ? "label-integrazione-" + dettPratica.getTipoIntegrazione() : StringPool.BLANK)); - templateVariables.put("dataInvio", FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm") - .format(date)); - + templateVariables.put("dataInvio", + FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(date)); ServiceContext serviceContext = new ServiceContext(); serviceContext.setScopeGroupId(dettPratica.getGroupId()); serviceContext.setCompanyId(dettPratica.getCompanyId()); serviceContext.setUserId(dettPratica.getUserId()); - MailUtil.invioMailNotifica(dettPratica.getIntPraticaId(), dettPraticaId, dettPraticaId, - DettPratica.class.getName(), to, cc, ccn, "NOTIFICA-BO", templateVariables, null, - serviceContext); + DettPratica.class.getName(), to, cc, ccn, "NOTIFICA-BO", templateVariables, null, serviceContext); } - public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException, - SystemException, PortalException { + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException, SystemException, + PortalException { DettPratica dettPratica = updateEsito(dettPraticaId, stato); long intPraticaId = dettPratica.getIntPraticaId(); intPraticaLocalService.updateStatoPratica(intPraticaId, StatoPraticaConstants.SOTTOPOSTA_A_PARERE); - ControlloPratica controlloPratica = controlloPraticaLocalService.findByIntPraticaId_Status( - intPraticaId, WorkflowConstants.STATUS_PENDING).get(0); - controlloPraticaLocalService.addPraticheAlControllo(controlloPratica.getControlloPraticaId(), - dettPraticaId); - + ControlloPratica controlloPratica = controlloPraticaLocalService.findByIntPraticaId_Status(intPraticaId, + WorkflowConstants.STATUS_PENDING).get(0); + controlloPraticaLocalService.addPraticheAlControllo(controlloPratica.getControlloPraticaId(), dettPraticaId); return dettPratica; } + @Override public DettPratica pagaInvia(long dettPraticaId, Double pagInterventiRestauroManufatti, - Double pagAltriCasiCulturali, Double pagLottizzazioni, Double pagGrandiStrutture, - Double pagCondotte, Double pagPalificazioni, Double pagImpiantiEolici, - Double pagNuoveRealizzazioni, Double pagImmobiliPreesistenti, Double pagManifestiPubblicitari, - Double pagPareriDiMassima, Double pagAltriCasiPaesaggistici, Double pagVariantiPareriResi, - Double pagRilascioAttestazioni, Double pagConsultazioniArchivio, String importoSpeseIstruttoria, - String codiceFiscaleCommittente, Double pagSoggettiAdAutorizzazione, String currentURL, ServiceContext serviceContext) + Double pagAltriCasiCulturali, Double pagLottizzazioni, Double pagGrandiStrutture, Double pagCondotte, + Double pagPalificazioni, Double pagImpiantiEolici, Double pagNuoveRealizzazioni, + Double pagImmobiliPreesistenti, Double pagManifestiPubblicitari, Double pagPareriDiMassima, + Double pagAltriCasiPaesaggistici, Double pagVariantiPareriResi, Double pagRilascioAttestazioni, + Double pagConsultazioniArchivio, String importoSpeseIstruttoria, String codiceFiscaleCommittente, + Double pagSoggettiAdAutorizzazione, String currentURL, ServiceContext serviceContext) throws SystemException, PortalException { DettPratica dettPratica = dettPraticaPersistence.findByPrimaryKey(dettPraticaId); - BigDecimal importoBolli = PagamentiUtil.getImportoBolli(dettPratica.getCompanyId(), dettPratica.getDettPraticaId(), dettPratica.getTipoIntegrazione()); PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), - PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, - serviceContext); + PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); PagamentiUtil.nuovoPagamento(currentURL, dettPratica.getDettPraticaId(), DettPratica.class.getName(), - PagamentoConstants.PAGAMENTO_ONERI, importoSpeseIstruttoria, codiceFiscaleCommittente, - serviceContext); - + PagamentoConstants.PAGAMENTO_ONERI, importoSpeseIstruttoria, codiceFiscaleCommittente, serviceContext); dettPratica = updateDettPraticaPagamento(dettPratica.getDettPraticaId(), importoSpeseIstruttoria, - importoBolli.toString(), pagInterventiRestauroManufatti, pagAltriCasiCulturali, - pagLottizzazioni, pagGrandiStrutture, pagCondotte, pagPalificazioni, pagImpiantiEolici, - pagNuoveRealizzazioni, pagImmobiliPreesistenti, pagManifestiPubblicitari, pagPareriDiMassima, - pagAltriCasiPaesaggistici, pagVariantiPareriResi, pagRilascioAttestazioni, - pagConsultazioniArchivio, pagSoggettiAdAutorizzazione, serviceContext); - + importoBolli.toString(), pagInterventiRestauroManufatti, pagAltriCasiCulturali, pagLottizzazioni, + pagGrandiStrutture, pagCondotte, pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, + pagImmobiliPreesistenti, pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, + pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, pagSoggettiAdAutorizzazione, + serviceContext); long intPraticaid = dettPratica.getIntPraticaId(); IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaid); if (intPratica.getStatus() == WorkflowConstants.STATUS_ANY) { intPraticaLocalService.updateStatus(intPraticaid, WorkflowConstants.STATUS_INCOMPLETE); } - dettPratica = updateDettPratica(dettPratica); - updateStatus(dettPraticaId, WorkflowConstants.STATUS_INCOMPLETE); - dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); - return dettPratica; } - private void validateDatiGeologo(long userId, long dettPraticaId, long intPraticaId, - String geoClasseIndagine, String geoCategoriaSottosuolo, String geoCategoriaTopografica, - String geoConsolidamento, String geoPericolositaGeologica, String geoRischioGeomorfologicoPai, - String geoPericolositaIdraulicaPai, String geoRischioIdraulicoPai, String geoPericolositaSismica, - String geoPericolositaIdraulica, String geoPericolositaGeomorfica, - String geoFattibilitaGeologica, String geoFattibilitaSismica, String geoFattibilitaIdraulica, - String geoOperaRilevante, String geoOpereDiSostegno, String geoOpereInSotterranea, - String geoPresenzaPrescrizioni, String geoNotePrescrizioni, String geoNoteIndagini, - String geoEvidenzeGeomorfiche, String geoEvidenzeGeologiche, Date geoDtRelazione, - ServiceContext serviceContext, boolean bozza) { - } - - private void validate(long userId, long dettPraticaId, long intPraticaId, - String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, - String codiceFiscaleDelegatoCollaudo, ServiceContext serviceContext) { + private void validate(long userId, long dettPraticaId, long intPraticaId, String codiceFiscaleDelegatoCommittente, + String codiceFiscaleDelegatoFineLavori, String codiceFiscaleDelegatoCollaudo, ServiceContext serviceContext) { } + @Override @Indexable(type = IndexableType.REINDEX) - public DettPratica updateStatus(long userId, long resourcePrimKey, int status, - ServiceContext serviceContext) throws PortalException, SystemException { + public DettPratica updateStatus(long userId, long resourcePrimKey, int status, ServiceContext serviceContext) + throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); Date now = new Date(); - DettPratica dettPratica = dettPraticaPersistence.findByPrimaryKey(resourcePrimKey); - dettPratica.setStatus(status); dettPratica.setStatusByUserId(user.getUserId()); dettPratica.setStatusByUserName(user.getFullName()); dettPratica.setStatusDate(serviceContext.getModifiedDate(now)); - if (status == WorkflowConstants.STATUS_APPROVED) { assetEntryLocalService.updateVisible(DettPratica.class.getName(), resourcePrimKey, true); } else { assetEntryLocalService.updateVisible(DettPratica.class.getName(), resourcePrimKey, false); } - return dettPraticaPersistence.update(dettPratica); } @@ -1946,12 +1525,9 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl try { assetEntryLocalService.deleteEntry(DettPratica.class.getName(), dettPratica.getPrimaryKey()); - expandoValueLocalService.deleteValues(DettPratica.class.getName(), dettPratica.getPrimaryKey()); - resourceLocalService.deleteResource(dettPratica.getCompanyId(), DettPratica.class.getName(), ResourceConstants.SCOPE_INDIVIDUAL, dettPratica.getDettPraticaId()); - } catch (PortalException e) { throw new SystemException(e); } @@ -1960,62 +1536,63 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl private void updateAsset(DettPratica dettPratica, ServiceContext serviceContext) throws PortalException, SystemException { - AssetEntry assetEntry = assetEntryLocalService.updateEntry(dettPratica.getUserId(), - dettPratica.getGroupId(), dettPratica.getCreateDate(), dettPratica.getModifiedDate(), - DettPratica.class.getName(), dettPratica.getPrimaryKey(), dettPratica.getUuid(), 0L, - serviceContext.getAssetCategoryIds(), serviceContext.getAssetTagNames(), true, null, null, - null, ContentTypes.TEXT_HTML, dettPratica.getDescLongIntervento(), - dettPratica.getDescLongIntervento(), null, null, null, 0, 0, 0, false); - + AssetEntry assetEntry = assetEntryLocalService.updateEntry(dettPratica.getUserId(), dettPratica.getGroupId(), + dettPratica.getCreateDate(), dettPratica.getModifiedDate(), DettPratica.class.getName(), + dettPratica.getPrimaryKey(), dettPratica.getUuid(), 0L, serviceContext.getAssetCategoryIds(), + serviceContext.getAssetTagNames(), true, null, null, null, ContentTypes.TEXT_HTML, + dettPratica.getDescLongIntervento(), dettPratica.getDescLongIntervento(), null, null, null, 0, 0, 0, + false); assetLinkLocalService.updateLinks(dettPratica.getUserId(), assetEntry.getEntryId(), serviceContext.getAssetLinkEntryIds(), AssetLinkConstants.TYPE_RELATED); - dettPratica.setExpandoBridgeAttributes(serviceContext); } - public DettPratica updateDettPraticaProtocollo(long dettPraticaId, String protocollo) - throws PortalException, SystemException { + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica updateDettPraticaProtocollo(long dettPraticaId, String protocollo) throws PortalException, + SystemException { DettPratica dettPratica = dettPraticaLocalService.fetchDettPratica(dettPraticaId); dettPratica.setModifiedDate(new Date()); dettPratica.setProtocollo(protocollo); dettPratica.setDtProtocollo(new Date()); - dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica); - IntPratica intPratica = intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); if (intPratica.getStatus() == WorkflowConstants.STATUS_ANY || intPratica.getStatus() == WorkflowConstants.STATUS_INCOMPLETE) { - intPraticaLocalService.updateStatoPratica(dettPratica.getIntPraticaId(), - StatoPraticaConstants.VIDIMATA); + intPraticaLocalService.updateStatoPratica(dettPratica.getIntPraticaId(), StatoPraticaConstants.VIDIMATA); } return dettPratica; } - public DettPratica findByProtocollo(long companyId, long groupId, String protocollo) - throws PortalException, SystemException { + @Override + public DettPratica findByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, + SystemException { return dettPraticaPersistence.findByC_G_Protocollo(companyId, groupId, protocollo); } - public DettPratica fetchByProtocollo(long companyId, long groupId, String protocollo) - throws PortalException, SystemException { + @Override + public DettPratica fetchByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, + SystemException { return dettPraticaPersistence.fetchByC_G_Protocollo(companyId, groupId, protocollo); } + @Override public DettPratica fetchByProtocollo(String protocollo) throws PortalException, SystemException { return dettPraticaPersistence.fetchByProtocollo(protocollo); } + @Override public List findByIntPraticaId(long intPraticaId) throws SystemException { return dettPraticaPersistence.findByIntPraticaId(intPraticaId); } - public List findByIntPraticaIdInviate(long intPraticaId, int start, int end) - throws SystemException { + @Override + public List findByIntPraticaIdInviate(long intPraticaId, int start, int end) throws SystemException { DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); @@ -2025,6 +1602,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); } + @Override public List findPraticheCompleteNotProtocollo(int start, int end) throws SystemException { DynamicQuery dynamicQuery = getDynamicQueryPraticheCompleteNotProtocollo(); @@ -2032,6 +1610,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); } + @Override public int countPraticheCompleteNotProtocollo() throws SystemException { DynamicQuery dynamicQuery = getDynamicQueryPraticheCompleteNotProtocollo(); @@ -2050,6 +1629,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dynamicQuery; } + @Override public List findPraticheCompleteNotGestite(int start, int end) throws SystemException { DynamicQuery dynamicQuery = getDynamicQueryPraticheCompleteNotGestite(); @@ -2057,6 +1637,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); } + @Override public int countPraticheCompleteNotGestite() throws SystemException { DynamicQuery dynamicQuery = getDynamicQueryPraticheCompleteNotGestite(); @@ -2073,20 +1654,23 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dynamicQuery; } - public List findByIntPraticaId_TipoIntegrazione_Completa(long intPraticaId, - String tipoIntegrazione, boolean completa) throws SystemException { + @Override + public List findByIntPraticaId_TipoIntegrazione_Completa(long intPraticaId, String tipoIntegrazione, + boolean completa) throws SystemException { - return dettPraticaPersistence.findByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, - tipoIntegrazione, completa); + return dettPraticaPersistence.findByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, tipoIntegrazione, + completa); } + @Override public int countByIntPraticaId_TipoIntegrazione_Completa(long intPraticaId, String tipoIntegrazione, boolean completa) throws SystemException { - return dettPraticaPersistence.countByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, - tipoIntegrazione, completa); + return dettPraticaPersistence.countByIntPraticaId_TipoIntegrazione_Completa(intPraticaId, tipoIntegrazione, + completa); } + @Override public List findPraticheCompletateNonVersionate(int start, int end) throws SystemException { DynamicQuery dynamicQuery = getDynamicQueryPraticheCompletateNonVersionate(); @@ -2094,6 +1678,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); } + @Override public int countPraticheCompletateNonversionate() throws SystemException { DynamicQuery dynamicQuery = getDynamicQueryPraticheCompletateNonVersionate(); @@ -2110,127 +1695,27 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dynamicQuery; } + @Override + @Indexable(type = IndexableType.REINDEX) public DettPratica updateDettPraticaGestita(long dettPraticaId, boolean gestita) throws SystemException { DettPratica dettPratica = dettPraticaLocalService.fetchDettPratica(dettPraticaId); dettPratica.setModifiedDate(new Date()); dettPratica.setGestita(gestita); - return dettPraticaLocalService.updateDettPratica(dettPratica); } - public void updateAsset(DettPratica dettPratica, long[] categoryIds, boolean visible) - throws SystemException, PortalException { - - // List tagNames = new ArrayList(); - // IntPratica intPratica = - // intPraticaLocalService.getIntPratica(dettPratica.getIntPraticaId()); - // TODO gestire la nuova logica di asset - // aggiunta tag tipologia pratica - // if (dettPratica.getIntegrazione() != 0L) { - // String tagName = - // TagsPraticaValue.getTagsLabelMap().get(dettPratica.getTipoIntegrazione()); - // if (Validator.isNotNull(tagName)) { - // tagNames.add(tagName); - // } - // } else { - // if (intPratica.isVariante()) { - // tagNames.add(TagsPraticaValue.VARIANTE); - // } else { - // tagNames.add(TagsPraticaValue.ORIGINALE); - // } - // } - // - // DettPratica dettPraticaLast = - // dettPraticaLocalService.getLastDettPratica(dettPratica.getIntPraticaId()); - // boolean sorteggiata = - // sorteggioLocalService.isDettPraticaSorteggiata(dettPraticaLast.getCompanyId(), - // dettPraticaLast.getDettPraticaId()); - // if (sorteggiata) { - // tagNames.add(TagsPraticaValue.getTagsLabelMap().get(StatoPraticaConstants.SORTEGGIATA)); - // } - // - // if - // (intPratica.getStatoPratica().equals(StatoPraticaConstants.ANNULLATA)) - // { - // String tagName = - // TagsPraticaValue.getTagsLabelMap().get(TipoIntegrazioneConstants.ANNULLA); - // tagNames.add(tagName); - // } - // - // // aggiunta tag validazione - // if (dettPratica.isValidata()) { - // tagNames.add(TagsPraticaValue.getTagsLabelMap().get(StatoPraticaConstants.VIDIMATA)); - // // eventuale aggiunta tag anomalia fine lavoro - // if - // (StatoPraticaConstants.isStatoPraticaFineLavoriConAnomalia(dettPratica)) - // { - // tagNames.add(TagsPraticaValue.getTagsLabelMap().get(StatoPraticaConstants.FINE_LAVORI_CON_ANOMALIA)); - // } - // } else { - // tagNames.add(TagsPraticaValue.getTagsLabelMap().get(StatoPraticaConstants.RIFIUTATA)); - // } - // // pratica indica se è stata variata - // if (intPratica.getVariataDa() != 0l) { - // tagNames.add(TagsPraticaValue.getTagsLabelMap().get(StatoPraticaConstants.VARIATA)); - // } - // // aggiunta del tag pending - // if (dettPratica.getStatus() == WorkflowConstants.STATUS_PENDING) { - // tagNames.add(TagsPraticaValue.getTagsLabelMap().get(StatoPraticaConstants.SOTTOPOSTA_A_PARERE)); - // } else { - // String tagName = - // TagsPraticaValue.getTagsLabelMap().get(intPratica.getStatoPratica()); - // if (Validator.isNotNull(tagName)) { - // tagNames.add(tagName); - // } - // if (Validator.isNotNull(intPratica.getStatoPraticaWorkflow())) { - // tagName = - // TagsPraticaValue.getTagsLabelMap().get(intPratica.getStatoPraticaWorkflow()); - // if (Validator.isNotNull(tagName)) { - // tagNames.add(tagName); - // } - // } - // } - // - // ServiceContext serviceContext = new ServiceContext(); - // serviceContext.setCompanyId(dettPratica.getCompanyId()); - // serviceContext.setScopeGroupId(dettPratica.getGroupId()); - // serviceContext.setUserId(dettPratica.getUserId()); - // - // try { - // AssetEntry currentAssetEntry = - // assetEntryLocalService.getEntry(DettPratica.class.getName(), - // dettPratica.getDettPraticaId()); - // categoryIds = - // createUpdateAssetCategory(intPratica, dettPratica, - // currentAssetEntry.getCategoryIds(), - // serviceContext); - // visible = currentAssetEntry.isVisible() || visible; - // } catch (Exception e) { - // } - // - // if (categoryIds.length > 0) { - // assetEntryLocalService.updateEntry(dettPratica.getUserId(), - // dettPratica.getGroupId(), - // DettPratica.class.getName(), dettPratica.getDettPraticaId(), - // dettPratica.getUuid(), 0l, - // categoryIds, - // tagNames.toArray(new String[] {}), visible, null, null, - // dettPratica.getCreateDate(), null, - // ContentTypes.TEXT_HTML, - // PraticaUtil.generateTitle(dettPratica.getDettPraticaId()), null, - // PraticaUtil.generateTitle(dettPratica.getDettPraticaId()), null, - // null, 0, 0, null, false); - // } - } - - public void updateStatus(long dettPraticaId, int status) throws PortalException, SystemException { + @Override + @Indexable(type = IndexableType.REINDEX) + public DettPratica updateStatus(long dettPraticaId, int status) throws PortalException, SystemException { DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); dettPratica.setStatus(status); - updateDettPratica(dettPratica); + return updateDettPratica(dettPratica); } + @Override + @Indexable(type = IndexableType.REINDEX) public DettPratica updateSignal(long dettPraticaId, Date dtInvioSignal) throws SystemException { DettPratica dettPratica = dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); @@ -2238,12 +1723,14 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaLocalService.updateDettPratica(dettPratica); } + @Override public int countInvioSignal() throws SystemException { DynamicQuery dynamicQuery = dynamicQueryInvioSignal(null); return (int) dettPraticaPersistence.countWithDynamicQuery(dynamicQuery); } + @Override public DettPratica getInvioSignal(long dettPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQueryInvioSignal(dettPraticaId); @@ -2251,6 +1738,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return !integrazioni.isEmpty() ? integrazioni.get(0) : null; } + @Override public List getInviiSignal(int start, int end) throws SystemException { DynamicQuery dynamicQuery = dynamicQueryInvioSignal(null); @@ -2258,6 +1746,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); } + @Override public DynamicQuery dynamicQueryInvioSignal(Long dettPraticaId) throws SystemException { DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); @@ -2267,12 +1756,13 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } dynamicQuery.add(PropertyFactoryUtil.forName("dtInvioSignal").isNull()); dynamicQuery.add(PropertyFactoryUtil.forName("status").eq(WorkflowConstants.STATUS_APPROVED)); - dynamicQuery.add(PropertyFactoryUtil.forName("tipoIntegrazione").eq( - TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); + dynamicQuery.add(PropertyFactoryUtil.forName("tipoIntegrazione") + .eq(TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE)); return dynamicQuery; } + @Override public List findByPagamentoId(long pagamentoId) throws SystemException { DynamicQuery dynamicQuery = dettPraticaLocalService.dynamicQuery(); @@ -2285,6 +1775,8 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPraticaPersistence.findWithDynamicQuery(dynamicQuery); } + @Override + @Indexable(type = IndexableType.REINDEX) public DettPratica updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) throws PortalException, SystemException { @@ -2326,6 +1818,7 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl return dettPratica; } + @Override public void sendToVersioning(long dettPraticaId, String url) throws Exception { DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); @@ -2338,10 +1831,12 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl dettPraticaLocalService.updateDettPratica(dettPratica); } + @Override public int getNumeroDiVersioni(String url) throws NumberFormatException, Exception { return Integer.parseInt(HttpServiceUtil.getUrl(url, "0")); } + @Override public String getVersionNumber(String url, int version) throws Exception { String response = callToVersion(url); @@ -2361,36 +1856,28 @@ public class DettPraticaLocalServiceImpl extends DettPraticaLocalServiceBaseImpl } private String callToVersion(String versioningURL) throws Exception { + return HttpServiceUtil.getUrl(versioningURL); } + @Override public JSONArray callForChanges(String url) throws Exception { String response = callToVersion(url); - JSONArray jsonArray = JSONFactoryUtil.createJSONObject(response).getJSONArray("values"); - return jsonArray; } - public DettPratica fetchByOldDettPraticaId(long oldDettPraticaId) throws SystemException { - - return dettPraticaPersistence.fetchByOldDettPraticaId(oldDettPraticaId); - } - + @Override public int countVariateByIntPratica(long intPraticaId) throws SystemException { - return dettPraticaPersistence.countByIntPraticaId_TipoIntegrazione(intPraticaId, - TipoIntegrazioneUtil.VARIANTE); + return dettPraticaPersistence.countByIntPraticaId_TipoIntegrazione(intPraticaId, TipoIntegrazioneUtil.VARIANTE); } /** * ADT: nuovo metodo per stampa fascicolo - * - * @param intPraticaId - * @return - * @throws SystemException */ + @Override public DettPratica getFirstCompletedByIntPratica(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java index 3a336ab8..137e0b34 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DettPraticaServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -28,8 +28,6 @@ import java.io.IOException; import java.util.Date; import java.util.List; -import sun.security.krb5.internal.PAData; - import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONArray; @@ -43,14 +41,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the dett pratica remote service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.DettPraticaService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.DettPraticaService} interface. * *

- * This is a remote service. Methods of this service are expected to have - * security checks based on the propagated JAAS credentials because this service - * can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -59,17 +55,18 @@ import com.liferay.portal.service.ServiceContext; */ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use - * {@link it.tref.liferay.portos.bo.service.DettPraticaServiceUtil} to - * access the dett pratica remote service. + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.DettPraticaServiceUtil} to access the dett pratica remote service. */ + @Override public DettPratica getDettPratica(long dettPraticaId) throws PortalException, SystemException { DettPraticaEntryPermission.check(getPermissionChecker(), dettPraticaId, ActionKeys.VIEW); return dettPraticaLocalService.getDettPratica(dettPraticaId); } + @Override public DettPratica addDettPratica(long territorioId, String tipoProcedura, ServiceContext serviceContext) throws PortalException, SystemException { @@ -78,93 +75,93 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPraticaLocalService.addDettPratica(territorioId, tipoProcedura, serviceContext); } + @Override public DettPratica addDettPraticaToIntPratica(long intPraticaId, ServiceContext serviceContext) throws PortalException, SystemException { return dettPraticaLocalService.addDettPraticaToIntPratica(intPraticaId, serviceContext); } + @Override public DettPratica addDettPraticaClonedToIntPratica(long intPraticaId, long dettPraticaToCloneId, String tipoIntegrazione, ServiceContext serviceContext) throws PortalException, SystemException { return dettPraticaLocalService.addDettPraticaClonedToIntPratica(intPraticaId, dettPraticaToCloneId, tipoIntegrazione, serviceContext); } + @Override public DettPratica getLastEditableByIntPratica(long intPraticaId) throws PortalException, SystemException { DettPratica dettPratica = dettPraticaLocalService.getLastEditableByIntPratica(intPraticaId); if (dettPratica != null) { - DettPraticaEntryPermission.check(getPermissionChecker(), dettPratica.getDettPraticaId(), - ActionKeys.VIEW); + DettPraticaEntryPermission.check(getPermissionChecker(), dettPratica.getDettPraticaId(), ActionKeys.VIEW); } return dettPratica; } + @Override public DettPratica deleteDettPratica(DettPratica dettPratica) throws PortalException, SystemException { return dettPraticaLocalService.deleteDettPratica(dettPratica); } + @Override public DettPratica deleteDettPratica(long dettPraticaId) throws PortalException, SystemException { return dettPraticaLocalService.deleteDettPratica(dettPraticaId); } + @Override public DettPratica updateDettPraticaSoggetti(long userId, long dettPraticaId, long intPraticaId, String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, String codiceFiscaleDelegatoCollaudo, ServiceContext serviceContext) throws PortalException, SystemException { return dettPraticaLocalService.updateDettPraticaSoggetti(userId, dettPraticaId, intPraticaId, - codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, serviceContext); + codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, + serviceContext); } - public DettPratica updateDettPratica(long userId, long dettPraticaId, long intPraticaId, - long integrazione, String protocollo, String tipoIntegrazione, boolean completa, boolean gestita, - String codicePagamento, String causalePagamento, String mezzoPagamento, String importoBolli, - String importoSpeseIstruttoria, Date dataEffettuazione, int statusTask, boolean workflowForzato, - long soggettoSostituitoId, long oldDettPraticaId, String destinazione, String ag, - String descLongIntervento, String via, String localita, String estremiCatastali, - String estremiPratCom, long variataDa, long varianteNumero, boolean varianteSostanziale, - boolean operaConforme, boolean collaudoStatico, String codiceFiscaleDelegatoCommittente, - String codiceFiscaleDelegatoFineLavori, String codiceFiscaleDelegatoCollaudo, - String codiceRuoloDelegato, boolean lavoriInEconomiaCommittente, + @Override + public DettPratica updateDettPratica(long userId, long dettPraticaId, long intPraticaId, long integrazione, + String protocollo, String tipoIntegrazione, boolean completa, boolean gestita, String codicePagamento, + String causalePagamento, String mezzoPagamento, String importoBolli, String importoSpeseIstruttoria, + Date dataEffettuazione, int statusTask, boolean workflowForzato, long soggettoSostituitoId, + String destinazione, String ag, String descLongIntervento, String via, String localita, + String estremiCatastali, String estremiPratCom, long variataDa, long varianteNumero, + boolean varianteSostanziale, boolean operaConforme, boolean collaudoStatico, + String codiceFiscaleDelegatoCommittente, String codiceFiscaleDelegatoFineLavori, + String codiceFiscaleDelegatoCollaudo, String codiceRuoloDelegato, boolean lavoriInEconomiaCommittente, boolean inizioLavoriContestualeOpera, Date dataInizioLavoriOpera, Date dataInizioEsecuzioneOpera, Date dataFineEsecuzioneOpera, String metratura, boolean lavoriPubblici, long pagamentoId, int lavoriPubbliciPercentuale, String numeroCivico, String dcParticelle, String dcFoglio, String dcAllegato, String dePiani, String deAltezza, String deInterrati, String deSuperficie, - String deCostruzione, String deRistrutturazione, String deUso, String dePubblica, - String dePrivata, String deUtilizzazione, String dePosizioneEdificio, boolean deInfStradalePonte, + String deCostruzione, String deRistrutturazione, String deUso, String dePubblica, String dePrivata, + String deUtilizzazione, String dePosizioneEdificio, boolean deInfStradalePonte, boolean deInfStradaleStrada, boolean deInfStradaleAltro, boolean deInfIdraulicaLong, boolean deInfIdraulicaTrasv, boolean deInfIdraulicaAltro, boolean deInfOperaAccStradale, boolean deInfOperaAccIdraulica, boolean deInfOperaAccAltro, boolean deInfAltraInfrastruttura, - boolean deInfAltro, String deInfAltroDesc, String dccFondazioni, - boolean dccStruttureEleMuraturePietrame, boolean dccStruttureEleMuratureLaterizio, - boolean dccStruttureEleMuratureMisto, boolean dccStruttureEleMuratureStoriche, - String dccStruttureEleAcciaio, String dccStruttureEleCA, String dccStruttureEleLegno, - boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, + boolean deInfAltro, String deInfAltroDesc, String dccFondazioni, boolean dccStruttureEleMuraturePietrame, + boolean dccStruttureEleMuratureLaterizio, boolean dccStruttureEleMuratureMisto, + boolean dccStruttureEleMuratureStoriche, String dccStruttureEleAcciaio, String dccStruttureEleCA, + String dccStruttureEleLegno, boolean dccStruttureEleMistoCA, boolean dccStruttureEleMistoAcciaio, boolean dccStruttureEleMistoMuratura, boolean dccStruttureEleMistoLegno, - boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, - String dccStruttureEleAltroDescrizione, boolean dccOrizzontamentiCAAcciaio, - boolean dccOrizzontamentiLegno, boolean dccOrizzontamentiLegnoCA, - boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, - boolean dccOrizzontamentiAltro, String dccOrizzontamentiAltroDescrizione, String dccCopertura, - boolean dccCoperturaCAAcciaio, boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, - boolean dccCoperturaLamieraGrecata, boolean dccCoperturaPannelli, - boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, boolean dccCoperturaAltro, - String dccCoperturaAltroDesrizione, boolean dccElemNonStrutLaterizio, - boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, - boolean dccElemNonStrutLegno, boolean dccElemNonStrutAltro, - String dccElemNonStrutAltroDescrizione, boolean dccOpereDiRinforzoInsCatene, + boolean dccStruttureElePrefabbricato, boolean dccStruttureEleAltro, String dccStruttureEleAltroDescrizione, + boolean dccOrizzontamentiCAAcciaio, boolean dccOrizzontamentiLegno, boolean dccOrizzontamentiLegnoCA, + boolean dccOrizzontamentiLamieraGrecata, boolean dccOrizzontamentiVolte, boolean dccOrizzontamentiAltro, + String dccOrizzontamentiAltroDescrizione, String dccCopertura, boolean dccCoperturaCAAcciaio, + boolean dccCoperturaLegno, boolean dccCoperturaLegnoCA, boolean dccCoperturaLamieraGrecata, + boolean dccCoperturaPannelli, boolean dccCoperturaPVCTelonati, boolean dccCoperturaLeggere, + boolean dccCoperturaAltro, String dccCoperturaAltroDesrizione, boolean dccElemNonStrutLaterizio, + boolean dccElemNonStrutCartongesso, boolean dccElemNonStrutCalcestruzzo, boolean dccElemNonStrutLegno, + boolean dccElemNonStrutAltro, String dccElemNonStrutAltroDescrizione, boolean dccOpereDiRinforzoInsCatene, boolean dccOpereDiRinforzoInsCordoli, boolean dccOpereDiRinforzoIniArmate, boolean dccOpereDiRinforzoPlaccaggi, boolean dccOpereDiRinforzoIrrSolai, boolean dccOpereDiRinforzoRinforziFRP, boolean dccOpereDiRinforzoTelaiECerchiature, boolean dccOpereDiRinforzoInsRompitratta, boolean dccOpereDiRinforzoAltro, - String dccOpereDiRinforzoAltroDescrizione, String geoClasseIndagine, - String geoCategoriaSottosuolo, String geoCategoriaTopografica, String geoConsolidamento, - String geoPericolositaGeologica, String geoRischioGeomorfologicoPai, - String geoPericolositaIdraulicaPai, String geoRischioIdraulicoPai, String geoPericolositaSismica, - String geoPericolositaIdraulica, String geoPericolositaGeomorfica, + String dccOpereDiRinforzoAltroDescrizione, String geoClasseIndagine, String geoCategoriaSottosuolo, + String geoCategoriaTopografica, String geoConsolidamento, String geoPericolositaGeologica, + String geoRischioGeomorfologicoPai, String geoPericolositaIdraulicaPai, String geoRischioIdraulicoPai, + String geoPericolositaSismica, String geoPericolositaIdraulica, String geoPericolositaGeomorfica, String geoFattibilitaGeologica, String geoFattibilitaSismica, String geoFattibilitaIdraulica, String geoOperaRilevante, String geoOpereDiSostegno, String geoOpereInSotterranea, String geoPresenzaPrescrizioni, String geoNotePrescrizioni, String geoNoteIndagini, @@ -175,306 +172,197 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { Double pagPareriDiMassima, Double pagAltriCasiPaesaggistici, Double pagVariantiPareriResi, Double pagRilascioAttestazioni, Double pagConsultazioniArchivio, String note, String noteUfficio, String localizzazioneGeografica, boolean tcNuovaCostruzione, boolean tcAdeguamentoSismico, - boolean tcMiglioramentoSismico, boolean tcRiparazioneInterventoLocale, boolean tcInCA, - boolean tcInOpera, boolean tcPrefabbricato, boolean tcInAcciaio, boolean tcMista, - boolean tcInMuratura, boolean tcInMuraturaOrdinaria, boolean tcInMuraturaArmata, - boolean tcInMuraturaMista, boolean tcInLegno, boolean tcAltro, String tcAltroDescrizione, - boolean tcConDispositivi, boolean normLavoriInProprio, boolean normEsenteBollo, - boolean normEsenteSpese, boolean normDpr01Dep, boolean normDpr02Dep, boolean normDpr01Aut, - boolean normDpr02Aut, boolean normDm01, boolean normDm02, boolean normDm03, boolean normDm2018, - boolean normDprg01, boolean normDprg02, boolean normAnr, boolean normArt3com3, + boolean tcMiglioramentoSismico, boolean tcRiparazioneInterventoLocale, boolean tcInCA, boolean tcInOpera, + boolean tcPrefabbricato, boolean tcInAcciaio, boolean tcMista, boolean tcInMuratura, + boolean tcInMuraturaOrdinaria, boolean tcInMuraturaArmata, boolean tcInMuraturaMista, boolean tcInLegno, + boolean tcAltro, String tcAltroDescrizione, boolean tcConDispositivi, boolean normLavoriInProprio, + boolean normEsenteBollo, boolean normEsenteSpese, boolean normDpr01Dep, boolean normDpr02Dep, + boolean normDpr01Aut, boolean normDpr02Aut, boolean normDm01, boolean normDm02, boolean normDm03, + boolean normDm2018, boolean normDprg01, boolean normDprg02, boolean normAnr, boolean normArt3com3, boolean normArt3com4, boolean normOrd01, boolean normDm04, boolean normDm05, boolean normCI01, - boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, - String clRischioPostInt, boolean intervFinPub, String intervFinPubDesc, - ServiceContext serviceContext, boolean bozza, boolean disabledSubmit, boolean geoDisabledSubmit, - String paesaggioLocale, String livelloDiTutela, String vincoli, - String destinazioneAltroIntervento, Boolean tcCostruzioniEsistenti, Boolean tcManutOrdStraord, - Boolean tcAltriInterventi, String tcAltriInterventiDesc, boolean noCollaudo, + boolean normLTC01, boolean suap, boolean normSismaBonus, String clRischioPreInt, String clRischioPostInt, + boolean intervFinPub, String intervFinPubDesc, ServiceContext serviceContext, boolean bozza, + boolean disabledSubmit, boolean geoDisabledSubmit, String paesaggioLocale, String livelloDiTutela, + String vincoli, String destinazioneAltroIntervento, Boolean tcCostruzioniEsistenti, + Boolean tcManutOrdStraord, Boolean tcAltriInterventi, String tcAltriInterventiDesc, boolean noCollaudo, boolean tcNuovaCostruzionePertinenza, boolean tcInterventoOpereEscavazione, boolean tcViarch, boolean tcOperaA25, boolean sanatoriaEdilizia47, boolean sanatoriaEdilizia724, boolean sanatoriaEdilizia326, boolean normLavoriNoDirettore, double pagSoggettiAdAutorizzazione, String interventoVoceP7) throws PortalException, SystemException { DettPratica dettPratica = null; - if (oldDettPraticaId == 0) { - - if (!disabledSubmit && DelegheUtil.hasDelegaCompilazioneDomanda(userId, dettPraticaId)) { - - if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(tipoIntegrazione)) { - - dettPratica = dettPraticaLocalService.updateDettPraticaDatiIntegrazione(userId, - dettPraticaId, intPraticaId, tipoIntegrazione, destinazione, descLongIntervento, - collaudoStatico, codiceFiscaleDelegatoCommittente, - codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, - lavoriInEconomiaCommittente, lavoriPubblici, deInfStradalePonte, - deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, - deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, - deInfOperaAccAltro, deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, - dccFondazioni, dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, - dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, - dccStruttureEleAcciaio, dccStruttureEleCA, dccStruttureEleLegno, - dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, - dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, - dccStruttureElePrefabbricato, dccStruttureEleAltro, - dccStruttureEleAltroDescrizione, dccOrizzontamentiCAAcciaio, - dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, - dccOrizzontamentiLamieraGrecata, dccOrizzontamentiVolte, dccOrizzontamentiAltro, - dccOrizzontamentiAltroDescrizione, dccCopertura, dccCoperturaCAAcciaio, - dccCoperturaLegno, dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, - dccCoperturaPannelli, dccCoperturaPVCTelonati, dccCoperturaLeggere, - dccCoperturaAltro, dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, - dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, dccElemNonStrutLegno, - dccElemNonStrutAltro, dccElemNonStrutAltroDescrizione, - dccOpereDiRinforzoInsCatene, dccOpereDiRinforzoInsCordoli, - dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, - dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - dccOpereDiRinforzoTelaiECerchiature, dccOpereDiRinforzoInsRompitratta, - dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, tcNuovaCostruzione, - tcAdeguamentoSismico, tcMiglioramentoSismico, tcRiparazioneInterventoLocale, - normLavoriInProprio, normEsenteBollo, normEsenteSpese, normDpr01Dep, - normDpr02Dep, normDpr01Aut, normDpr02Aut, normArt3com3, normArt3com4, - serviceContext, bozza, noCollaudo, tcNuovaCostruzionePertinenza, - tcInterventoOpereEscavazione, tcViarch, tcOperaA25, - sanatoriaEdilizia47, sanatoriaEdilizia724, sanatoriaEdilizia326, - normLavoriNoDirettore, interventoVoceP7); - - } else { - - dettPratica = dettPraticaLocalService.updateDettPraticaDatiDomanda(userId, dettPraticaId, - intPraticaId, tipoIntegrazione, destinazione, ag, descLongIntervento, via, - localita, estremiCatastali, estremiPratCom, varianteSostanziale, collaudoStatico, - codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, lavoriInEconomiaCommittente, metratura, - lavoriPubblici, pagamentoId, lavoriPubbliciPercentuale, numeroCivico, - dcParticelle, dcFoglio, dcAllegato, dePiani, deAltezza, deInterrati, - deSuperficie, deCostruzione, deRistrutturazione, deUso, dePubblica, dePrivata, - deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, deInfStradaleStrada, - deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, deInfIdraulicaAltro, - deInfOperaAccStradale, deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, dccFondazioni, - dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, - dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, - dccStruttureEleAcciaio, dccStruttureEleCA, dccStruttureEleLegno, - dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, - dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, - dccStruttureElePrefabbricato, dccStruttureEleAltro, - dccStruttureEleAltroDescrizione, dccOrizzontamentiCAAcciaio, - dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, - dccOrizzontamentiLamieraGrecata, dccOrizzontamentiVolte, dccOrizzontamentiAltro, - dccOrizzontamentiAltroDescrizione, dccCopertura, dccCoperturaCAAcciaio, - dccCoperturaLegno, dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, - dccCoperturaPannelli, dccCoperturaPVCTelonati, dccCoperturaLeggere, - dccCoperturaAltro, dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, - dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, dccElemNonStrutLegno, - dccElemNonStrutAltro, dccElemNonStrutAltroDescrizione, - dccOpereDiRinforzoInsCatene, dccOpereDiRinforzoInsCordoli, - dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, - dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - dccOpereDiRinforzoTelaiECerchiature, dccOpereDiRinforzoInsRompitratta, - dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, - localizzazioneGeografica, tcNuovaCostruzione, tcAdeguamentoSismico, - tcMiglioramentoSismico, tcRiparazioneInterventoLocale, tcInCA, tcInOpera, - tcPrefabbricato, tcInAcciaio, tcMista, tcInMuratura, tcInMuraturaOrdinaria, - tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, tcAltro, tcAltroDescrizione, - tcConDispositivi, normLavoriInProprio, normEsenteBollo, normEsenteSpese, - normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, - normDm03, normDm2018, normDprg01, normDprg02, normAnr, normArt3com3, - normArt3com4, normOrd01, normDm04, normDm05, normCI01, normLTC01, suap, - normSismaBonus, clRischioPreInt, clRischioPostInt, intervFinPub, - intervFinPubDesc, serviceContext, bozza, paesaggioLocale, livelloDiTutela, - vincoli, destinazioneAltroIntervento, tcCostruzioniEsistenti, tcManutOrdStraord, - tcAltriInterventi, tcAltriInterventiDesc, noCollaudo, - tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, tcViarch, tcOperaA25, - sanatoriaEdilizia47, sanatoriaEdilizia724, sanatoriaEdilizia326, - normLavoriNoDirettore, interventoVoceP7); - - } + if (!disabledSubmit && DelegheUtil.hasDelegaCompilazioneDomanda(userId, dettPraticaId)) { + + if (TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE.equalsIgnoreCase(tipoIntegrazione)) { + + dettPratica = dettPraticaLocalService.updateDettPraticaDatiIntegrazione(userId, dettPraticaId, + intPraticaId, tipoIntegrazione, destinazione, descLongIntervento, collaudoStatico, + codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, + codiceFiscaleDelegatoCollaudo, lavoriInEconomiaCommittente, lavoriPubblici, deInfStradalePonte, + deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, + deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, deInfOperaAccAltro, + deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, dccFondazioni, + dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, + dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, + dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, + dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, dccStruttureElePrefabbricato, + dccStruttureEleAltro, dccStruttureEleAltroDescrizione, dccOrizzontamentiCAAcciaio, + dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, dccOrizzontamentiLamieraGrecata, + dccOrizzontamentiVolte, dccOrizzontamentiAltro, dccOrizzontamentiAltroDescrizione, + dccCopertura, dccCoperturaCAAcciaio, dccCoperturaLegno, dccCoperturaLegnoCA, + dccCoperturaLamieraGrecata, dccCoperturaPannelli, dccCoperturaPVCTelonati, dccCoperturaLeggere, + dccCoperturaAltro, dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, + dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, dccElemNonStrutLegno, + dccElemNonStrutAltro, dccElemNonStrutAltroDescrizione, dccOpereDiRinforzoInsCatene, + dccOpereDiRinforzoInsCordoli, dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, + dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, dccOpereDiRinforzoTelaiECerchiature, + dccOpereDiRinforzoInsRompitratta, dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, + tcNuovaCostruzione, tcAdeguamentoSismico, tcMiglioramentoSismico, + tcRiparazioneInterventoLocale, normLavoriInProprio, normEsenteBollo, normEsenteSpese, + normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normArt3com3, normArt3com4, + serviceContext, bozza, noCollaudo, tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, + tcViarch, tcOperaA25, sanatoriaEdilizia47, sanatoriaEdilizia724, sanatoriaEdilizia326, + normLavoriNoDirettore, interventoVoceP7); + + } else { + + dettPratica = dettPraticaLocalService.updateDettPraticaDatiDomanda(userId, dettPraticaId, intPraticaId, + tipoIntegrazione, destinazione, ag, descLongIntervento, via, localita, estremiCatastali, + estremiPratCom, varianteSostanziale, collaudoStatico, codiceFiscaleDelegatoCommittente, + codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, lavoriInEconomiaCommittente, + metratura, lavoriPubblici, pagamentoId, lavoriPubbliciPercentuale, numeroCivico, dcParticelle, + dcFoglio, dcAllegato, dePiani, deAltezza, deInterrati, deSuperficie, deCostruzione, + deRistrutturazione, deUso, dePubblica, dePrivata, deUtilizzazione, dePosizioneEdificio, + deInfStradalePonte, deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, + deInfIdraulicaTrasv, deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, + deInfOperaAccAltro, deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, dccFondazioni, + dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, + dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, + dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, + dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, dccStruttureElePrefabbricato, + dccStruttureEleAltro, dccStruttureEleAltroDescrizione, dccOrizzontamentiCAAcciaio, + dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, dccOrizzontamentiLamieraGrecata, + dccOrizzontamentiVolte, dccOrizzontamentiAltro, dccOrizzontamentiAltroDescrizione, + dccCopertura, dccCoperturaCAAcciaio, dccCoperturaLegno, dccCoperturaLegnoCA, + dccCoperturaLamieraGrecata, dccCoperturaPannelli, dccCoperturaPVCTelonati, dccCoperturaLeggere, + dccCoperturaAltro, dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, + dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, dccElemNonStrutLegno, + dccElemNonStrutAltro, dccElemNonStrutAltroDescrizione, dccOpereDiRinforzoInsCatene, + dccOpereDiRinforzoInsCordoli, dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, + dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, dccOpereDiRinforzoTelaiECerchiature, + dccOpereDiRinforzoInsRompitratta, dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, + localizzazioneGeografica, tcNuovaCostruzione, tcAdeguamentoSismico, tcMiglioramentoSismico, + tcRiparazioneInterventoLocale, tcInCA, tcInOpera, tcPrefabbricato, tcInAcciaio, tcMista, + tcInMuratura, tcInMuraturaOrdinaria, tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, tcAltro, + tcAltroDescrizione, tcConDispositivi, normLavoriInProprio, normEsenteBollo, normEsenteSpese, + normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, + normDm2018, normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, + normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, + intervFinPub, intervFinPubDesc, serviceContext, bozza, paesaggioLocale, livelloDiTutela, + vincoli, destinazioneAltroIntervento, tcCostruzioniEsistenti, tcManutOrdStraord, + tcAltriInterventi, tcAltriInterventiDesc, noCollaudo, tcNuovaCostruzionePertinenza, + tcInterventoOpereEscavazione, tcViarch, tcOperaA25, sanatoriaEdilizia47, sanatoriaEdilizia724, + sanatoriaEdilizia326, normLavoriNoDirettore, interventoVoceP7); } - if (!geoDisabledSubmit - && DelegheUtil.hasDelegaCompilazioneSezioneGeologica(userId, dettPraticaId)) { - dettPratica = dettPraticaLocalService.updateDettPraticaGeologo(userId, dettPraticaId, - intPraticaId, geoClasseIndagine, geoCategoriaSottosuolo, geoCategoriaTopografica, - geoConsolidamento, geoPericolositaGeologica, geoRischioGeomorfologicoPai, - geoPericolositaIdraulicaPai, geoRischioIdraulicoPai, geoPericolositaSismica, - geoPericolositaIdraulica, geoPericolositaGeomorfica, geoFattibilitaGeologica, - geoFattibilitaSismica, geoFattibilitaIdraulica, geoOperaRilevante, - geoOpereDiSostegno, geoOpereInSotterranea, geoPresenzaPrescrizioni, - geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, geoEvidenzeGeologiche, - geoDtRelazione, serviceContext, bozza); - } - } else { - - dettPratica = dettPraticaLocalService.updateDettPratica(userId, dettPraticaId, intPraticaId, - integrazione, protocollo, tipoIntegrazione, completa, gestita, codicePagamento, - causalePagamento, mezzoPagamento, importoBolli, importoSpeseIstruttoria, - dataEffettuazione, statusTask, workflowForzato, soggettoSostituitoId, oldDettPraticaId, - destinazione, ag, descLongIntervento, via, localita, estremiCatastali, estremiPratCom, - variataDa, varianteNumero, varianteSostanziale, operaConforme, collaudoStatico, - codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, lavoriInEconomiaCommittente, - inizioLavoriContestualeOpera, dataInizioLavoriOpera, dataInizioEsecuzioneOpera, - dataFineEsecuzioneOpera, metratura, lavoriPubblici, pagamentoId, - lavoriPubbliciPercentuale, numeroCivico, dcParticelle, dcFoglio, dcAllegato, dePiani, - deAltezza, deInterrati, deSuperficie, deCostruzione, deRistrutturazione, deUso, - dePubblica, dePrivata, deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, - deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, - deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, dccFondazioni, - dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, - dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, - dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, - dccStruttureEleMistoAcciaio, dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, - dccStruttureElePrefabbricato, dccStruttureEleAltro, dccStruttureEleAltroDescrizione, - dccOrizzontamentiCAAcciaio, dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, - dccOrizzontamentiLamieraGrecata, dccOrizzontamentiVolte, dccOrizzontamentiAltro, - dccOrizzontamentiAltroDescrizione, dccCopertura, dccCoperturaCAAcciaio, - dccCoperturaLegno, dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, dccCoperturaPannelli, - dccCoperturaPVCTelonati, dccCoperturaLeggere, dccCoperturaAltro, - dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, dccElemNonStrutCartongesso, - dccElemNonStrutCalcestruzzo, dccElemNonStrutLegno, dccElemNonStrutAltro, - dccElemNonStrutAltroDescrizione, dccOpereDiRinforzoInsCatene, - dccOpereDiRinforzoInsCordoli, dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, - dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - dccOpereDiRinforzoTelaiECerchiature, dccOpereDiRinforzoInsRompitratta, - dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, geoClasseIndagine, - geoCategoriaSottosuolo, geoCategoriaTopografica, geoConsolidamento, + } + if (!geoDisabledSubmit && DelegheUtil.hasDelegaCompilazioneSezioneGeologica(userId, dettPraticaId)) { + dettPratica = dettPraticaLocalService.updateDettPraticaGeologo(userId, dettPraticaId, intPraticaId, + geoClasseIndagine, geoCategoriaSottosuolo, geoCategoriaTopografica, geoConsolidamento, geoPericolositaGeologica, geoRischioGeomorfologicoPai, geoPericolositaIdraulicaPai, geoRischioIdraulicoPai, geoPericolositaSismica, geoPericolositaIdraulica, - geoPericolositaGeomorfica, geoFattibilitaGeologica, geoFattibilitaSismica, - geoFattibilitaIdraulica, geoOperaRilevante, geoOpereDiSostegno, geoOpereInSotterranea, - geoPresenzaPrescrizioni, geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, - geoEvidenzeGeologiche, geoDtRelazione, pagInterventiRestauroManufatti, - pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, - pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, - pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, - pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, note, noteUfficio, - localizzazioneGeografica, tcNuovaCostruzione, tcAdeguamentoSismico, - tcMiglioramentoSismico, tcRiparazioneInterventoLocale, tcInCA, tcInOpera, - tcPrefabbricato, tcInAcciaio, tcMista, tcInMuratura, tcInMuraturaOrdinaria, - tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, tcAltro, tcAltroDescrizione, - tcConDispositivi, normLavoriInProprio, normEsenteBollo, normEsenteSpese, normDpr01Dep, - normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, normDm2018, - normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, - normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, - intervFinPub, intervFinPubDesc, serviceContext, bozza, paesaggioLocale, livelloDiTutela, - vincoli, destinazioneAltroIntervento, tcCostruzioniEsistenti, tcManutOrdStraord, - tcAltriInterventi, tcAltriInterventiDesc, noCollaudo, tcNuovaCostruzionePertinenza, - tcInterventoOpereEscavazione, tcViarch, tcOperaA25, sanatoriaEdilizia47, sanatoriaEdilizia724, - sanatoriaEdilizia326, normLavoriNoDirettore, pagSoggettiAdAutorizzazione, interventoVoceP7); + geoPericolositaGeomorfica, geoFattibilitaGeologica, geoFattibilitaSismica, geoFattibilitaIdraulica, + geoOperaRilevante, geoOpereDiSostegno, geoOpereInSotterranea, geoPresenzaPrescrizioni, + geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, geoEvidenzeGeologiche, + geoDtRelazione, serviceContext, bozza); } return dettPratica; } + @Override public DettPratica fetchDettPratica(long dettPraticaId) throws SystemException { return dettPraticaLocalService.fetchDettPratica(dettPraticaId); } + @Override public DettPratica getLastCompletedByIntPratica(long intPraticaId) throws SystemException { return dettPraticaLocalService.getLastCompletedByIntPratica(intPraticaId); } + @Override public DettPratica getLastdByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { return dettPraticaLocalService.getLastdByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } + @Override public DettPratica getLastEditabledByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { return dettPraticaLocalService.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } - public List findCompletedByIntPraticaAndTipoPratica(long intPraticaId, - List tipoPratiche) throws SystemException { + @Override + public List findCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) + throws SystemException { return dettPraticaLocalService.findCompletedByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } + @Override public int countCompletedByIntPraticaAndTipoPratica(long intPraticaId, List tipoPratiche) throws SystemException { return dettPraticaLocalService.countCompletedByIntPraticaAndTipoPratica(intPraticaId, tipoPratiche); } - // public void updatePagamentoManuale(long pagamentoId, long dettPraticaId, - // byte[] content, String - // sourceFileName, - // ServiceContext serviceContext) throws PortalException, SystemException { - // - // DettPratica dettPratica = - // dettPraticaLocalService.getDettPratica(dettPraticaId); - // if (getUserId() == dettPratica.getUserId()) { - // dettPraticaLocalService.updatePagamentoManuale(pagamentoId, - // dettPraticaId, content, - // sourceFileName, - // serviceContext); - // } else { - // throw new - // SystemException("pagamento manuale aggiornabile solo da titolare del dettPratica"); - // } - // } - + @Override public DettPratica pagaInvia(long dettPraticaId, Double pagInterventiRestauroManufatti, Double pagAltriCasiCulturali, Double pagLottizzazioni, Double pagGrandiStrutture, Double pagCondotte, Double pagPalificazioni, Double pagImpiantiEolici, Double pagNuoveRealizzazioni, Double pagImmobiliPreesistenti, Double pagManifestiPubblicitari, Double pagPareriDiMassima, Double pagAltriCasiPaesaggistici, Double pagVariantiPareriResi, Double pagRilascioAttestazioni, Double pagConsultazioniArchivio, String importoSpeseIstruttoria, String codiceFiscaleCommittente, - Double pagSoggettiAdAutorizzazione, String currentURL, ServiceContext serviceContext) throws SystemException, PortalException { + Double pagSoggettiAdAutorizzazione, String currentURL, ServiceContext serviceContext) + throws SystemException, PortalException { - return dettPraticaLocalService.pagaInvia(dettPraticaId, pagInterventiRestauroManufatti, - pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, - pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, - pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, - pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, importoSpeseIstruttoria, - codiceFiscaleCommittente, pagSoggettiAdAutorizzazione, currentURL, serviceContext); + return dettPraticaLocalService.pagaInvia(dettPraticaId, pagInterventiRestauroManufatti, pagAltriCasiCulturali, + pagLottizzazioni, pagGrandiStrutture, pagCondotte, pagPalificazioni, pagImpiantiEolici, + pagNuoveRealizzazioni, pagImmobiliPreesistenti, pagManifestiPubblicitari, pagPareriDiMassima, + pagAltriCasiPaesaggistici, pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, + importoSpeseIstruttoria, codiceFiscaleCommittente, pagSoggettiAdAutorizzazione, currentURL, + serviceContext); } - public DettPratica updateCheckPagamenti(long dettPraticaId, boolean normEsenteSpese, - boolean normEsenteBollo) throws SystemException, PortalException { + @Override + public DettPratica updateCheckPagamenti(long dettPraticaId, boolean normEsenteSpese, boolean normEsenteBollo) + throws SystemException, PortalException { return dettPraticaLocalService.updateCheckPagamenti(dettPraticaId, normEsenteSpese, normEsenteBollo); } - public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException, SystemException, - PortalException { + @Override + public DettPratica updateEsito(long dettPraticaId, int stato) throws IOException, SystemException, PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY); return dettPraticaLocalService.updateEsito(dettPraticaId, stato); } - public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException, - SystemException, PortalException { + @Override + public DettPratica updateEsitoIntegrazione(long dettPraticaId, int stato) throws IOException, SystemException, + PortalException { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), ActionKeys.ADD_ENTRY); return dettPraticaLocalService.updateEsitoIntegrazione(dettPraticaId, stato); } - // public void sostituisciPagamento(long pagamentoId, long dettPraticaId, - // String - // codiceFiscaleCommittente, String mezzo, - // String url, ServiceContext serviceContext) throws PortalException, - // SystemException { - // - // DettPratica dettPratica = - // dettPraticaLocalService.getDettPratica(dettPraticaId); - // if (getUserId() == dettPratica.getUserId()) { - // dettPraticaLocalService.sostituisciPagamento(pagamentoId, dettPraticaId, - // codiceFiscaleCommittente, mezzo, url, - // serviceContext); - // } else { - // throw new - // SystemException("pagamento aggiornabile solo da titolare del dettPratica"); - // } - // - // } - + @Override public DettPratica updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) throws PortalException, SystemException { return dettPraticaLocalService.updatePrincipale(dettPraticaId, codiceFiscale, tipologiaSoggetto); } + @Override public int getNumeroDiVersioni(long intPraticaId, long companyId) throws Exception { Company company = CompanyLocalServiceUtil.getCompany(companyId); String shapshotsCountURL = (String) company.getExpandoBridge().getAttribute( @@ -485,6 +373,7 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { return dettPraticaLocalService.getNumeroDiVersioni(shapshotsCountURL); } + @Override public String getJsonVersion(long intPraticaId, long companyId, int version) throws Exception { Company company = CompanyLocalServiceUtil.getCompany(companyId); @@ -497,13 +386,13 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { } + @Override public String callForChanges(long intPraticaId, long companyId, int version) throws Exception { Company company = CompanyLocalServiceUtil.getCompany(companyId); String changesURL = (String) company.getExpandoBridge().getAttribute( Constants.COMPANY_CUSTOM_FIELD_VERSIONING_CHANGES, false); - changesURL += intPraticaId + StringPool.FORWARD_SLASH + "from" + StringPool.FORWARD_SLASH - + (version + 1); + changesURL += intPraticaId + StringPool.FORWARD_SLASH + "from" + StringPool.FORWARD_SLASH + (version + 1); JSONArray changes = dettPraticaLocalService.callForChanges(changesURL); @@ -512,14 +401,13 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { for (int i = 0; i < changes.length(); i++) { - if (!PraticaUtil.getDettPraticaHiddenFields().contains( - changes.getJSONObject(i).getString("property"))) { + if (!PraticaUtil.getDettPraticaHiddenFields().contains(changes.getJSONObject(i).getString("property"))) { sb.append(StringPool.QUOTE).append(changes.getJSONObject(i).getString("property")) .append(StringPool.QUOTE).append(StringPool.COMMA); } } - if (sb.length() > 1) { + if (sb.length() > 0) { sb.setLength(sb.length() - 1); } sb.append(StringPool.CLOSE_BRACKET); @@ -527,13 +415,12 @@ public class DettPraticaServiceImpl extends DettPraticaServiceBaseImpl { } + @Override public void sendToVersioning(long dettPraticaId, long companyId) throws Exception { Company company = CompanyLocalServiceUtil.getCompany(companyId); String commitURL = (String) company.getExpandoBridge().getAttribute( Constants.COMPANY_CUSTOM_FIELD_VERSIONING_COMMIT, false); - dettPraticaLocalService.sendToVersioning(dettPraticaId, commitURL); - } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java index e1b24e19..0ef711ba 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocAggiuntivaLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -39,13 +39,12 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException; * The implementation of the doc aggiuntiva local service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.DocAggiuntivaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.DocAggiuntivaLocalService} interface. * *

- * This is a local service. Methods of this service will not have security checks based on the - * propagated JAAS credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -53,145 +52,140 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException; * @see it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil */ public class DocAggiuntivaLocalServiceImpl extends DocAggiuntivaLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil} to access the doc aggiuntiva - * local service. - */ - - public List findByIntPratica(long intPraticaId) throws SystemException { - - return docAggiuntivaPersistence.findByIntPratica(intPraticaId); - } - - public List findByIntPratica(long intPraticaId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { - - return docAggiuntivaPersistence.findByIntPratica(intPraticaId, start, end, orderByComparator); - } - - public int countByIntPratica(long intPraticaId) throws SystemException { - - return docAggiuntivaPersistence.countByIntPratica(intPraticaId); - } - - public List findByDettPratica(long dettPraticaId) throws SystemException { - - return docAggiuntivaPersistence.findByIntPratica(dettPraticaId); - } - - public List findByDettPratica(long dettPraticaId, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - - return docAggiuntivaPersistence.findByIntPratica(dettPraticaId, start, end, orderByComparator); - } - - public int countByDettPratica(long dettPraticaId) throws SystemException { - - return docAggiuntivaPersistence.countByIntPratica(dettPraticaId); - } - - public List findByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException { - - return docAggiuntivaPersistence.findByIntPratica_FeVisible(intPraticaId, feVisible); - } - - public List findByIntPraticaFeVisible(long intPraticaId, boolean feVisible, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - - return docAggiuntivaPersistence.findByIntPratica_FeVisible(intPraticaId, feVisible, start, end, orderByComparator); - } - - public int countByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException { - - return docAggiuntivaPersistence.countByIntPratica_FeVisible(intPraticaId, feVisible); - } - - public DocAggiuntiva addDocAggiuntiva(long userId, long intPraticaId, long dettPraticaId, String descrizione, - boolean feVisible, byte[] content, String sourceFileName, ServiceContext serviceContext) throws SystemException, - PortalException { - - DocAggiuntiva docAggiuntiva = - docAggiuntivaPersistence.create(counterLocalService.increment(DocAggiuntiva.class.getName())); - - DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); - - User user = userPersistence.findByPrimaryKey(userId); - - Date now = new Date(); - - docAggiuntiva.setCompanyId(serviceContext.getCompanyId()); - docAggiuntiva.setUserId(user.getUserId()); - docAggiuntiva.setUserName(user.getFullName()); - docAggiuntiva.setCreateDate(serviceContext.getCreateDate(now)); - docAggiuntiva.setModifiedDate(serviceContext.getModifiedDate(now)); - docAggiuntiva.setGroupId(serviceContext.getScopeGroupId()); - - docAggiuntiva.setIntPraticaId(intPraticaId); - docAggiuntiva.setDettPraticaId(dettPraticaId); - - docAggiuntiva.setDescrizione(descrizione); - docAggiuntiva.setFeVisible(feVisible); - - long fileEntryId = 0l; - - long defaultFolderId = - configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), - ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); - - Folder defaultFolder = dlAppLocalService.getFolder(defaultFolderId); - String folderName = PraticaUtil.getFolderName(dettPratica.getDettPraticaId()); - Folder folder = null; - try { - folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), folderName); - } catch (NoSuchFolderException e) { - // cartella non presente -> creo cartella - folder = - dlAppLocalService.addFolder(serviceContext.getUserId(), defaultFolder.getRepositoryId(), - defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); - } - String title = - now.getTime() + StringPool.UNDERLINE + "doc_aggiuntiva" + StringPool.UNDERLINE - + docAggiuntiva.getDocAggiuntivaId() + StringPool.UNDERLINE + sourceFileName; - String description = sourceFileName; - String mimeType = MimeTypesUtil.getContentType(sourceFileName); - - String changeLog = StringPool.BLANK; - FileEntry fileEntry = - dlAppLocalService.addFileEntry(serviceContext.getUserId(), folder.getRepositoryId(), folder.getFolderId(), - now.getTime() + "_" + sourceFileName, mimeType, title, description, changeLog, content, serviceContext); - fileEntryId = fileEntry.getFileEntryId(); - docAggiuntiva.setFileEntryId(fileEntryId); - - docAggiuntiva = docAggiuntivaPersistence.update(docAggiuntiva); - - return docAggiuntiva; - } - - @Override - public DocAggiuntiva deleteDocAggiuntiva(DocAggiuntiva docAggiuntiva) throws SystemException { - - try { - if (Validator.isNotNull(docAggiuntiva.getFileEntryId())) { - dlAppLocalService.deleteFileEntry(docAggiuntiva.getFileEntryId()); - } - } catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) { - - } catch (PortalException e) { - throw new SystemException(e); - } - return super.deleteDocAggiuntiva(docAggiuntiva); - } - - @Override - public DocAggiuntiva deleteDocAggiuntiva(long docAggiuntivaId) throws PortalException, SystemException { - - return deleteDocAggiuntiva(docAggiuntivaLocalService.getDocAggiuntiva(docAggiuntivaId)); - } - - public DocAggiuntiva fetchByOldFileEntryId(long oldFileEntryId) throws SystemException { - - return docAggiuntivaPersistence.fetchByoldFileEntryId(oldFileEntryId); - } - + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.DocAggiuntivaLocalServiceUtil} to access the doc aggiuntiva local service. + */ + + @Override + public List findByIntPratica(long intPraticaId) throws SystemException { + + return docAggiuntivaPersistence.findByIntPratica(intPraticaId); + } + + @Override + public List findByIntPratica(long intPraticaId, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return docAggiuntivaPersistence.findByIntPratica(intPraticaId, start, end, orderByComparator); + } + + @Override + public int countByIntPratica(long intPraticaId) throws SystemException { + + return docAggiuntivaPersistence.countByIntPratica(intPraticaId); + } + + @Override + public List findByDettPratica(long dettPraticaId) throws SystemException { + + return docAggiuntivaPersistence.findByIntPratica(dettPraticaId); + } + + @Override + public List findByDettPratica(long dettPraticaId, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return docAggiuntivaPersistence.findByIntPratica(dettPraticaId, start, end, orderByComparator); + } + + @Override + public int countByDettPratica(long dettPraticaId) throws SystemException { + + return docAggiuntivaPersistence.countByIntPratica(dettPraticaId); + } + + @Override + public List findByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException { + + return docAggiuntivaPersistence.findByIntPratica_FeVisible(intPraticaId, feVisible); + } + + @Override + public List findByIntPraticaFeVisible(long intPraticaId, boolean feVisible, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return docAggiuntivaPersistence.findByIntPratica_FeVisible(intPraticaId, feVisible, start, end, + orderByComparator); + } + + @Override + public int countByIntPraticaFeVisible(long intPraticaId, boolean feVisible) throws SystemException { + + return docAggiuntivaPersistence.countByIntPratica_FeVisible(intPraticaId, feVisible); + } + + @Override + public DocAggiuntiva addDocAggiuntiva(long userId, long intPraticaId, long dettPraticaId, String descrizione, + boolean feVisible, byte[] content, String sourceFileName, ServiceContext serviceContext) + throws SystemException, PortalException { + + DocAggiuntiva docAggiuntiva = docAggiuntivaPersistence.create(counterLocalService.increment(DocAggiuntiva.class + .getName())); + DettPratica dettPratica = dettPraticaLocalService.getDettPratica(dettPraticaId); + User user = userPersistence.findByPrimaryKey(userId); + Date now = new Date(); + docAggiuntiva.setCompanyId(serviceContext.getCompanyId()); + docAggiuntiva.setUserId(user.getUserId()); + docAggiuntiva.setUserName(user.getFullName()); + docAggiuntiva.setCreateDate(serviceContext.getCreateDate(now)); + docAggiuntiva.setModifiedDate(serviceContext.getModifiedDate(now)); + docAggiuntiva.setGroupId(serviceContext.getScopeGroupId()); + docAggiuntiva.setIntPraticaId(intPraticaId); + docAggiuntiva.setDettPraticaId(dettPraticaId); + docAggiuntiva.setDescrizione(descrizione); + docAggiuntiva.setFeVisible(feVisible); + long fileEntryId = 0L; + long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), + ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); + Folder defaultFolder = dlAppLocalService.getFolder(defaultFolderId); + String folderName = PraticaUtil.getFolderName(dettPratica.getDettPraticaId()); + Folder folder = null; + try { + folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), + folderName); + } catch (NoSuchFolderException e) { + // cartella non presente -> creo cartella + folder = dlAppLocalService.addFolder(serviceContext.getUserId(), defaultFolder.getRepositoryId(), + defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); + } + String title = now.getTime() + StringPool.UNDERLINE + "doc_aggiuntiva" + StringPool.UNDERLINE + + docAggiuntiva.getDocAggiuntivaId() + StringPool.UNDERLINE + sourceFileName; + String description = sourceFileName; + String mimeType = MimeTypesUtil.getContentType(sourceFileName); + String changeLog = StringPool.BLANK; + FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), folder.getRepositoryId(), + folder.getFolderId(), now.getTime() + "_" + sourceFileName, mimeType, title, description, changeLog, + content, serviceContext); + fileEntryId = fileEntry.getFileEntryId(); + docAggiuntiva.setFileEntryId(fileEntryId); + docAggiuntiva = docAggiuntivaPersistence.update(docAggiuntiva); + return docAggiuntiva; + } + + @Override + public DocAggiuntiva deleteDocAggiuntiva(DocAggiuntiva docAggiuntiva) throws SystemException { + + try { + if (Validator.isNotNull(docAggiuntiva.getFileEntryId())) { + dlAppLocalService.deleteFileEntry(docAggiuntiva.getFileEntryId()); + } + } catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) { + } catch (PortalException e) { + throw new SystemException(e); + } + return super.deleteDocAggiuntiva(docAggiuntiva); + } + + @Override + public DocAggiuntiva deleteDocAggiuntiva(long docAggiuntivaId) throws PortalException, SystemException { + + return deleteDocAggiuntiva(docAggiuntivaLocalService.getDocAggiuntiva(docAggiuntivaId)); + } + + @Override + public DocAggiuntiva fetchByOldFileEntryId(long oldFileEntryId) throws SystemException { + + return docAggiuntivaPersistence.fetchByoldFileEntryId(oldFileEntryId); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java index e301b59d..bab4610e 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/DocPraticaLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -55,14 +55,12 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException; * The implementation of the doc pratica local service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.DocPraticaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.DocPraticaLocalService} interface. * *

- * This is a local service. Methods of this service will not have security - * checks based on the propagated JAAS credentials because this service can only - * be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -71,9 +69,8 @@ import com.liferay.portlet.documentlibrary.NoSuchFolderException; */ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use - * {@link it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil} to - * access the doc pratica local service. + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.DocPraticaLocalServiceUtil} to access the doc pratica local service. */ @Override @@ -84,7 +81,6 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { dlAppLocalService.deleteFileEntry(docPratica.getDlFileEntryId()); } } catch (NoSuchFileEntryException | NoSuchRepositoryEntryException e) { - } catch (PortalException e) { throw new SystemException(e); } @@ -97,28 +93,22 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return deleteDocPratica(docPraticaLocalService.getDocPratica(docPraticaId)); } - public DocPratica addDocPratica(long userId, String className, long classPk, long intPraticaId, - byte[] dlFileEntry, String fileName, String version, boolean praticaValidata, String descLong, - String tipologia, String sha256, boolean aggiornato, String jsonFirmatari, - long dettPraticaIdRimozione, Date dtDataRimozione, ServiceContext serviceContext) - throws PortalException, SystemException { + @Override + public DocPratica addDocPratica(long userId, String className, long classPk, long intPraticaId, byte[] dlFileEntry, + String fileName, String version, boolean praticaValidata, String descLong, String tipologia, String sha256, + boolean aggiornato, String jsonFirmatari, long dettPraticaIdRimozione, Date dtDataRimozione, + ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - - DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class - .getName())); - + DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class.getName())); FileEntry fileEntry = addAttachment(classPk, intPraticaId, userId, fileName, dlFileEntry, tipologia); - docPratica.setCompanyId(serviceContext.getCompanyId()); docPratica.setUserId(user.getUserId()); docPratica.setUserName(user.getFullName()); docPratica.setCreateDate(serviceContext.getCreateDate(now)); docPratica.setModifiedDate(serviceContext.getModifiedDate(now)); docPratica.setGroupId(serviceContext.getScopeGroupId()); - docPratica.setClassName(className); docPratica.setClassPk(classPk); docPratica.setIntPraticaId(intPraticaId); @@ -132,34 +122,26 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { docPratica.setJsonFirmatari(jsonFirmatari); docPratica.setDettPraticaIdRimozione(dettPraticaIdRimozione); docPratica.setDtDataRimozione(dtDataRimozione); - docPratica.setStatus(WorkflowConstants.STATUS_PENDING); - docPratica = docPraticaPersistence.update(docPratica); - return docPratica; } - public DocPratica addDocPratica(long userId, String className, long classPk, long intPraticaId, - byte[] dlFileEntry, String fileName, String tipologia, String jsonFirmatari, - ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public DocPratica addDocPratica(long userId, String className, long classPk, long intPraticaId, byte[] dlFileEntry, + String fileName, String tipologia, String jsonFirmatari, ServiceContext serviceContext) + throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - - DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class - .getName())); - + DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class.getName())); FileEntry fileEntry = addAttachment(classPk, intPraticaId, userId, fileName, dlFileEntry, tipologia); - docPratica.setCompanyId(serviceContext.getCompanyId()); docPratica.setUserId(user.getUserId()); docPratica.setUserName(user.getFullName()); docPratica.setCreateDate(serviceContext.getCreateDate(now)); docPratica.setModifiedDate(serviceContext.getModifiedDate(now)); docPratica.setGroupId(serviceContext.getScopeGroupId()); - docPratica.setClassName(className); docPratica.setClassPk(classPk); docPratica.setIntPraticaId(intPraticaId); @@ -170,34 +152,27 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { docPratica.setTipologia(tipologia); docPratica.setAggiornato(false); docPratica.setJsonFirmatari(jsonFirmatari); - docPratica.setDettPraticaIdRimozione(0l); + docPratica.setDettPraticaIdRimozione(0L); docPratica.setDtDataRimozione(null); - docPratica.setStatus(WorkflowConstants.STATUS_PENDING); - docPratica = docPraticaPersistence.update(docPratica); - return docPratica; } - public DocPratica addDocPratica(long userId, String className, long classPk, long intPraticaId, - long fileEntryId, String fileName, String tipologia, String jsonFirmatari, - ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public DocPratica addDocPratica(long userId, String className, long classPk, long intPraticaId, long fileEntryId, + String fileName, String tipologia, String jsonFirmatari, ServiceContext serviceContext) + throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - - DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class - .getName())); - + DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class.getName())); docPratica.setCompanyId(serviceContext.getCompanyId()); docPratica.setUserId(user.getUserId()); docPratica.setUserName(user.getFullName()); docPratica.setCreateDate(serviceContext.getCreateDate(now)); docPratica.setModifiedDate(serviceContext.getModifiedDate(now)); docPratica.setGroupId(serviceContext.getScopeGroupId()); - docPratica.setClassName(className); docPratica.setClassPk(classPk); docPratica.setIntPraticaId(intPraticaId); @@ -208,72 +183,26 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { docPratica.setTipologia(tipologia); docPratica.setAggiornato(false); docPratica.setJsonFirmatari(jsonFirmatari); - docPratica.setDettPraticaIdRimozione(0l); + docPratica.setDettPraticaIdRimozione(0L); docPratica.setDtDataRimozione(null); - docPratica.setStatus(WorkflowConstants.STATUS_PENDING); - docPratica = docPraticaPersistence.update(docPratica); - return docPratica; } - public DocPratica addDocPraticaForImport(long userId, String className, long classPk, long intPraticaId, - byte[] dlFileEntry, String fileName, String version, boolean praticaValidata, String descLong, - String tipologia, String sha256, boolean aggiornato, String jsonFirmatari, - long dettPraticaIdRimozione, Date dtDataRimozione, long oldDocPraticaId, - ServiceContext serviceContext) throws PortalException, SystemException { - - Date now = new Date(); - - DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class - .getName())); - - docPratica.setCompanyId(serviceContext.getCompanyId()); - docPratica.setUserId(userId); - if (userId > 0) { - User user = userPersistence.findByPrimaryKey(userId); - docPratica.setUserName(user.getFullName()); - } - docPratica.setCreateDate(serviceContext.getCreateDate(now)); - docPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - docPratica.setGroupId(serviceContext.getScopeGroupId()); - docPratica.setClassName(className); - docPratica.setClassPk(classPk); - docPratica.setIntPraticaId(intPraticaId); - docPratica.setVersion(version); - docPratica.setPraticaValidata(praticaValidata); - docPratica.setDescLong(descLong); - docPratica.setTipologia(tipologia); - docPratica.setSha256(sha256); - docPratica.setAggiornato(aggiornato); - docPratica.setJsonFirmatari(jsonFirmatari); - docPratica.setDettPraticaIdRimozione(dettPraticaIdRimozione); - docPratica.setDtDataRimozione(dtDataRimozione); - docPratica.setOldDocPraticaId(oldDocPraticaId); - - docPratica.setStatus(WorkflowConstants.STATUS_APPROVED); - - return docPraticaPersistence.update(docPratica); - } - + @Override public FileEntry addAttachment(long classPk, long intPraticaId, long delegaUserId, String sourceFileName, byte[] content, String tipoAllegato) throws SystemException, PortalException { FileEntry fileEntry = null; - - // DettPratica dettPratica = - // dettPraticaPersistence.fetchByPrimaryKey(dettPraticaId); IntPratica intPratica = intPraticaPersistence.fetchByPrimaryKey(intPraticaId); Territorio territorio = territorioPersistence.fetchByPrimaryKey(intPratica.getTerritorioId()); - long companyId = territorio.getCompanyId(); long groupId = territorio.getGroupId(); - // TODO forse è meglio ragionare con un'altra logica per i permessi User user = UserLocalServiceUtil.getRoleUsers( - RoleLocalServiceUtil.getRole(intPratica.getCompanyId(), RoleConstants.ADMINISTRATOR) - .getRoleId()).get(0); + RoleLocalServiceUtil.getRole(intPratica.getCompanyId(), RoleConstants.ADMINISTRATOR).getRoleId()) + .get(0); try { PermissionThreadLocal.setPermissionChecker(PermissionCheckerFactoryUtil.create(user)); } catch (Exception e) { @@ -281,43 +210,35 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { } long userId = user.getUserId(); - ServiceContext serviceContext = new ServiceContext(); serviceContext.setCompanyId(companyId); serviceContext.setScopeGroupId(groupId); serviceContext.setUserId(userId); - // TODO forse mettiamo i permesssi ma non mi pare sicuro. - long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(companyId, ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); - Folder defaultFolder = dlAppLocalService.getFolder(defaultFolderId); - String folderName = PraticaUtil.getFolderName(classPk); - Folder folder = null; try { - folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), - defaultFolder.getFolderId(), folderName); + folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), + folderName); } catch (NoSuchFolderException e) { // cartella non presente -> creo cartella - folder = dlAppLocalService.addFolder(userId, defaultFolder.getRepositoryId(), - defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); + folder = dlAppLocalService.addFolder(userId, defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), + folderName, StringPool.BLANK, serviceContext); } Date now = new Date(); String title = tipoAllegato + StringPool.UNDERLINE + sourceFileName; String description = sourceFileName; String mimeType = MimeTypesUtil.getContentType(sourceFileName); - String changeLog = StringPool.BLANK; fileEntry = dlAppLocalService.addFileEntry(userId, folder.getRepositoryId(), folder.getFolderId(), - now.getTime() + "_" + sourceFileName, mimeType, title, description, changeLog, content, - serviceContext); - + now.getTime() + StringPool.UNDERLINE + sourceFileName, mimeType, title, description, changeLog, + content, serviceContext); try { - PermissionThreadLocal.setPermissionChecker(PermissionCheckerFactoryUtil - .create(UserLocalServiceUtil.getUser(delegaUserId))); + PermissionThreadLocal.setPermissionChecker(PermissionCheckerFactoryUtil.create(UserLocalServiceUtil + .getUser(delegaUserId))); } catch (Exception e) { throw new SystemException(e); @@ -325,12 +246,14 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return fileEntry; } + @Override public FileEntry getAttachment(long classPk) throws SystemException, PortalException { DocPratica fileAllegato = docPraticaPersistence.findByPrimaryKey(classPk); return dlAppLocalService.getFileEntry(fileAllegato.getDlFileEntryId()); } + @Override public void addFirma(long docPraticaId, String codiceFiscale) throws PortalException, SystemException { DocPratica docPratica = docPraticaLocalService.getDocPratica(docPraticaId); @@ -338,6 +261,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { docPraticaLocalService.updateDocPratica(docPratica); } + @Override public void addFirmeAndApprova(long docPraticaId, List codiciFiscali) throws PortalException, SystemException { @@ -352,18 +276,19 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { docPraticaLocalService.updateDocPratica(docPratica); } - public void addErrorAndApprova(long docPraticaId, String errorCode) throws PortalException, - SystemException { + @Override + public void addErrorAndApprova(long docPraticaId, String errorCode) throws PortalException, SystemException { DocPratica docPratica = docPraticaLocalService.getDocPratica(docPraticaId); docPratica.setModifiedDate(new Date()); docPratica.setErrorCode(errorCode); - if ("400".equalsIgnoreCase(errorCode)) { + if ("400".equals(errorCode)) { docPratica.setStatus(WorkflowConstants.STATUS_DENIED); } docPraticaLocalService.updateDocPratica(docPratica); } + @Override public void removeFirma(long docPraticaId, String codiceFiscale) throws PortalException, SystemException { DocPratica docPratica = docPraticaLocalService.getDocPratica(docPraticaId); @@ -371,8 +296,8 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { docPraticaLocalService.updateDocPratica(docPratica); } - public DocPratica updateDocPraticaAggiornato(long docPraticaId, boolean aggiornato) - throws SystemException { + @Override + public DocPratica updateDocPraticaAggiornato(long docPraticaId, boolean aggiornato) throws SystemException { DocPratica docPratica = docPraticaPersistence.fetchByPrimaryKey(docPraticaId); docPratica.setAggiornato(aggiornato); @@ -380,12 +305,14 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return docPraticaLocalService.updateDocPratica(docPratica); } + @Override public int countDocPraticaDaInviareDax() throws SystemException { DynamicQuery dynamicQuery = dynamicQueryDocPraticaDaInviareDax(); return (int) docPraticaPersistence.countWithDynamicQuery(dynamicQuery); } + @Override public List getDocPraticaDaInviareDax(int start, int end) throws SystemException { DynamicQuery dynamicQuery = dynamicQueryDocPraticaDaInviareDax(); @@ -402,48 +329,56 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery; } + @Override public int countByClassPk(long classPk) throws SystemException { return docPraticaPersistence.countByClassPk(classPk); } + @Override public List findByClassPk(long classPk, int start, int end) throws SystemException { return docPraticaPersistence.findByClassPk(classPk, start, end); } + @Override public List findByIntPratica(long intPraticaId) throws SystemException { return docPraticaPersistence.findByIntPratica(intPraticaId); } + @Override public List findByClassPk(long classPk) throws SystemException { return docPraticaPersistence.findByClassPk(classPk); } - public List findByStaus(int status, int start, int end, OrderByComparator order) - throws SystemException { + @Override + public List findByStaus(int status, int start, int end, OrderByComparator order) throws SystemException { return docPraticaPersistence.findByStatus(status, start, end, order); } + @Override public int countByStatus(long status) throws SystemException { return docPraticaPersistence.countByStatus(status); } + @Override public int countByClassPk_Tipologia(long classPk, String tipologia) throws SystemException { return docPraticaPersistence.countByClassPk_Tipologia(classPk, tipologia); } + @Override public List findByClassPk_Tipologia(long classPk, String tipologia, int start, int end) throws SystemException { return docPraticaPersistence.findByClassPk_Tipologia(classPk, tipologia, start, end); } + @Override public List findByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end) throws SystemException { @@ -454,8 +389,9 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return soggettoPersistence.findWithDynamicQuery(dynamicQuery, start, end); } - public List findByIntPratica_ClassPk_Tipologia(long intPraticaId, long classPk, - String tipologia, int start, int end) throws SystemException { + @Override + public List findByIntPratica_ClassPk_Tipologia(long intPraticaId, long classPk, String tipologia, + int start, int end) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); @@ -465,8 +401,9 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery(dynamicQuery, start, end); } - public List findByIntPratica_ClassPk_Tipologie(long intPraticaId, long classPk, - List tipologie) throws SystemException { + @Override + public List findByIntPratica_ClassPk_Tipologie(long intPraticaId, long classPk, List tipologie) + throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); @@ -476,6 +413,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery(dynamicQuery); } + @Override public List findByIntPratica_ClassPkEqual_Tipologie(long intPraticaId, long classPk, List tipologie) throws SystemException { @@ -487,29 +425,25 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery(dynamicQuery); } - public DocPratica fetchByC_Group_DlFileEntry_Version(long dlFileEntryId, String version) - throws SystemException { + @Override + public DocPratica fetchByC_Group_DlFileEntry_Version(long dlFileEntryId, String version) throws SystemException { return docPraticaPersistence.fetchByDlFileEntry_Version(dlFileEntryId, version); } - public DocPratica fetchByOldDocPraticaId(long oldDocPraticaId) throws SystemException { - - return docPraticaPersistence.fetchByOldDocPratica(oldDocPraticaId); - } - + @Override public List findDistinctDlFileEntryId(long classPk, String tipologia, int start, int end) throws SystemException { return findDistinctDlFileEntryId(new long[] { classPk }, tipologia, start, end); } + @Override public List findDistinctDlFileEntryId(long[] classPks, String tipologia, int start, int end) throws SystemException { DynamicQuery dynamicQuery = docPraticaLocalService.dynamicQuery(); - dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil - .property("dlFileEntryId"))); + dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("dlFileEntryId"))); dynamicQuery.add(PropertyFactoryUtil.forName("tipologia").eq(tipologia)); Junction or = RestrictionsFactoryUtil.disjunction(); for (long classPk : classPks) { @@ -520,6 +454,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return docPraticaPersistence.findWithDynamicQuery(dynamicQuery, start, end); } + @Override public List getValidByIntPratica(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); @@ -529,8 +464,9 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery(dynamicQuery); } - public List getValidByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, - int end) throws SystemException { + @Override + public List getValidByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end) + throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); @@ -540,61 +476,59 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery(dynamicQuery, start, end); } - public int countValidTmpByIntPratica_Tipologia(long intPraticaId, String tipologia) - throws SystemException { + @Override + public int countValidTmpByIntPratica_Tipologia(long intPraticaId, String tipologia) throws SystemException { DynamicQuery dynamicQuery = createvalidTmpQueryByIntPratica(intPraticaId); dynamicQuery.add(RestrictionsFactoryUtil.eq("tipologia", tipologia)); - return (int) docPraticaPersistence.countWithDynamicQuery(dynamicQuery); } - public List getValidTmpByIntPratica(long intPraticaId, int start, int end) - throws SystemException { - DynamicQuery dynamicQuery = createvalidTmpQueryByIntPratica(intPraticaId); + @Override + public List getValidTmpByIntPratica(long intPraticaId, int start, int end) throws SystemException { + DynamicQuery dynamicQuery = createvalidTmpQueryByIntPratica(intPraticaId); dynamicQuery.addOrder(OrderFactoryUtil.asc("tipologia")); return dynamicQuery(dynamicQuery, start, end); } - public List getValidTmpByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, - int end) throws SystemException { + @Override + public List getValidTmpByIntPratica_Tipologia(long intPraticaId, String tipologia, int start, int end) + throws SystemException { DynamicQuery dynamicQuery = createvalidTmpQueryByIntPratica(intPraticaId); dynamicQuery.add(RestrictionsFactoryUtil.eq("tipologia", tipologia)); - dynamicQuery.addOrder(OrderFactoryUtil.asc("dettPraticaIdRimozione")); return dynamicQuery(dynamicQuery, start, end); } - public List getValidTmpByIntPratica_DettPratica_Tipologia(long intPraticaId, - long dettPraticaId, String tipologia, int start, int end) throws SystemException { + @Override + public List getValidTmpByIntPratica_DettPratica_Tipologia(long intPraticaId, long dettPraticaId, + String tipologia, int start, int end) throws SystemException { DynamicQuery dynamicQuery = createvalidTmpQueryByIntPratica(intPraticaId); dynamicQuery.add(RestrictionsFactoryUtil.eq("tipologia", tipologia)); dynamicQuery.add(RestrictionsFactoryUtil.eq("classPk", dettPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("className", DettPratica.class.getName())); - dynamicQuery.addOrder(OrderFactoryUtil.asc("dettPraticaIdRimozione")); return dynamicQuery(dynamicQuery, start, end); } - public List getValidTmpByIntPratica_Tipologie(long intPraticaId, String[] tipologie, - int start, int end) throws SystemException { + @Override + public List getValidTmpByIntPratica_Tipologie(long intPraticaId, String[] tipologie, int start, int end) + throws SystemException { DynamicQuery dynamicQuery = createvalidTmpQueryByIntPratica(intPraticaId); dynamicQuery.add(RestrictionsFactoryUtil.in("tipologia", tipologie)); - dynamicQuery.addOrder(OrderFactoryUtil.asc("dettPraticaIdRimozione")); return dynamicQuery(dynamicQuery, start, end); } - public int countValidTmpByIntPratica_Tipologie(long intPraticaId, String[] tipologie) - throws SystemException { + @Override + public int countValidTmpByIntPratica_Tipologie(long intPraticaId, String[] tipologie) throws SystemException { DynamicQuery dynamicQuery = createvalidTmpQueryByIntPratica(intPraticaId); dynamicQuery.add(RestrictionsFactoryUtil.in("tipologia", tipologie)); - return (int) docPraticaPersistence.countWithDynamicQuery(dynamicQuery); } @@ -603,10 +537,10 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", null)); - return dynamicQuery; } + @Override public List getInvalidByIntPratica(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); @@ -616,6 +550,7 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery(dynamicQuery); } + @Override public List getInvalidTmpByIntPratica(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); @@ -625,20 +560,20 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { return dynamicQuery(dynamicQuery); } - public List getValidUntilClassPkByIntPratica(long intPraticaId, long classPk, - String tipologia, int start, int end) throws SystemException { + @Override + public List getValidUntilClassPkByIntPratica(long intPraticaId, long classPk, String tipologia, + int start, int end) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.le("classPk", classPk)); dynamicQuery.add(RestrictionsFactoryUtil.eq("tipologia", tipologia)); - // dynamicQuery.add(RestrictionsFactoryUtil.eq("dettPraticaIdRimozione", - // null)); dynamicQuery.add(RestrictionsFactoryUtil.eq("rimosso", false)); dynamicQuery.addOrder(OrderFactoryUtil.desc("classPk")); return dynamicQuery(dynamicQuery, start, end); } + @Override public void completeInvalidation(long intPraticaId) throws SystemException { Date now = new Date(); @@ -646,39 +581,33 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { for (DocPratica docPratica : allegatiDaInvalidare) { docPratica.setRimosso(true); docPratica.setDtDataRimozione(now); - docPratica = updateDocPratica(docPratica); } } + @Override public List getDocPraticaWithOldFileEntryId(int start, int end) throws SystemException { DynamicQuery dynamicQuery = DynamicQueryFactoryUtil.forClass(DocPratica.class); dynamicQuery.add(PropertyFactoryUtil.forName("oldDlFileEntryId").ne(0L)); dynamicQuery.addOrder(OrderFactoryUtil.desc("oldDlFileEntryId")); - return docPraticaLocalService.dynamicQuery(dynamicQuery, start, end); } - // ADT BUG FE ID = 9 - public DocPratica addDocPraticaAnnullamento(long userId, String className, long classPk, - long intPraticaId, long fileEntryId, String fileName, String tipologia, String sha256, - String jsonFirmatari, ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public DocPratica addDocPraticaAnnullamento(long userId, String className, long classPk, long intPraticaId, + long fileEntryId, String fileName, String tipologia, String sha256, String jsonFirmatari, + ServiceContext serviceContext) throws PortalException, SystemException { User user = userPersistence.findByPrimaryKey(userId); - Date now = new Date(); - - DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class - .getName())); - + DocPratica docPratica = docPraticaPersistence.create(counterLocalService.increment(DocPratica.class.getName())); docPratica.setCompanyId(serviceContext.getCompanyId()); docPratica.setUserId(user.getUserId()); docPratica.setUserName(user.getFullName()); docPratica.setCreateDate(serviceContext.getCreateDate(now)); docPratica.setModifiedDate(serviceContext.getModifiedDate(now)); docPratica.setGroupId(serviceContext.getScopeGroupId()); - docPratica.setClassName(className); docPratica.setClassPk(classPk); docPratica.setIntPraticaId(intPraticaId); @@ -690,29 +619,19 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { docPratica.setSha256(sha256); docPratica.setAggiornato(false); docPratica.setJsonFirmatari(jsonFirmatari); - docPratica.setDettPraticaIdRimozione(0l); + docPratica.setDettPraticaIdRimozione(0L); docPratica.setDtDataRimozione(null); - docPratica.setStatus(WorkflowConstants.STATUS_PENDING); - docPratica = docPraticaPersistence.update(docPratica); - return docPratica; } /** * Metodo nuovo ADT - * - * @param intPraticaId - * @param classPk - * @param tipologia - * @param start - * @param end - * @return - * @throws SystemException */ - public List findByIntPratica_ClassPk_TipologiaNew(long intPraticaId, long classPk, - String tipologia, int start, int end) throws SystemException { + @Override + public List findByIntPratica_ClassPk_TipologiaNew(long intPraticaId, long classPk, String tipologia, + int start, int end) throws SystemException { DynamicQuery dynamicQuery = dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); @@ -721,5 +640,4 @@ public class DocPraticaLocalServiceImpl extends DocPraticaLocalServiceBaseImpl { dynamicQuery.addOrder(OrderFactoryUtil.desc("classPk")); return dynamicQuery(dynamicQuery, start, end); } - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java index c5d525ee..058852c8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -57,13 +57,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the fine lavori local service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.FineLavoriLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.FineLavoriLocalService} interface. * *

- * This is a local service. Methods of this service will not have security checks based on the - * propagated JAAS credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -71,520 +70,442 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil */ public class FineLavoriLocalServiceImpl extends FineLavoriLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil} to access the fine lavori local - * service. - */ - - private FineLavori initFineLavori(ServiceContext serviceContext) throws PortalException, SystemException { - - User user = userLocalService.getUser(serviceContext.getUserId()); - - Date now = new Date(); - - FineLavori fineLavori = fineLavoriPersistence.create(counterLocalService.increment(DettPratica.class.getName())); - - fineLavori.setCompanyId(serviceContext.getCompanyId()); - fineLavori.setGroupId(serviceContext.getScopeGroupId()); - fineLavori.setUserId(serviceContext.getUserId()); - fineLavori.setUserName(user.getFullName()); - fineLavori.setCreateDate(serviceContext.getCreateDate(now)); - fineLavori.setModifiedDate(serviceContext.getModifiedDate(now)); - - // setto parametri di default - fineLavori.setParziale(false); - fineLavori.setDataEffettuazione(null); - fineLavori.setDataFineLavori(null); - fineLavori.setCodiceFiscaleDelegato(StringPool.BLANK); - fineLavori.setNormEsenteBollo(false); - fineLavori.setNormEsenteCollaudo(false); - fineLavori.setComunicazioneDirettoreLavori(StringPool.BLANK); - - return fineLavori; - } - - @Indexable(type = IndexableType.REINDEX) - public FineLavori addFineLavori(long intPraticaId, ServiceContext serviceContext) throws PortalException, - SystemException { - - - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - - FineLavori fineLavori = initFineLavori(serviceContext); - fineLavori.setGroupId(intPratica.getGroupId()); - fineLavori.setIntPraticaId(intPraticaId); - - fineLavoriPersistence.update(fineLavori); - return fineLavori; - } - - @Override - @Indexable(type = IndexableType.DELETE) - public FineLavori deleteFineLavori(FineLavori fineLavori) throws SystemException, PortalException { - - List docPraticas = - docPraticaLocalService.findByClassPk(fineLavori.getFineLavoriId(), QueryUtil.ALL_POS, QueryUtil.ALL_POS); - for (DocPratica docPratica : docPraticas) { - docPraticaLocalService.deleteDocPratica(docPratica); - } - - List pagamenti = pagamentoLocalService.findByClassPk(fineLavori.getFineLavoriId()); - for (Pagamento pagamento : pagamenti) { - pagamentoLocalService.deletePagamento(pagamento); - } - - return super.deleteFineLavori(fineLavori); - } - - @Override - @Indexable(type = IndexableType.DELETE) - public FineLavori deleteFineLavori(long fineLavoriId) throws PortalException, SystemException { - - FineLavori fineLavori = fineLavoriPersistence.findByPrimaryKey(fineLavoriId); - - return deleteFineLavori(fineLavori); - } - - @Indexable(type = IndexableType.REINDEX) - public FineLavori updateFineLavori(long userId, long fineLavoriId, long intPraticaId, boolean parziale, - boolean completata, Date dataFineLavori, String codiceFiscaleDelegato, boolean normEsenteBollo, - boolean normEsenteCollaudo, String comunicazioneDirettoreLavori) throws NoSuchFineLavoriException, - SystemException { - - FineLavori fineLavori = fineLavoriPersistence.findByPrimaryKey(fineLavoriId); - - fineLavori.setParziale(parziale); - fineLavori.setCompletata(completata); - fineLavori.setDataFineLavori(dataFineLavori); - fineLavori.setCodiceFiscaleDelegato(codiceFiscaleDelegato); - fineLavori.setNormEsenteBollo(normEsenteBollo); - fineLavori.setNormEsenteCollaudo(normEsenteCollaudo); - fineLavori.setComunicazioneDirettoreLavori(comunicazioneDirettoreLavori); - - fineLavori = fineLavoriPersistence.update(fineLavori); - - return fineLavori; - } - - public FineLavori getLastEditable(long intPraticaId) throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", false)); - dynamicQuery.addOrder(OrderFactoryUtil.desc("fineLavoriId")); - List fineLavoriList = dynamicQuery(dynamicQuery, 0, 1); - if (!fineLavoriList.isEmpty()) { - return fineLavoriList.get(0); - } - return null; - } - - public FineLavori getLastCompleted(long intPraticaId) throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.addOrder(OrderFactoryUtil.desc("fineLavoriId")); - List fineLavoriList = dynamicQuery(dynamicQuery, 0, 1); - if (!fineLavoriList.isEmpty()) { - return fineLavoriList.get(0); - } - return null; - } - - public FineLavori pagaInvia(long fineLavoriId, String codiceFiscaleCommittente, String currentURL, - ServiceContext serviceContext) throws SystemException, PortalException { - - FineLavori fineLavori = fineLavoriPersistence.findByPrimaryKey(fineLavoriId); - - BigDecimal importoBolli = - PagamentiCommonUtil.getImportoBolli(fineLavori.getCompanyId(), fineLavori.getFineLavoriId(), - FineLavori.class.getName(), TipoIntegrazioneUtil.FINE_LAVORI); - - fineLavori.setImportoBolli(importoBolli.toString()); - fineLavori = updateFineLavori(fineLavori); - - PagamentiUtil.nuovoPagamento(currentURL, fineLavori.getFineLavoriId(), FineLavori.class.getName(), - PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); - - return fineLavori; - } - - // public void sostituisciPagamento(long pagamentoId, long fineLavoriId, String - // codiceFiscaleCommittente, String mezzo, - // String url, ServiceContext serviceContext) throws PortalException, SystemException { - // - // FineLavori fineLavori = getFineLavori(fineLavoriId); - // Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); - // String currentUtilizzata = pagamento.getUtilizzata(); - // String currentMezzo = pagamento.getMezzo(); - // - // boolean irisEnable = PagamentiUtil.irisIsEnable(pagamento.getCompanyId()); - // if (fineLavori.getPagamentoId() != pagamentoId) { - // throw new PortalException("Pagamento non abbinato alla Fine Lavori"); - // } - // if (mezzo.equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE)) { - // if (irisEnable) { - // throw new PortalException("Creazione pagamento manuale con iris enable non possibile"); - // } else if (currentUtilizzata.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) - // || currentUtilizzata.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA)) { - // fineLavori.setPagamentoId(0l); - // fineLavori = updateFineLavori(fineLavori); - // - // pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_SOSTITUITA); - // pagamentoLocalService.updatePagamento(pagamento); - // - // PagamentiUtil.nuovoPagamento(url, fineLavoriId, FineLavori.class.getName(), - // pagamento.getImportoBolli(), - // pagamento.getImportoSpeseIstruttoria(), codiceFiscaleCommittente, serviceContext); - // } else { - // throw new PortalException("Creazione pagamento manuale con stato " + currentUtilizzata + - // " non possibile"); - // } - // } else if (mezzo.equalsIgnoreCase(PagamentoConstants.MEZZO_IRIS)) { - // if (irisEnable - // && (currentMezzo.equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE) || (currentUtilizzata - // .equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) || currentUtilizzata - // .equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA)))) { - // - // fineLavori.setPagamentoId(0l); - // fineLavori = updateFineLavori(fineLavori); - // - // pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_SOSTITUITA); - // pagamentoLocalService.updatePagamento(pagamento); - // PagamentiUtil.nuovoPagamento(url, fineLavoriId, FineLavori.class.getName(), - // pagamento.getImportoBolli(), - // pagamento.getImportoSpeseIstruttoria(), codiceFiscaleCommittente, serviceContext); - // } else { - // throw new PortalException("Pagamento IRIS non sostituibile"); - // } - // - // } else { - // throw new PortalException("Mezzo non presente"); - // } - // - // } - - public void updateEsitoPagamento(long pagamentoId, long fineLavoriId, String stato) throws SystemException, - PortalException { - - updateEsitoPagamento(pagamentoId, fineLavoriId, 0l, stato); - } - - public void updateEsitoPagamento(long pagamentoId, long fineLavoriId, long fileEntryId, String stato) - throws SystemException, PortalException { - - Date now = new Date(); - FineLavori fineLavori = fineLavoriPersistence.fetchByPrimaryKey(fineLavoriId); - - fineLavori.setModifiedDate(now); - if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) { - - fineLavori.setCompletata(true); - fineLavori.setDataEffettuazione(now); - fineLavori - .setNumero(fineLavoriPersistence.countByIntPraticaId_Completata(fineLavori.getIntPraticaId(), true) + 1); - fineLavori = updateFineLavori(fineLavori); - - updateIntPraticaStatus(fineLavori, fineLavori.getIntPraticaId()); - - docPraticaLocalService.completeInvalidation(fineLavori.getIntPraticaId()); - - IntPratica intPratica = intPraticaLocalService.getIntPratica(fineLavori.getIntPraticaId()); - if (WorkflowUtil.isWorkflowDisattivabile(fineLavori.getIntPraticaId()) - && Validator.isNotNull(intPratica.getStatusByUserId())) { - this.inviaMailnotifica(fineLavoriId, intPratica.getStatusByUserId(), now); - } - pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); - } else if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) - || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA) - || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_ANNULLATO)) { - pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); - } - - } - - public FineLavori updateEsito(long fineLavoriId, int stato) throws SystemException, PortalException { - - Date now = new Date(); - FineLavori fineLavori = fineLavoriPersistence.fetchByPrimaryKey(fineLavoriId); - fineLavori.setModifiedDate(now); - - fineLavori.setCompletata(true); - fineLavori.setDataEffettuazione(now); - fineLavori.setNumero(fineLavoriPersistence.countByIntPraticaId_Completata(fineLavori.getIntPraticaId(), true) + 1); - fineLavori = updateFineLavori(fineLavori); - - updateIntPraticaStatus(fineLavori, fineLavori.getIntPraticaId()); - - docPraticaLocalService.completeInvalidation(fineLavori.getIntPraticaId()); - - IntPratica intPratica = intPraticaLocalService.getIntPratica(fineLavori.getIntPraticaId()); - if (WorkflowUtil.isWorkflowDisattivabile(fineLavori.getIntPraticaId()) - && Validator.isNotNull(intPratica.getStatusByUserId())) { - this.inviaMailnotifica(fineLavoriId, intPratica.getStatusByUserId(), now); - } - - return fineLavori; - } - - private void inviaMailnotifica(long fineLavoriId, long tecnicoIstruttoreId, Date date) throws SystemException, - PortalException { - - FineLavori fineLavori = fineLavoriPersistence.fetchByPrimaryKey(fineLavoriId); - - User tecnicoIstruttore = userLocalService.getUser(tecnicoIstruttoreId); - - String[] to = {tecnicoIstruttore.getEmailAddress()}; - String[] cc = new String[0]; - String[] ccn = new String[0]; - - String tipoPratica = StringPool.BLANK; - long intPraticaId = fineLavori.getIntPraticaId(); - if (AzioniPraticheUtil.isDeposito(intPraticaId)) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); - } else if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { - tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); - } + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil} to access the fine lavori local service. + */ + + private FineLavori initFineLavori(ServiceContext serviceContext) throws PortalException, SystemException { + + User user = userLocalService.getUser(serviceContext.getUserId()); + Date now = new Date(); + FineLavori fineLavori = fineLavoriPersistence + .create(counterLocalService.increment(DettPratica.class.getName())); + fineLavori.setCompanyId(serviceContext.getCompanyId()); + fineLavori.setGroupId(serviceContext.getScopeGroupId()); + fineLavori.setUserId(serviceContext.getUserId()); + fineLavori.setUserName(user.getFullName()); + fineLavori.setCreateDate(serviceContext.getCreateDate(now)); + fineLavori.setModifiedDate(serviceContext.getModifiedDate(now)); + // setto parametri di default + fineLavori.setParziale(false); + fineLavori.setDataEffettuazione(null); + fineLavori.setDataFineLavori(null); + fineLavori.setCodiceFiscaleDelegato(StringPool.BLANK); + fineLavori.setNormEsenteBollo(false); + fineLavori.setNormEsenteCollaudo(false); + fineLavori.setComunicazioneDirettoreLavori(StringPool.BLANK); + return fineLavori; + } + + @Override + @Indexable(type = IndexableType.REINDEX) + public FineLavori addFineLavori(long intPraticaId, ServiceContext serviceContext) throws PortalException, + SystemException { + + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); + FineLavori fineLavori = initFineLavori(serviceContext); + fineLavori.setGroupId(intPratica.getGroupId()); + fineLavori.setIntPraticaId(intPraticaId); + fineLavoriPersistence.update(fineLavori); + return fineLavori; + } + + @Override + @Indexable(type = IndexableType.DELETE) + public FineLavori deleteFineLavori(FineLavori fineLavori) throws SystemException, PortalException { + + List docPraticas = docPraticaLocalService.findByClassPk(fineLavori.getFineLavoriId(), + QueryUtil.ALL_POS, QueryUtil.ALL_POS); + for (DocPratica docPratica : docPraticas) { + docPraticaLocalService.deleteDocPratica(docPratica); + } + List pagamenti = pagamentoLocalService.findByClassPk(fineLavori.getFineLavoriId()); + for (Pagamento pagamento : pagamenti) { + pagamentoLocalService.deletePagamento(pagamento); + } + return super.deleteFineLavori(fineLavori); + } + + @Override + @Indexable(type = IndexableType.DELETE) + public FineLavori deleteFineLavori(long fineLavoriId) throws PortalException, SystemException { + + FineLavori fineLavori = fineLavoriPersistence.findByPrimaryKey(fineLavoriId); + return deleteFineLavori(fineLavori); + } + + @Override + @Indexable(type = IndexableType.REINDEX) + public FineLavori updateFineLavori(long userId, long fineLavoriId, long intPraticaId, boolean parziale, + boolean completata, Date dataFineLavori, String codiceFiscaleDelegato, boolean normEsenteBollo, + boolean normEsenteCollaudo, String comunicazioneDirettoreLavori) throws NoSuchFineLavoriException, + SystemException { + + FineLavori fineLavori = fineLavoriPersistence.findByPrimaryKey(fineLavoriId); + fineLavori.setParziale(parziale); + fineLavori.setCompletata(completata); + fineLavori.setDataFineLavori(dataFineLavori); + fineLavori.setCodiceFiscaleDelegato(codiceFiscaleDelegato); + fineLavori.setNormEsenteBollo(normEsenteBollo); + fineLavori.setNormEsenteCollaudo(normEsenteCollaudo); + fineLavori.setComunicazioneDirettoreLavori(comunicazioneDirettoreLavori); + fineLavori = fineLavoriPersistence.update(fineLavori); + return fineLavori; + } + + @Override + public FineLavori getLastEditable(long intPraticaId) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", false)); + dynamicQuery.addOrder(OrderFactoryUtil.desc("fineLavoriId")); + List fineLavoriList = dynamicQuery(dynamicQuery, 0, 1); + if (!fineLavoriList.isEmpty()) { + return fineLavoriList.get(0); + } + return null; + } + + @Override + public FineLavori getLastCompleted(long intPraticaId) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.addOrder(OrderFactoryUtil.desc("fineLavoriId")); + List fineLavoriList = dynamicQuery(dynamicQuery, 0, 1); + if (!fineLavoriList.isEmpty()) { + return fineLavoriList.get(0); + } + return null; + } + + @Override + public FineLavori pagaInvia(long fineLavoriId, String codiceFiscaleCommittente, String currentURL, + ServiceContext serviceContext) throws SystemException, PortalException { + + FineLavori fineLavori = fineLavoriPersistence.findByPrimaryKey(fineLavoriId); + BigDecimal importoBolli = PagamentiCommonUtil.getImportoBolli(fineLavori.getCompanyId(), + fineLavori.getFineLavoriId(), FineLavori.class.getName(), TipoIntegrazioneUtil.FINE_LAVORI); + fineLavori.setImportoBolli(importoBolli.toString()); + fineLavori = updateFineLavori(fineLavori); + PagamentiUtil.nuovoPagamento(currentURL, fineLavori.getFineLavoriId(), FineLavori.class.getName(), + PagamentoConstants.PAGAMENTO_BOLLI, importoBolli.toString(), codiceFiscaleCommittente, serviceContext); + return fineLavori; + } + + @Override + public void updateEsitoPagamento(long pagamentoId, long fineLavoriId, String stato) throws SystemException, + PortalException { + + updateEsitoPagamento(pagamentoId, fineLavoriId, 0l, stato); + } + + @Override + public void updateEsitoPagamento(long pagamentoId, long fineLavoriId, long fileEntryId, String stato) + throws SystemException, PortalException { + + Date now = new Date(); + FineLavori fineLavori = fineLavoriPersistence.fetchByPrimaryKey(fineLavoriId); + fineLavori.setModifiedDate(now); + if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_PAGATA)) { + fineLavori.setCompletata(true); + fineLavori.setDataEffettuazione(now); + fineLavori.setNumero(fineLavoriPersistence.countByIntPraticaId_Completata(fineLavori.getIntPraticaId(), + true) + 1); + fineLavori = updateFineLavori(fineLavori); + updateIntPraticaStatus(fineLavori, fineLavori.getIntPraticaId()); + docPraticaLocalService.completeInvalidation(fineLavori.getIntPraticaId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(fineLavori.getIntPraticaId()); + if (WorkflowUtil.isWorkflowDisattivabile(fineLavori.getIntPraticaId()) + && Validator.isNotNull(intPratica.getStatusByUserId())) { + this.inviaMailnotifica(fineLavoriId, intPratica.getStatusByUserId(), now); + } + pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); + } else if (stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) + || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA) + || stato.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_ANNULLATO)) { + pagamentoLocalService.updatePagamentoUtilizzata(pagamentoId, stato); + } + + } + + @Override + public FineLavori updateEsito(long fineLavoriId, int stato) throws SystemException, PortalException { + + Date now = new Date(); + FineLavori fineLavori = fineLavoriPersistence.fetchByPrimaryKey(fineLavoriId); + fineLavori.setModifiedDate(now); + fineLavori.setCompletata(true); + fineLavori.setDataEffettuazione(now); + fineLavori + .setNumero(fineLavoriPersistence.countByIntPraticaId_Completata(fineLavori.getIntPraticaId(), true) + 1); + fineLavori = updateFineLavori(fineLavori); + updateIntPraticaStatus(fineLavori, fineLavori.getIntPraticaId()); + docPraticaLocalService.completeInvalidation(fineLavori.getIntPraticaId()); + IntPratica intPratica = intPraticaLocalService.getIntPratica(fineLavori.getIntPraticaId()); + if (WorkflowUtil.isWorkflowDisattivabile(fineLavori.getIntPraticaId()) + && Validator.isNotNull(intPratica.getStatusByUserId())) { + this.inviaMailnotifica(fineLavoriId, intPratica.getStatusByUserId(), now); + } + return fineLavori; + } + + private void inviaMailnotifica(long fineLavoriId, long tecnicoIstruttoreId, Date date) throws SystemException, + PortalException { + + FineLavori fineLavori = fineLavoriPersistence.fetchByPrimaryKey(fineLavoriId); + User tecnicoIstruttore = userLocalService.getUser(tecnicoIstruttoreId); + String[] to = { tecnicoIstruttore.getEmailAddress() }; + String[] cc = new String[0]; + String[] ccn = new String[0]; + String tipoPratica = StringPool.BLANK; + long intPraticaId = fineLavori.getIntPraticaId(); + if (AzioniPraticheUtil.isDeposito(intPraticaId)) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-01"); + } else if (AzioniPraticheUtil.isAutorizzazione(intPraticaId)) { + tipoPratica = LanguageUtil.get(LocaleUtil.ITALIAN, "tipo-pratica-02"); + } + JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); + templateVariables.put("receiver", tecnicoIstruttore.getFullName()); + templateVariables.put("tipoPratica", tipoPratica); + templateVariables.put("tipoOggetto", + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + (fineLavori.getParziale() ? "09" : "07"))); + templateVariables.put("dataInvio", + FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(date)); + ServiceContext serviceContext = new ServiceContext(); + serviceContext.setScopeGroupId(fineLavori.getGroupId()); + serviceContext.setCompanyId(fineLavori.getCompanyId()); + serviceContext.setUserId(fineLavori.getUserId()); + MailUtil.invioMailNotifica(fineLavori.getIntPraticaId(), 0l, fineLavoriId, FineLavori.class.getName(), to, cc, + ccn, "NOTIFICA-BO", templateVariables, null, serviceContext); + } + + private IntPratica updateIntPraticaStatus(FineLavori fineLavori, long intPraticaId) throws PortalException, + SystemException { + + IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); + if (fineLavori.isParziale()) { + intPratica.setFineLavoriParziale(true); + } else { + intPratica.setFineLavoriTotale(true); + } + intPratica = intPraticaLocalService.updateIntPratica(intPratica); + return intPratica; + } + + @Override + public FineLavori updateFineLavoriProtocollo(long fineLavoriId, String protocollo) throws PortalException, + SystemException { + + FineLavori fineLavori = fineLavoriLocalService.fetchFineLavori(fineLavoriId); + fineLavori.setModifiedDate(new Date()); + fineLavori.setProtocollo(protocollo); + fineLavori.setDtProtocollo(new Date()); + fineLavori = fineLavoriLocalService.updateFineLavori(fineLavori); + return fineLavori; + } + + @Override + public FineLavori findByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, + SystemException { + + return fineLavoriPersistence.findByC_G_Protocollo(companyId, groupId, protocollo); + } + + @Override + public FineLavori fetchByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, + SystemException { + + return fineLavoriPersistence.fetchByC_G_Protocollo(companyId, groupId, protocollo); + } + + @Override + public FineLavori fetchByProtocollo(String protocollo) throws PortalException, SystemException { + + return fineLavoriPersistence.fetchByProtocollo(protocollo); + } + + @Override + public List findByIntPraticaId(long intPraticaId, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return fineLavoriPersistence.findByIntPraticaId(intPraticaId, start, end, orderByComparator); + } + + @Override + public int countByIntPraticaId(long intPraticaId) throws SystemException { + + return fineLavoriPersistence.countByIntPraticaId(intPraticaId); + } + + @Override + public List findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return fineLavoriPersistence.findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator); + } + + @Override + public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException { + + return fineLavoriPersistence.countByIntPraticaId_Parziale(intPraticaId, parziale); + } + + @Override + public List findByIntPraticaId_Completata(long intPraticaId, boolean completata, int start, int end, + OrderByComparator orderByComparator) throws SystemException { + + return fineLavoriPersistence.findByIntPraticaId_Completata(intPraticaId, completata, start, end, + orderByComparator); + } + + @Override + public int countByIntPraticaId_Completata(long intPraticaId, boolean completata) throws SystemException { + + return fineLavoriPersistence.countByIntPraticaId_Completata(intPraticaId, completata); + } + + @Override + public List findByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato, + int start, int end, OrderByComparator orderByComparator) throws SystemException { + + return fineLavoriPersistence.findByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato, start, end, + orderByComparator); + } + + @Override + public int countByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato) + throws SystemException { - JSONObject templateVariables = JSONFactoryUtil.createJSONObject(); - templateVariables.put("receiver", tecnicoIstruttore.getFullName()); - templateVariables.put("tipoPratica", tipoPratica); - templateVariables.put("tipoOggetto", - LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + (fineLavori.getParziale() ? "09" : "07"))); - templateVariables.put("dataInvio", FastDateFormatFactoryUtil.getSimpleDateFormat("dd/MM/yyyy HH:mm").format(date)); + return fineLavoriPersistence.countByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato); + } - ServiceContext serviceContext = new ServiceContext(); - serviceContext.setScopeGroupId(fineLavori.getGroupId()); - serviceContext.setCompanyId(fineLavori.getCompanyId()); - serviceContext.setUserId(fineLavori.getUserId()); + @Override + public List findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start, + int end, OrderByComparator orderByComparator) throws SystemException { + + return fineLavoriPersistence.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end, + orderByComparator); + } - MailUtil.invioMailNotifica(fineLavori.getIntPraticaId(), 0l, fineLavoriId, FineLavori.class.getName(), to, cc, ccn, - "NOTIFICA-BO", templateVariables, null, serviceContext); - } + @Override + public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException { - private IntPratica updateIntPraticaStatus(FineLavori fineLavori, long intPraticaId) throws PortalException, - SystemException { + return fineLavoriPersistence.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata); + } - IntPratica intPratica = intPraticaLocalService.getIntPratica(intPraticaId); - if (fineLavori.isParziale()) { - intPratica.setFineLavoriParziale(true); - } else { - intPratica.setFineLavoriTotale(true); - } - intPratica = intPraticaLocalService.updateIntPratica(intPratica); - return intPratica; - } + @Override + public List findByIntPraticaId_Parziale_Completata(long intPraticaId, boolean parziale, + boolean completata, int start, int end, OrderByComparator orderByComparator) throws SystemException { - public FineLavori updateFineLavoriProtocollo(long fineLavoriId, String protocollo) throws PortalException, - SystemException { + return fineLavoriPersistence.findByIntPraticaId_Parziale_Completata(intPraticaId, parziale, completata, start, + end, orderByComparator); + } - FineLavori fineLavori = fineLavoriLocalService.fetchFineLavori(fineLavoriId); - fineLavori.setModifiedDate(new Date()); - fineLavori.setProtocollo(protocollo); - fineLavori.setDtProtocollo(new Date()); - fineLavori = fineLavoriLocalService.updateFineLavori(fineLavori); + @Override + public int countByIntPraticaId_Parziale_Completata(long intPraticaId, boolean parziale, boolean completata) + throws SystemException { + + return fineLavoriPersistence.countByIntPraticaId_Parziale_Completata(intPraticaId, parziale, completata); + } - return fineLavori; - } - - public FineLavori findByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, - SystemException { - - return fineLavoriPersistence.findByC_G_Protocollo(companyId, groupId, protocollo); - } - - public FineLavori fetchByProtocollo(long companyId, long groupId, String protocollo) throws PortalException, - SystemException { - - return fineLavoriPersistence.fetchByC_G_Protocollo(companyId, groupId, protocollo); - } - - public FineLavori fetchByProtocollo(String protocollo) throws PortalException, SystemException { - - return fineLavoriPersistence.fetchByProtocollo(protocollo); - } - - public List findByIntPraticaId(long intPraticaId, int start, int end, OrderByComparator orderByComparator) - throws SystemException { - - return fineLavoriPersistence.findByIntPraticaId(intPraticaId, start, end, orderByComparator); - } - - public int countByIntPraticaId(long intPraticaId) throws SystemException { - - return fineLavoriPersistence.countByIntPraticaId(intPraticaId); - } - - public List findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - - return fineLavoriPersistence.findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator); - } - - public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException { - - return fineLavoriPersistence.countByIntPraticaId_Parziale(intPraticaId, parziale); - } - - public List findByIntPraticaId_Completata(long intPraticaId, boolean completata, int start, int end, - OrderByComparator orderByComparator) throws SystemException { - - return fineLavoriPersistence.findByIntPraticaId_Completata(intPraticaId, completata, start, end, orderByComparator); - } - - public int countByIntPraticaId_Completata(long intPraticaId, boolean completata) throws SystemException { - - return fineLavoriPersistence.countByIntPraticaId_Completata(intPraticaId, completata); - } - - public List findByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato, int start, - int end, OrderByComparator orderByComparator) throws SystemException { - - return fineLavoriPersistence.findByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato, start, end, - orderByComparator); - } - - public int countByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato) throws SystemException { - - return fineLavoriPersistence.countByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato); - } - - public List findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start, - int end, OrderByComparator orderByComparator) throws SystemException { - - return fineLavoriPersistence.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end, - orderByComparator); - } - - public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException { - - return fineLavoriPersistence.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata); - } - - public List findByIntPraticaId_Parziale_Completata(long intPraticaId, boolean parziale, - boolean completata, int start, int end, OrderByComparator orderByComparator) throws SystemException { - - return fineLavoriPersistence.findByIntPraticaId_Parziale_Completata(intPraticaId, parziale, completata, start, end, - orderByComparator); - } - - public int countByIntPraticaId_Parziale_Completata(long intPraticaId, boolean parziale, boolean completata) - throws SystemException { - - return fineLavoriPersistence.countByIntPraticaId_Parziale_Completata(intPraticaId, parziale, completata); - } - - public List findByIntPraticaId_Parziale_leFineLavoriId(long fineLavoriId, long intPraticaId, - boolean parziale, int start, int end, OrderByComparator orderByComparator) throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.lt("fineLavoriId", fineLavoriId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); - - return dynamicQuery(dynamicQuery, start, end, orderByComparator); - } - - public int countByIntPraticaId_Parziale_leFineLavoriId(long fineLavoriId, long intPraticaId, boolean parziale) - throws SystemException { - - DynamicQuery dynamicQuery = dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - dynamicQuery.add(RestrictionsFactoryUtil.lt("fineLavoriId", fineLavoriId)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); - - List results = dynamicQuery(dynamicQuery); - return results.isEmpty() ? 0 : results.size(); - } - - public List findFineLavoriCompleteNotProtocollo(int start, int end) throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotProtocollo(); - dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); - return fineLavoriPersistence.findWithDynamicQuery(dynamicQuery, start, end); - } - - public int countFineLavoriCompleteNotProtocollo() throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotProtocollo(); - return (int) fineLavoriPersistence.countWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery getDynamicQueryFineLavoriCompleteNotProtocollo() { - - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); - Disjunction or = RestrictionsFactoryUtil.disjunction(); - or.add(RestrictionsFactoryUtil.eq("protocollo", StringPool.BLANK)); - or.add(RestrictionsFactoryUtil.isNull("protocollo")); - dynamicQuery.add(or); - return dynamicQuery; - } - - public List findFineLavoriCompleteNotGestite(int start, int end) throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotGestite(); - dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); - return fineLavoriPersistence.findWithDynamicQuery(dynamicQuery, start, end); - } - - public int countFineLavoriCompleteNotGestite() throws SystemException { - - DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotGestite(); - return (int) fineLavoriPersistence.countWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery getDynamicQueryFineLavoriCompleteNotGestite() { - - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); - dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); - dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("protocollo")); - return dynamicQuery; - } - - public List findIntPraticaByFineLavori() throws PortalException, SystemException { - - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); - List ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery); - - return ids; - } - - public List findIntPraticaByFineLavori(String codiceFiscaleDelegatoCollaudo) throws PortalException, SystemException { - - DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); - dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscaleDelegatoCollaudo", codiceFiscaleDelegatoCollaudo)); - dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); - List ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery); - - return ids; - } - - - // public List findIntPraticaByFineLavoriParziale(boolean parziale, List - // intPraticaIds) - // throws PortalException, SystemException { - // - // DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); - // dynamicQuery.add(RestrictionsFactoryUtil.in("intPraticaId", intPraticaIds)); - // dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); - // dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); - // List ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery); - // - // return ids; - // } - // - - public FineLavori fetchByOldDettPraticaId(long oldDettPraticaId) throws SystemException { - - return fineLavoriPersistence.fetchByOldDettPraticaId(oldDettPraticaId); - } + @Override + public List findByIntPraticaId_Parziale_leFineLavoriId(long fineLavoriId, long intPraticaId, + boolean parziale, int start, int end, OrderByComparator orderByComparator) throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.lt("fineLavoriId", fineLavoriId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); + return dynamicQuery(dynamicQuery, start, end, orderByComparator); + } + + @Override + public int countByIntPraticaId_Parziale_leFineLavoriId(long fineLavoriId, long intPraticaId, boolean parziale) + throws SystemException { + + DynamicQuery dynamicQuery = dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + dynamicQuery.add(RestrictionsFactoryUtil.lt("fineLavoriId", fineLavoriId)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("parziale", parziale)); + List results = dynamicQuery(dynamicQuery); + return results.isEmpty() ? 0 : results.size(); + } + + @Override + public List findFineLavoriCompleteNotProtocollo(int start, int end) throws SystemException { + + DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotProtocollo(); + dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); + return fineLavoriPersistence.findWithDynamicQuery(dynamicQuery, start, end); + } + + @Override + public int countFineLavoriCompleteNotProtocollo() throws SystemException { + + DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotProtocollo(); + return (int) fineLavoriPersistence.countWithDynamicQuery(dynamicQuery); + } + + private DynamicQuery getDynamicQueryFineLavoriCompleteNotProtocollo() { + + DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); + Disjunction or = RestrictionsFactoryUtil.disjunction(); + or.add(RestrictionsFactoryUtil.eq("protocollo", StringPool.BLANK)); + or.add(RestrictionsFactoryUtil.isNull("protocollo")); + dynamicQuery.add(or); + return dynamicQuery; + } + + @Override + public List findFineLavoriCompleteNotGestite(int start, int end) throws SystemException { + + DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotGestite(); + dynamicQuery.addOrder(OrderFactoryUtil.asc("createDate")); + return fineLavoriPersistence.findWithDynamicQuery(dynamicQuery, start, end); + } + + @Override + public int countFineLavoriCompleteNotGestite() throws SystemException { + + DynamicQuery dynamicQuery = getDynamicQueryFineLavoriCompleteNotGestite(); + return (int) fineLavoriPersistence.countWithDynamicQuery(dynamicQuery); + } + + private DynamicQuery getDynamicQueryFineLavoriCompleteNotGestite() { + + DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.add(RestrictionsFactoryUtil.eq("gestita", false)); + dynamicQuery.add(RestrictionsFactoryUtil.ne("protocollo", StringPool.BLANK)); + dynamicQuery.add(RestrictionsFactoryUtil.isNotNull("protocollo")); + return dynamicQuery; + } + + @Override + public List findIntPraticaByFineLavori() throws PortalException, SystemException { + + DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); + List ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery); + return ids; + } + + @Override + public List findIntPraticaByFineLavori(String codiceFiscaleDelegatoCollaudo) throws PortalException, + SystemException { + + DynamicQuery dynamicQuery = fineLavoriLocalService.dynamicQuery(); + dynamicQuery.add(RestrictionsFactoryUtil.eq("completata", true)); + dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscaleDelegatoCollaudo", codiceFiscaleDelegatoCollaudo)); + dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("intPraticaId"))); + List ids = fineLavoriPersistence.findWithDynamicQuery(dynamicQuery); + return ids; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java index 3100c47c..0b0e3e1d 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/FineLavoriServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -27,13 +27,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the fine lavori remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.FineLavoriService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.FineLavoriService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -41,133 +40,121 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.FineLavoriServiceUtil */ public class FineLavoriServiceImpl extends FineLavoriServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.FineLavoriServiceUtil} to access the fine lavori remote - * service. - */ + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.FineLavoriServiceUtil} to access the fine lavori remote service. + */ - public FineLavori getFineLavori(long fineLavoriId) throws PortalException, SystemException { + @Override + public FineLavori getFineLavori(long fineLavoriId) throws PortalException, SystemException { - return fineLavoriLocalService.getFineLavori(fineLavoriId); - } + return fineLavoriLocalService.getFineLavori(fineLavoriId); + } - public FineLavori addFineLavori(long intPraticaId, ServiceContext serviceContext) throws PortalException, - SystemException { + @Override + public FineLavori addFineLavori(long intPraticaId, ServiceContext serviceContext) throws PortalException, + SystemException { - // User user = userLocalService.getUser(serviceContext.getUserId()); - // List owners = soggettoLocalService.findByIntPratica_CodiceFiscale(intPraticaId, - // user.getScreenName()); - // for (Soggetto owner : owners) { - // if (owner.getTipologiaSoggetto().equals(TipoSoggettoUtil.DIRETTORE_LAVORI)) { - // return fineLavoriLocalService.addFineLavori(intPraticaId, serviceContext); - // } - // } - // throw new SystemException("unbale to add Fine Lavori. Subject is not a direttore lavori"); - return fineLavoriLocalService.addFineLavori(intPraticaId, serviceContext); - } + return fineLavoriLocalService.addFineLavori(intPraticaId, serviceContext); + } - public FineLavori deleteFineLavori(FineLavori fineLavori) throws PortalException, SystemException { + @Override + public FineLavori deleteFineLavori(FineLavori fineLavori) throws PortalException, SystemException { - return fineLavoriLocalService.deleteFineLavori(fineLavori); - } + return fineLavoriLocalService.deleteFineLavori(fineLavori); + } - public FineLavori deleteFineLavori(long fineLavoriId) throws PortalException, SystemException { + @Override + public FineLavori deleteFineLavori(long fineLavoriId) throws PortalException, SystemException { - return fineLavoriLocalService.deleteFineLavori(fineLavoriId); - } + return fineLavoriLocalService.deleteFineLavori(fineLavoriId); + } - public FineLavori updateFineLavori(FineLavori fineLavori) throws SystemException { + @Override + public FineLavori updateFineLavori(FineLavori fineLavori) throws SystemException { - return fineLavoriLocalService.updateFineLavori(fineLavori); - } + return fineLavoriLocalService.updateFineLavori(fineLavori); + } - public FineLavori updateFineLavori(long userId, long fineLavoriId, long intPraticaId, boolean parziale, - boolean completata, Date dataFineLavori, String codiceFiscaleDelegato, boolean normEsenteBollo, - boolean normEsenteCollaudo, String comunicazioneDirettoreLavori) throws PortalException, SystemException { + @Override + public FineLavori updateFineLavori(long userId, long fineLavoriId, long intPraticaId, boolean parziale, + boolean completata, Date dataFineLavori, String codiceFiscaleDelegato, boolean normEsenteBollo, + boolean normEsenteCollaudo, String comunicazioneDirettoreLavori) throws PortalException, SystemException { - FineLavori fineLavori = getFineLavori(fineLavoriId); + FineLavori fineLavori = getFineLavori(fineLavoriId); + if (fineLavori.getUserId() == userId) { + fineLavori = fineLavoriLocalService.updateFineLavori(userId, fineLavoriId, intPraticaId, parziale, + completata, dataFineLavori, codiceFiscaleDelegato, normEsenteBollo, normEsenteCollaudo, + comunicazioneDirettoreLavori); + } + return fineLavori; + } - if (fineLavori.getUserId() == userId) { - fineLavori = - fineLavoriLocalService.updateFineLavori(userId, fineLavoriId, intPraticaId, parziale, completata, - dataFineLavori, codiceFiscaleDelegato, normEsenteBollo, normEsenteCollaudo, comunicazioneDirettoreLavori); - } + @Override + public FineLavori getLastEditable(long intPraticaId) throws SystemException { - return fineLavori; - } + return fineLavoriLocalService.getLastEditable(intPraticaId); + } - public FineLavori getLastEditable(long intPraticaId) throws SystemException { + @Override + public FineLavori getLastCompleted(long intPraticaId) throws SystemException { - return fineLavoriLocalService.getLastEditable(intPraticaId); - } + return fineLavoriLocalService.getLastCompleted(intPraticaId); + } - public FineLavori getLastCompleted(long intPraticaId) throws SystemException { + @Override + public List findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end, + OrderByComparator orderByComparator) throws SystemException { - return fineLavoriLocalService.getLastCompleted(intPraticaId); - } + return fineLavoriLocalService + .findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator); + } - public List findByIntPraticaId_Parziale(long intPraticaId, boolean parziale, int start, int end, - OrderByComparator orderByComparator) throws SystemException { + @Override + public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException { - return fineLavoriLocalService.findByIntPraticaId_Parziale(intPraticaId, parziale, start, end, orderByComparator); - } + return fineLavoriLocalService.countByIntPraticaId_Parziale(intPraticaId, parziale); + } - public int countByIntPraticaId_Parziale(long intPraticaId, boolean parziale) throws SystemException { + @Override + public FineLavori pagaInvia(long fineLavoriId, String codiceFiscaleCommittente, String currentURL, + ServiceContext serviceContext) throws SystemException, PortalException { - return fineLavoriLocalService.countByIntPraticaId_Parziale(intPraticaId, parziale); - } + return fineLavoriLocalService.pagaInvia(fineLavoriId, codiceFiscaleCommittente, currentURL, serviceContext); + } - public FineLavori pagaInvia(long fineLavoriId, String codiceFiscaleCommittente, String currentURL, - ServiceContext serviceContext) throws SystemException, PortalException { + @Override + public FineLavori updateEsito(long fineLavoriId, int stato) throws SystemException, PortalException { - return fineLavoriLocalService.pagaInvia(fineLavoriId, codiceFiscaleCommittente, currentURL, serviceContext); - } + return fineLavoriLocalService.updateEsito(fineLavoriId, stato); + } - public FineLavori updateEsito(long fineLavoriId, int stato) throws SystemException, PortalException { + @Override + public List findByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato, + int start, int end, OrderByComparator orderByComparator) throws SystemException { - // FineLavori fineLavori = fineLavoriLocalService.getFineLavori(fineLavoriId); - // DettPraticaPermission.check(getPermissionChecker(), dettPratica.getGroupId(), - // ActionKeys.ADD_ENTRY); - return fineLavoriLocalService.updateEsito(fineLavoriId, stato); - } + return fineLavoriLocalService.findByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato, start, end, + orderByComparator); + } - public List findByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato, int start, - int end, OrderByComparator orderByComparator) throws SystemException { + @Override + public int countByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato) + throws SystemException { - return fineLavoriLocalService.findByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato, start, end, - orderByComparator); - } + return fineLavoriLocalService.countByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato); + } - public int countByIntPraticaId_CodiceFiscale(long intPraticaId, String codiceFiscaleDelegato) throws SystemException { + @Override + public List findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start, + int end, OrderByComparator orderByComparator) throws SystemException { - return fineLavoriLocalService.countByIntPraticaId_CodiceFiscale(intPraticaId, codiceFiscaleDelegato); - } + return fineLavoriLocalService.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end, + orderByComparator); + } - public List findByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata, int start, - int end, OrderByComparator orderByComparator) throws SystemException { + @Override + public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException { - return fineLavoriLocalService.findByCodiceFiscale_Completata(codiceFiscaleDelegato, completata, start, end, - orderByComparator); - } - - public int countByCodiceFiscale_Completata(String codiceFiscaleDelegato, boolean completata) throws SystemException { - - return fineLavoriLocalService.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata); - } - - // public void sostituisciPagamento(long pagamentoId, long fineLavoriId, String - // codiceFiscaleCommittente, String mezzo, - // String url, ServiceContext serviceContext) throws PortalException, SystemException { - // - // FineLavori fineLavori = fineLavoriLocalService.getFineLavori(fineLavoriId); - // if (getUserId() == fineLavori.getUserId()) { - // fineLavoriLocalService.sostituisciPagamento(pagamentoId, fineLavoriId, - // codiceFiscaleCommittente, mezzo, url, - // serviceContext); - // } else { - // throw new SystemException("pagamento aggiornabile solo da titolare del dettPratica"); - // } - // - // } + return fineLavoriLocalService.countByCodiceFiscale_Completata(codiceFiscaleDelegato, completata); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloLocalServiceImpl.java index ea0e97a4..1e1b9364 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -27,15 +27,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the info fascicolo local service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.InfoFascicoloLocalService} - * interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.InfoFascicoloLocalService} interface. * *

- * This is a local service. Methods of this service will not have security - * checks based on the propagated JAAS credentials because this service can only - * be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -45,56 +42,56 @@ import com.liferay.portal.service.ServiceContext; public class InfoFascicoloLocalServiceImpl extends InfoFascicoloLocalServiceBaseImpl { /* * NOTE FOR DEVELOPERS: - * + * * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.InfoFascicoloLocalServiceUtil} to - * access the info fascicolo local service. + * it.tref.liferay.portos.bo.service.InfoFascicoloLocalServiceUtil} to access the info fascicolo local service. */ - public InfoFascicolo addInfoFascicolo(long intPraticaId, String numeroProgetto, - ServiceContext serviceContext) throws SystemException, PortalException { + @Override + public InfoFascicolo addInfoFascicolo(long intPraticaId, String numeroProgetto, ServiceContext serviceContext) + throws SystemException, PortalException { + return addInfoFascicolo(intPraticaId, numeroProgetto, false, serviceContext); } + @Override public InfoFascicolo addInfoFascicolo(long intPraticaId, String numeroProgetto, boolean alreadyImported, ServiceContext serviceContext) throws SystemException, PortalException { User user = userLocalService.getUser(serviceContext.getUserId()); Date now = new Date(); - InfoFascicolo infoFascicolo = infoFascicoloLocalService.createInfoFascicolo(counterLocalService .increment(InfoFascicolo.class.getName())); - infoFascicolo.setCompanyId(serviceContext.getCompanyId()); infoFascicolo.setGroupId(serviceContext.getScopeGroupId()); infoFascicolo.setUserId(serviceContext.getUserId()); infoFascicolo.setUserName(user.getScreenName()); infoFascicolo.setCreateDate(serviceContext.getCreateDate(now)); infoFascicolo.setModifiedDate(serviceContext.getModifiedDate(now)); - infoFascicolo.setIntPraticaId(intPraticaId); infoFascicolo.setNumeroProgetto(numeroProgetto); infoFascicolo.setAlreadyImported(alreadyImported); - return infoFascicolo; - } - public InfoFascicolo findByIntPratica(long intPraticaId) throws SystemException, - NoSuchInfoFascicoloException { + @Override + public InfoFascicolo findByIntPratica(long intPraticaId) throws SystemException, NoSuchInfoFascicoloException { + return infoFascicoloPersistence.findByIntPratica(intPraticaId); } - public InfoFascicolo fetchByIntPratica(long intPraticaId) throws SystemException, - NoSuchInfoFascicoloException { + @Override + public InfoFascicolo fetchByIntPratica(long intPraticaId) throws SystemException, NoSuchInfoFascicoloException { + return infoFascicoloPersistence.fetchByIntPratica(intPraticaId); } - public InfoFascicolo updateAlreadyImportedField(long infoFascicoloId) - throws NoSuchInfoFascicoloException, SystemException { + @Override + public InfoFascicolo updateAlreadyImportedField(long infoFascicoloId) throws NoSuchInfoFascicoloException, + SystemException { + InfoFascicolo infoFascicolo = infoFascicoloPersistence.findByPrimaryKey(infoFascicoloId); infoFascicolo.setAlreadyImported(true); return infoFascicoloLocalService.updateInfoFascicolo(infoFascicolo); } - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloServiceImpl.java index 6fb7213d..f558cb9f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/InfoFascicoloServiceImpl.java @@ -1,14 +1,12 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. */ @@ -20,10 +18,12 @@ import it.tref.liferay.portos.bo.service.base.InfoFascicoloServiceBaseImpl; * The implementation of the info fascicolo remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.service.InfoFascicoloService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.InfoFascicoloService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -34,6 +34,7 @@ public class InfoFascicoloServiceImpl extends InfoFascicoloServiceBaseImpl { /* * NOTE FOR DEVELOPERS: * - * Never reference this interface directly. Always use {@link it.tref.liferay.portos.bo.service.InfoFascicoloServiceUtil} to access the info fascicolo remote service. + * Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.InfoFascicoloServiceUtil} to access the info fascicolo remote service. */ } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java index c381a2d3..19f68fb3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -27,9 +27,9 @@ import it.tref.liferay.portos.bo.util.PraticaUtil; import java.io.IOException; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; @@ -54,14 +54,12 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; * The implementation of the pagamento local service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.PagamentoLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.PagamentoLocalService} interface. * *

- * This is a local service. Methods of this service will not have security - * checks based on the propagated JAAS credentials because this service can only - * be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -69,113 +67,107 @@ import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil; * @see it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil */ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { - private static final Log _log = LogFactoryUtil.getLog(PagamentoLocalServiceImpl.class); - + private static final Log _log = LogFactoryUtil.getLog(PagamentoLocalServiceImpl.class); + + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil} to access the pagamento local service. + */ + @SuppressWarnings("serial") - private static Map pagamenti = new HashMap() {{ - put("pagSoggettiAdAutorizzazione", 30.00); - put("pagInterventiRestauroManufatti", 35.00); - put("pagAltriCasiCulturali", 15.00); - put("pagLottizzazioni", 100.00); - put("pagGrandiStrutture", 100.00); - put("pagCondotte", 100.00); - put("pagPalificazioni", 100.00); - put("pagImpiantiEolici", 100.00); - put("pagNuoveRealizzazioni", 35.00); - put("pagImmobiliPreesistenti", 30.00); - put("pagManifestiPubblicitari", 25.00); - put("pagPareriDiMassima", 20.00); - put("pagAltriCasiPaesaggistici", 15.00); - put("pagVariantiPareriResi", 0.00); - put("pagRilascioAttestazioni", 5.00); - put("pagConsultazioniArchivio", 10.00); - put("pagEsenzioneBollo", 0.00); - }}; - - public Map getPagamenti(){ + private static Map pagamenti = new HashMap() { + { + put("pagSoggettiAdAutorizzazione", 30.00); + put("pagInterventiRestauroManufatti", 35.00); + put("pagAltriCasiCulturali", 15.00); + put("pagLottizzazioni", 100.00); + put("pagGrandiStrutture", 100.00); + put("pagCondotte", 100.00); + put("pagPalificazioni", 100.00); + put("pagImpiantiEolici", 100.00); + put("pagNuoveRealizzazioni", 35.00); + put("pagImmobiliPreesistenti", 30.00); + put("pagManifestiPubblicitari", 25.00); + put("pagPareriDiMassima", 20.00); + put("pagAltriCasiPaesaggistici", 15.00); + put("pagVariantiPareriResi", 0.00); + put("pagRilascioAttestazioni", 5.00); + put("pagConsultazioniArchivio", 10.00); + put("pagEsenzioneBollo", 0.00); + } + }; + + @Override + public Map getPagamenti() { return PagamentoLocalServiceImpl.pagamenti; } - - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use - * {@link it.tref.liferay.portos.bo.service.PagamentoLocalServiceUtil} to - * access the pagamento local service. - */ + + @Override public long createPagamentoId() throws SystemException { return counterLocalService.increment(Pagamento.class.getName()); } - public Pagamento addPagamento(String codice, String causale, String mezzo, - String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, - long classPk, String className, long oldPagamentoId, ServiceContext serviceContext) - throws PortalException, SystemException { + @Override + public Pagamento addPagamento(String codice, String causale, String mezzo, String codiceFiscaleCommittente, + String tipoPagamento, String importo, String utilizzata, long classPk, String className, + long oldPagamentoId, ServiceContext serviceContext) throws PortalException, SystemException { - return addPagamentoAndUpdate(null, codice, causale, mezzo, codiceFiscaleCommittente, tipoPagamento, - importo, utilizzata, classPk, className, false, oldPagamentoId, StringPool.BLANK, null, - serviceContext); + return addPagamentoAndUpdate(null, codice, causale, mezzo, codiceFiscaleCommittente, tipoPagamento, importo, + utilizzata, classPk, className, false, oldPagamentoId, StringPool.BLANK, null, serviceContext); } + @Override public Pagamento addPagamentoAndUpdate(String codice, String causale, String mezzo, - String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, - long classPk, String className, long oldPagamentoId, ServiceContext serviceContext) - throws PortalException, SystemException { + String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, long classPk, + String className, long oldPagamentoId, ServiceContext serviceContext) throws PortalException, + SystemException { - return addPagamentoAndUpdate(null, codice, causale, mezzo, codiceFiscaleCommittente, tipoPagamento, - importo, utilizzata, classPk, className, true, oldPagamentoId, StringPool.BLANK, null, - serviceContext); + return addPagamentoAndUpdate(null, codice, causale, mezzo, codiceFiscaleCommittente, tipoPagamento, importo, + utilizzata, classPk, className, true, oldPagamentoId, StringPool.BLANK, null, serviceContext); } + @Override public Pagamento addPagamentoAndUpdate(long pagamentoId, String codice, String causale, String mezzo, - String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, - long classPk, String className, long oldPagamentoId, ServiceContext serviceContext) - throws PortalException, SystemException { + String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, long classPk, + String className, long oldPagamentoId, ServiceContext serviceContext) throws PortalException, + SystemException { - return addPagamentoAndUpdate(pagamentoId, codice, causale, mezzo, codiceFiscaleCommittente, - tipoPagamento, importo, utilizzata, classPk, className, true, oldPagamentoId, - StringPool.BLANK, null, serviceContext); + return addPagamentoAndUpdate(pagamentoId, codice, causale, mezzo, codiceFiscaleCommittente, tipoPagamento, + importo, utilizzata, classPk, className, true, oldPagamentoId, StringPool.BLANK, null, serviceContext); } + @Override public Pagamento addPagamentoAndUpdate(long pagamentoId, String codice, String causale, String mezzo, - String codiceFiscaleCommittente, String tipoImporto, String importo, String utilizzata, - long classPk, String className, long oldPagamentoId, String url, - List iuvs, ServiceContext serviceContext) throws PortalException, - SystemException { + String codiceFiscaleCommittente, String tipoImporto, String importo, String utilizzata, long classPk, + String className, long oldPagamentoId, String url, List iuvs, + ServiceContext serviceContext) throws PortalException, SystemException { - return addPagamentoAndUpdate(pagamentoId, codice, causale, mezzo, codiceFiscaleCommittente, - tipoImporto, importo, utilizzata, classPk, className, true, oldPagamentoId, url, iuvs, - serviceContext); + return addPagamentoAndUpdate(pagamentoId, codice, causale, mezzo, codiceFiscaleCommittente, tipoImporto, + importo, utilizzata, classPk, className, true, oldPagamentoId, url, iuvs, serviceContext); } private Pagamento addPagamentoAndUpdate(Long pagamentoId, String codice, String causale, String mezzo, - String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, - long classPk, String className, boolean updateReference, long oldPagamentoId, String url, - List iuvs, ServiceContext serviceContext) throws PortalException, - SystemException { + String codiceFiscaleCommittente, String tipoPagamento, String importo, String utilizzata, long classPk, + String className, boolean updateReference, long oldPagamentoId, String url, + List iuvs, ServiceContext serviceContext) throws PortalException, SystemException { Date now = new Date(); - if (Validator.isNull(pagamentoId)) { pagamentoId = createPagamentoId(); } - Pagamento pagamento = createPagamento(pagamentoId); - pagamento.setCompanyId(serviceContext.getCompanyId()); - pagamento.setUserId(serviceContext.getUserId()); - if (serviceContext.getUserId() > 0) { User user = userPersistence.findByPrimaryKey(serviceContext.getUserId()); pagamento.setUserName(user.getFullName()); } - pagamento.setGroupId(serviceContext.getScopeGroupId()); pagamento.setCreateDate(serviceContext.getCreateDate(now)); pagamento.setModifiedDate(serviceContext.getModifiedDate(now)); pagamento.setClassPk(classPk); pagamento.setClassName(className); - pagamento.setTipoPagamento(tipoPagamento); pagamento.setUrl(url); pagamento.setCodice(codice); @@ -195,8 +187,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { codiceBolli = StringUtil.replaceLast(codiceBolli, StringPool.PIPE, StringPool.BLANK); pagamento.setCodice(codiceBolli); } - - long intPraticaId = 0l; + long intPraticaId = 0L; if (DettPratica.class.getName().equals(className)) { DettPratica dettPratica = dettPraticaPersistence.findByPrimaryKey(classPk); intPraticaId = dettPratica.getIntPraticaId(); @@ -216,7 +207,6 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { default: break; } - dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica); } } else if (FineLavori.class.getName().equals(className)) { @@ -234,7 +224,6 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { default: break; } - fineLavori = fineLavoriLocalService.updateFineLavori(fineLavori); } } else if (Collaudo.class.getName().equals(className)) { @@ -252,29 +241,25 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { default: break; } - collaudo = collaudoLocalService.updateCollaudo(collaudo); } } else { - throw new PortalException("unable to update pagamento for entity type " + className + " with id " - + classPk); + throw new PortalException("unable to update pagamento for entity type " + className + " with id " + classPk); } - pagamento.setIntPraticaId(intPraticaId); - pagamento = addPagamento(pagamento); - return pagamento; } - public Pagamento updatePagamento(long pagamentoId, String importo) throws PortalException, - SystemException { + @Override + public Pagamento updatePagamento(long pagamentoId, String importo) throws PortalException, SystemException { Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); pagamento.setImporto(importo); return updatePagamento(pagamento); } + @Override public Pagamento updatePagamento(long pagamentoId, String codiceFiscaleCommittente, String importo) throws PortalException, SystemException { @@ -284,6 +269,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return updatePagamento(pagamento); } + @Override public Pagamento updatePagamentoUtilizzata(long pagamentoId, String utilizzata) throws PortalException, SystemException { @@ -292,47 +278,52 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return updatePagamento(pagamento); } + @Override public Pagamento annullaPagamento(long pagamentoId) throws PortalException, SystemException { Pagamento pagamento = pagamentoPersistence.findByPrimaryKey(pagamentoId); pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_ANNULLATO); - return updatePagamento(pagamento); } - public List findByCommittente_Mezzo(String codiceFiscaleCommittente, String mezzo, int start, - int end) throws SystemException { + @Override + public List findByCommittente_Mezzo(String codiceFiscaleCommittente, String mezzo, int start, int end) + throws SystemException { - DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, - mezzo, null); + DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, + null); return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } + @Override public int countByCommittente_Mezzo(String codiceFiscaleCommittente, String mezzo) throws SystemException { - DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, - mezzo, null); + DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, + null); return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); } + @Override public List findByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, String utilizzata, int start, int end) throws SystemException { - DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, - mezzo, utilizzata); + DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, + utilizzata); return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } - public int countByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, - String utilizzata) throws SystemException { + @Override + public int countByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, String utilizzata) + throws SystemException { - DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, - mezzo, utilizzata); + DynamicQuery dynamicQuery = dynamicQueryFindByCommittente_Mezzo_Utilizzata(codiceFiscaleCommittente, mezzo, + utilizzata); return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); } + @Override public List findByMezzo_Utilizzata(String mezzo, String utilizzata, int start, int end) throws SystemException { @@ -340,38 +331,44 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } + @Override public Pagamento findByOldPagamentoId(long oldPagamentoId) throws SystemException { return pagamentoPersistence.fetchByOldPagamentoId(oldPagamentoId); } + @Override public int countByMezzo_Utilizzata(String mezzo, String utilizzata) throws SystemException { return pagamentoPersistence.countByMezzo_Utilizzata(mezzo, utilizzata); } - public List findByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date, - int start, int end) throws SystemException { + @Override + public List findByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date, int start, + int end) throws SystemException { return pagamentoPersistence.findByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date, start, end, OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } - public int countByMezzo_Utilizzata_EmailPending_CreateDate(String mezzo, String utilizzata, - boolean emailPending, Date date) throws SystemException { + @Override + public int countByMezzo_Utilizzata_EmailPending_CreateDate(String mezzo, String utilizzata, boolean emailPending, + Date date) throws SystemException { - return pagamentoPersistence.countByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, utilizzata, - emailPending, date); + return pagamentoPersistence.countByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, utilizzata, emailPending, + date); } + @Override public List findByMezzo_Utilizzata_EmailPending_CreateDate(String mezzo, String utilizzata, boolean emailPending, Date date, int start, int end) throws SystemException { - return pagamentoPersistence.findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, utilizzata, - emailPending, date, start, end, + return pagamentoPersistence.findByMezzo_Utilizzata_EmailPending_CreateDate(mezzo, utilizzata, emailPending, + date, start, end, OrderByComparatorFactoryUtil.create(PagamentoModelImpl.TABLE_NAME, "createDate", true)); } + @Override public List findInPending(Date date, int start, int end, OrderByComparator comparator) throws SystemException { @@ -379,6 +376,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return pagamentoPersistence.findWithDynamicQuery(dynamicQuery, start, end, comparator); } + @Override public int countInPending(Date date) throws SystemException { DynamicQuery dynamicQuery = createPendingQuery(date); @@ -386,6 +384,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } private DynamicQuery createPendingQuery(Date date) { + DynamicQuery dynamicQuery = pagamentoLocalService.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.in("utilizzata", new String[] { PagamentoConstants.UTILIZZATA_IN_CORSO, PagamentoConstants.UTILIZZATA_ANNULLATO })); @@ -393,8 +392,8 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return dynamicQuery; } - public int countByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date) - throws SystemException { + @Override + public int countByMezzo_Utilizzata_CreateDate(String mezzo, String utilizzata, Date date) throws SystemException { return pagamentoPersistence.countByMezzo_Utilizzata_CreateDate(mezzo, utilizzata, date); } @@ -425,8 +424,9 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return pagamento; } - public Pagamento updateEmailPendingPagamento(long pagamentoId, boolean emailPending) - throws PortalException, SystemException { + @Override + public Pagamento updateEmailPendingPagamento(long pagamentoId, boolean emailPending) throws PortalException, + SystemException { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); pagamento.setModifiedDate(new Date()); @@ -436,8 +436,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { private void deleteDettPraticaPagamento(Pagamento pagamento) throws SystemException { - List dettPraticas = dettPraticaLocalService - .findByPagamentoId(pagamento.getPagamentoId()); + List dettPraticas = dettPraticaLocalService.findByPagamentoId(pagamento.getPagamentoId()); for (DettPratica dettPratica : dettPraticas) { if (PagamentoConstants.PAGAMENTO_ONERI.equals(pagamento.getTipoPagamento())) { dettPratica.setPagamentoIdOneri(0L); @@ -448,8 +447,8 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } } - private DynamicQuery dynamicQueryFindByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, - String mezzo, String utilizzata) { + private DynamicQuery dynamicQueryFindByCommittente_Mezzo_Utilizzata(String codiceFiscaleCommittente, String mezzo, + String utilizzata) { DynamicQuery dynamicQuery = pagamentoLocalService.dynamicQuery(); dynamicQuery.add(RestrictionsFactoryUtil.ilike("codiceFiscaleCommittente", codiceFiscaleCommittente)); @@ -460,30 +459,36 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { return dynamicQuery; } + @Override public int countByClassPk(long classPk) throws SystemException { return pagamentoPersistence.countByClassPk(classPk); } + @Override public List findByClassPk(long classPk) throws SystemException { return pagamentoPersistence.findByClassPk(classPk); } + @Override public List findByIntPratica(long intPraticaId) throws SystemException { return pagamentoPersistence.findByIntPratica(intPraticaId); } + @Override public int countByIntPratica(long intPraticaId) throws SystemException { return pagamentoPersistence.countByIntPratica(intPraticaId); } + @Override public List findByIntPratica_Visible(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = createPagamentiVisibleByIntPratica(intPraticaId); return pagamentoPersistence.findWithDynamicQuery(dynamicQuery); } + @Override public int countByIntPratica_Visible(long intPraticaId) throws SystemException { DynamicQuery dynamicQuery = createPagamentiVisibleByIntPratica(intPraticaId); return (int) pagamentoPersistence.countWithDynamicQuery(dynamicQuery); @@ -492,58 +497,52 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { private DynamicQuery createPagamentiVisibleByIntPratica(long intPraticaId) { DynamicQuery dynamicQuery = pagamentoLocalService.dynamicQuery(); - dynamicQuery.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); dynamicQuery.add(RestrictionsFactoryUtil.ne("utilizzata", PagamentoConstants.UTILIZZATA_IN_CORSO)); - return dynamicQuery; } - public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, - String url, ServiceContext serviceContext) throws PortalException, SystemException { + @Override + public void sostituisciPagamento(long pagamentoId, String codiceFiscaleCommittente, String mezzo, String url, + ServiceContext serviceContext) throws PortalException, SystemException { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); long intPraticaId = pagamento.getIntPraticaId(); String currentUtilizzata = pagamento.getUtilizzata(); String currentMezzo = pagamento.getMezzo(); String tipoPagamento = pagamento.getTipoPagamento(); - boolean irisEnable = PagamentiCommonUtil.irisIsEnable(pagamento.getCompanyId()); - if (mezzo.equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE)) { if (irisEnable) { throw new PortalException("Creazione pagamento manuale con iris enable non possibile"); } else if (currentUtilizzata.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) || currentUtilizzata.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA) || currentUtilizzata.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_ANNULLATO)) { - if (DettPratica.class.getName().equals(pagamento.getClassName())) { DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk()); if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { - dettPratica.setPagamentoIdOneri(0l); + dettPratica.setPagamentoIdOneri(0L); } else { - dettPratica.setPagamentoIdBolli(0l); + dettPratica.setPagamentoIdBolli(0L); } dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica); } else if (FineLavori.class.getName().equals(pagamento.getClassName())) { FineLavori fineLavori = fineLavoriLocalService.getFineLavori(pagamento.getClassPk()); - fineLavori.setPagamentoId(0l); + fineLavori.setPagamentoId(0L); fineLavori = fineLavoriLocalService.updateFineLavori(fineLavori); } else if (Collaudo.class.getName().equals(pagamento.getClassName())) { Collaudo collaudo = collaudoLocalService.getCollaudo(pagamento.getClassPk()); - collaudo.setPagamentoId(0l); + collaudo.setPagamentoId(0L); collaudo = collaudoLocalService.updateCollaudo(collaudo); } else { throw new RuntimeException("unable to replace pagamento for entity type " + pagamento.getClassName() + " with id " + pagamento.getClassPk()); } - pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_SOSTITUITA); pagamento.setUtilizzataSostituita(currentUtilizzata); pagamentoLocalService.updatePagamento(pagamento); - - PagamentiUtil.nuovoPagamento(url, pagamento.getClassPk(), pagamento.getClassName(), - tipoPagamento, pagamento.getImporto(), codiceFiscaleCommittente, serviceContext); + PagamentiUtil.nuovoPagamento(url, pagamento.getClassPk(), pagamento.getClassName(), tipoPagamento, + pagamento.getImporto(), codiceFiscaleCommittente, serviceContext); } else { throw new PortalException("Creazione pagamento manuale con stato " + currentUtilizzata + " non possibile"); @@ -554,92 +553,76 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { .equalsIgnoreCase(PagamentoConstants.UTILIZZATA_NON_PAGABILE) || currentUtilizzata.equalsIgnoreCase(PagamentoConstants.UTILIZZATA_RIFIUTATA) || currentUtilizzata .equalsIgnoreCase(PagamentoConstants.UTILIZZATA_ANNULLATO)))) { - if (DettPratica.class.getName().equals(pagamento.getClassName())) { DettPratica dettPratica = dettPraticaLocalService.getDettPratica(pagamento.getClassPk()); if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { - dettPratica.setPagamentoIdOneri(0l); + dettPratica.setPagamentoIdOneri(0L); } else { - dettPratica.setPagamentoIdBolli(0l); + dettPratica.setPagamentoIdBolli(0L); } dettPratica = dettPraticaLocalService.updateDettPratica(dettPratica); } else if (FineLavori.class.getName().equals(pagamento.getClassName())) { FineLavori fineLavori = fineLavoriLocalService.getFineLavori(pagamento.getClassPk()); - fineLavori.setPagamentoId(0l); + fineLavori.setPagamentoId(0L); fineLavori = fineLavoriLocalService.updateFineLavori(fineLavori); } else if (Collaudo.class.getName().equals(pagamento.getClassName())) { Collaudo collaudo = collaudoLocalService.getCollaudo(pagamento.getClassPk()); - collaudo.setPagamentoId(0l); + collaudo.setPagamentoId(0L); collaudo = collaudoLocalService.updateCollaudo(collaudo); } else { throw new RuntimeException("unable to replace pagamento for entity type " + pagamento.getClassName() + " with id " + pagamento.getClassPk()); } - pagamento.setUtilizzata(PagamentoConstants.UTILIZZATA_SOSTITUITA); pagamento.setUtilizzataSostituita(currentUtilizzata); pagamentoLocalService.updatePagamento(pagamento); - PagamentiUtil.nuovoPagamento(url, pagamento.getClassPk(), pagamento.getClassName(), - pagamento.getTipoPagamento(), pagamento.getImporto(), codiceFiscaleCommittente, - serviceContext); + pagamento.getTipoPagamento(), pagamento.getImporto(), codiceFiscaleCommittente, serviceContext); } else { throw new PortalException("Pagamento IRIS non sostituibile per intPratica " + intPraticaId); } - } else { throw new PortalException("Mezzo non presente"); } - } - public void updatePagamentoManuale(long pagamentoId, String numeroBollettino, byte[] content, String sourceFileName, - ServiceContext serviceContext) throws IOException, PortalException, SystemException { + @Override + public void updatePagamentoManuale(long pagamentoId, String numeroBollettino, byte[] content, + String sourceFileName, ServiceContext serviceContext) throws IOException, PortalException, SystemException { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); - // if (dettPratica.getPagamentoId() != pagamentoId) { - // throw new PortalException("Pagamento non abbinato al dettpratica"); - // } if (pagamento.getMezzo().equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE) && pagamento.getUtilizzata().equalsIgnoreCase(PagamentoConstants.UTILIZZATA_IN_CORSO)) { - long fileEntryId = 0l; - - long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong( - serviceContext.getCompanyId(), ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); - + long fileEntryId = 0L; + long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), + ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); Folder defaultFolder = dlAppLocalService.getFolder(defaultFolderId); - String folderName = PraticaUtil.getFolderName(pagamento.getClassPk()); - Folder folder = null; try { - folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), - defaultFolder.getFolderId(), folderName); + folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), + folderName); } catch (NoSuchFolderException e) { // cartella non presente -> creo cartella - folder = dlAppLocalService.addFolder(serviceContext.getUserId(), - defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), folderName, - StringPool.BLANK, serviceContext); + folder = dlAppLocalService.addFolder(serviceContext.getUserId(), defaultFolder.getRepositoryId(), + defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); } Date now = new Date(); - String title = now.getTime() + StringPool.UNDERLINE + "pagamento_manuale" + StringPool.UNDERLINE - + pagamento.getPagamentoId() + StringPool.UNDERLINE + sourceFileName; - String description = ""; + String title = now.getTime() + "_pagamento_manuale_" + pagamento.getPagamentoId() + StringPool.UNDERLINE + + sourceFileName; + String description = StringPool.BLANK; String mimeType = MimeTypesUtil.getContentType(sourceFileName); - String changeLog = StringPool.BLANK; - FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), - folder.getRepositoryId(), folder.getFolderId(), now.getTime() + "_" + sourceFileName, - mimeType, title, description, changeLog, content, serviceContext); + FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), folder.getRepositoryId(), + folder.getFolderId(), now.getTime() + StringPool.UNDERLINE + sourceFileName, mimeType, title, + description, changeLog, content, serviceContext); fileEntryId = fileEntry.getFileEntryId(); - pagamento.setNumeroBollettino(numeroBollettino); pagamento.setFileEntryId(fileEntryId); pagamento = pagamentoLocalService.updatePagamento(pagamento); - if (DettPratica.class.getName().equals(pagamento.getClassName())) { - dettPraticaLocalService.updateEsitoPagamento(pagamentoId, pagamento.getClassPk(), - fileEntryId, PagamentoConstants.UTILIZZATA_PAGATA); + dettPraticaLocalService.updateEsitoPagamento(pagamentoId, pagamento.getClassPk(), fileEntryId, + PagamentoConstants.UTILIZZATA_PAGATA); } else if (FineLavori.class.getName().equals(pagamento.getClassName())) { fineLavoriLocalService.updateEsitoPagamento(pagamentoId, pagamento.getClassPk(), fileEntryId, PagamentoConstants.UTILIZZATA_PAGATA); @@ -650,63 +633,58 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { throw new RuntimeException("unable to update pagamento manuale for entity type " + pagamento.getClassName() + " with id " + pagamento.getClassPk()); } - } else { throw new SystemException("pagamento manuale non aggiornabile"); } } + @Override public void updatePagamentoManualeFromImport(long pagamentoId, byte[] content, String sourceFileName, ServiceContext serviceContext) throws PortalException, SystemException { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); - if (pagamento.getMezzo().equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE)) { - long fileEntryId = 0l; - - long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong( - serviceContext.getCompanyId(), ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); - + long fileEntryId = 0L; + long defaultFolderId = configurazioneLocalService.findByC_ChiaveLong(serviceContext.getCompanyId(), + ConfigurazioneConstants.ATTACHMENT_FOLDER_ID); Folder defaultFolder = dlAppLocalService.getFolder(defaultFolderId); - String folderName = PraticaUtil.getFolderName(pagamento.getClassPk()); - Folder folder = null; try { - folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), - defaultFolder.getFolderId(), folderName); + folder = dlAppLocalService.getFolder(defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), + folderName); } catch (NoSuchFolderException e) { // cartella non presente -> creo cartella - folder = dlAppLocalService.addFolder(serviceContext.getUserId(), - defaultFolder.getRepositoryId(), defaultFolder.getFolderId(), folderName, - StringPool.BLANK, serviceContext); + folder = dlAppLocalService.addFolder(serviceContext.getUserId(), defaultFolder.getRepositoryId(), + defaultFolder.getFolderId(), folderName, StringPool.BLANK, serviceContext); } Date now = new Date(); - String title = now.getTime() + StringPool.UNDERLINE + "pagamento_manuale" + StringPool.UNDERLINE - + pagamento.getPagamentoId() + StringPool.UNDERLINE + sourceFileName; - String description = ""; + String title = now.getTime() + "_pagamento_manuale_" + pagamento.getPagamentoId() + StringPool.UNDERLINE + + sourceFileName; + String description = StringPool.BLANK; String mimeType = MimeTypesUtil.getContentType(sourceFileName); String changeLog = StringPool.BLANK; - FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), - folder.getRepositoryId(), folder.getFolderId(), now.getTime() + "_" + sourceFileName, - mimeType, title, description, changeLog, content, serviceContext); + FileEntry fileEntry = dlAppLocalService.addFileEntry(serviceContext.getUserId(), folder.getRepositoryId(), + folder.getFolderId(), now.getTime() + StringPool.UNDERLINE + sourceFileName, mimeType, title, + description, changeLog, content, serviceContext); fileEntryId = fileEntry.getFileEntryId(); - pagamento.setFileEntryId(fileEntryId); pagamento = pagamentoLocalService.updatePagamento(pagamento); - } else { throw new SystemException("pagamento manuale non aggiornabile"); } } + @Override public Pagamento fetchByOldPagamentoId(long oldPagamentoId) throws SystemException { return pagamentoPersistence.fetchByOldPagamentoId(oldPagamentoId); } + @Override public Pagamento updateOtf(long pagamentoId, boolean otf) throws PortalException, SystemException { + Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); pagamento.setOtf(otf); if (otf) { @@ -716,4 +694,4 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } return pagamentoLocalService.updatePagamento(pagamento); } -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java index 7ddb6b39..6ecbd5ad 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SoggettoServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -28,13 +28,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the soggetto remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.SoggettoService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.SoggettoService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -42,221 +41,249 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.SoggettoServiceUtil */ public class SoggettoServiceImpl extends SoggettoServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.SoggettoServiceUtil} to access the soggetto remote service. - */ - - public Soggetto getSoggetto(long soggettoId) throws PortalException, SystemException { - - Soggetto soggetto = soggettoLocalService.getSoggetto(soggettoId); - DettPraticaEntryPermission.check(getPermissionChecker(), soggetto.getDettPraticaId(), ActionKeys.VIEW); - return soggetto; - } - - - public Soggetto addSoggetto(long userId, long dettPraticaId, long intPraticaId, String nome, String cognome, - String codiceFiscale, String codiceFiscaleDelegato, Date dataNascita, String provinciaNascita, - String comuneNascita, String comuneDomicilio, String comuneDomicilioEstero, String provinciaDomicilio, - String viaDomicilio, String numeroCivicoDomicilio, String capDomicilio, String domicilioExtra, String comune, - String comuneEstero, String provincia, String via, String numeroCivico, String cap, String denominazione, - String sedeLegale, String legaleRap, Date dataNascitaRap, String provinciaNascitaRap, String comuneNascitaRap, - String viaRap, String numeroCivicoRap, String capRap, String provinciaRap, String comuneRap, - String comuneRapEstero, String albo, String alboDescr, String regAlbo, String provAlbo, String numIscrAlbo, - String telefono, String fax, String email, String tipologiaSoggetto, String tipoAltroSoggetto, boolean aggiuntivo, boolean rimosso, - String ambitoAttivita, String ambitoProfessione, long intPraticaIdRimozione, long dettPraticaIdRimozione, - Date dtDataRimozione, long soggettoSostituitoId, long oldSoggettoId, boolean tmp, ServiceContext serviceContext) - throws PortalException, SystemException { - - // TODO: permessi - return soggettoLocalService.addSoggetto(userId, dettPraticaId, intPraticaId, nome, cognome, codiceFiscale, - codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio, comuneDomicilioEstero, - provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio, domicilioExtra, comune, comuneEstero, - provincia, via, numeroCivico, cap, denominazione, sedeLegale, legaleRap, dataNascitaRap, provinciaNascitaRap, - comuneNascitaRap, viaRap, numeroCivicoRap, capRap, provinciaRap, comuneRap, comuneRapEstero, albo, alboDescr, - regAlbo, provAlbo, numIscrAlbo, telefono, fax, email, tipologiaSoggetto,tipoAltroSoggetto, aggiuntivo, rimosso, ambitoAttivita, - ambitoProfessione, intPraticaIdRimozione, dettPraticaIdRimozione, dtDataRimozione, soggettoSostituitoId, - oldSoggettoId, tmp, serviceContext); - } - - // public Soggetto cloneSoggetto(long userId, long dettPraticaId, long intPraticaId, Soggetto - // soggettoToClone, - // ServiceContext serviceContext) throws PortalException, SystemException { - // return soggettoLocalService.cloneSoggetto(userId, dettPraticaId, intPraticaId, soggettoToClone, - // serviceContext); - // } - - public Soggetto deleteSoggetto(Soggetto soggetto) throws PortalException, SystemException { - - // TODO: permessi - return soggettoLocalService.deleteSoggetto(soggetto); - } - - public Soggetto deleteSoggetto(long soggettoId) throws PortalException, SystemException { - - // TODO: permessi - return soggettoLocalService.deleteSoggetto(soggettoId); - } - - public Soggetto updateSoggetto(long userId, long soggettoId, long dettPraticaId, long intPraticaId, String nome, - String cognome, String codiceFiscale, String codiceFiscaleDelegato, Date dataNascita, String provinciaNascita, - String comuneNascita, String comuneDomicilio, String comuneDomicilioEstero, String provinciaDomicilio, - String viaDomicilio, String numeroCivicoDomicilio, String capDomicilio, String domicilioExtra, String comune, - String comuneEstero, String provincia, String via, String numeroCivico, String cap, String denominazione, - String sedeLegale, String legaleRap, Date dataNascitaRap, String provinciaNascitaRap, String comuneNascitaRap, - String viaRap, String numeroCivicoRap, String capRap, String provinciaRap, String comuneRap, - String comuneRapEstero, String albo, String alboDescr, String regAlbo, String provAlbo, String numIscrAlbo, - String telefono, String fax, String email, String tipologiaSoggetto, String tipoAltroSoggetto, boolean aggiuntivo, boolean rimosso, - String ambitoAttivita, String ambitoProfessione, long intPraticaIdRimozione, long dettPraticaIdRimozione, - Date dtDataRimozione, long soggettoSostituitoId, long oldSoggettoId, boolean tmp, ServiceContext serviceContext) - throws PortalException, SystemException { + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.SoggettoServiceUtil} to access the soggetto remote service. + */ + + @Override + public Soggetto getSoggetto(long soggettoId) throws PortalException, SystemException { + + Soggetto soggetto = soggettoLocalService.getSoggetto(soggettoId); + DettPraticaEntryPermission.check(getPermissionChecker(), soggetto.getDettPraticaId(), ActionKeys.VIEW); + return soggetto; + } + + @Override + public Soggetto addSoggetto(long userId, long dettPraticaId, long intPraticaId, String nome, String cognome, + String codiceFiscale, String codiceFiscaleDelegato, Date dataNascita, String provinciaNascita, + String comuneNascita, String comuneDomicilio, String comuneDomicilioEstero, String provinciaDomicilio, + String viaDomicilio, String numeroCivicoDomicilio, String capDomicilio, String domicilioExtra, + String comune, String comuneEstero, String provincia, String via, String numeroCivico, String cap, + String denominazione, String sedeLegale, String legaleRap, Date dataNascitaRap, String provinciaNascitaRap, + String comuneNascitaRap, String viaRap, String numeroCivicoRap, String capRap, String provinciaRap, + String comuneRap, String comuneRapEstero, String albo, String alboDescr, String regAlbo, String provAlbo, + String numIscrAlbo, String telefono, String fax, String email, String tipologiaSoggetto, + String tipoAltroSoggetto, boolean aggiuntivo, boolean rimosso, String ambitoAttivita, + String ambitoProfessione, long intPraticaIdRimozione, long dettPraticaIdRimozione, Date dtDataRimozione, + long soggettoSostituitoId, long oldSoggettoId, boolean tmp, ServiceContext serviceContext) + throws PortalException, SystemException { + + // TODO: permessi + return soggettoLocalService.addSoggetto(userId, dettPraticaId, intPraticaId, nome, cognome, codiceFiscale, + codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio, + comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio, + domicilioExtra, comune, comuneEstero, provincia, via, numeroCivico, cap, denominazione, sedeLegale, + legaleRap, dataNascitaRap, provinciaNascitaRap, comuneNascitaRap, viaRap, numeroCivicoRap, capRap, + provinciaRap, comuneRap, comuneRapEstero, albo, alboDescr, regAlbo, provAlbo, numIscrAlbo, telefono, + fax, email, tipologiaSoggetto, tipoAltroSoggetto, aggiuntivo, rimosso, ambitoAttivita, + ambitoProfessione, intPraticaIdRimozione, dettPraticaIdRimozione, dtDataRimozione, + soggettoSostituitoId, oldSoggettoId, tmp, serviceContext); + } + + @Override + public Soggetto deleteSoggetto(Soggetto soggetto) throws PortalException, SystemException { + + // TODO: permessi + return soggettoLocalService.deleteSoggetto(soggetto); + } + + @Override + public Soggetto deleteSoggetto(long soggettoId) throws PortalException, SystemException { + + // TODO: permessi + return soggettoLocalService.deleteSoggetto(soggettoId); + } + + @Override + public Soggetto updateSoggetto(long userId, long soggettoId, long dettPraticaId, long intPraticaId, String nome, + String cognome, String codiceFiscale, String codiceFiscaleDelegato, Date dataNascita, + String provinciaNascita, String comuneNascita, String comuneDomicilio, String comuneDomicilioEstero, + String provinciaDomicilio, String viaDomicilio, String numeroCivicoDomicilio, String capDomicilio, + String domicilioExtra, String comune, String comuneEstero, String provincia, String via, + String numeroCivico, String cap, String denominazione, String sedeLegale, String legaleRap, + Date dataNascitaRap, String provinciaNascitaRap, String comuneNascitaRap, String viaRap, + String numeroCivicoRap, String capRap, String provinciaRap, String comuneRap, String comuneRapEstero, + String albo, String alboDescr, String regAlbo, String provAlbo, String numIscrAlbo, String telefono, + String fax, String email, String tipologiaSoggetto, String tipoAltroSoggetto, boolean aggiuntivo, + boolean rimosso, String ambitoAttivita, String ambitoProfessione, long intPraticaIdRimozione, + long dettPraticaIdRimozione, Date dtDataRimozione, long soggettoSostituitoId, long oldSoggettoId, + boolean tmp, ServiceContext serviceContext) throws PortalException, SystemException { + + // TODO: permessi + return soggettoLocalService.updateSoggetto(userId, soggettoId, dettPraticaId, intPraticaId, nome, cognome, + codiceFiscale, codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio, + comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio, + domicilioExtra, comune, comuneEstero, provincia, via, numeroCivico, cap, denominazione, sedeLegale, + legaleRap, dataNascitaRap, provinciaNascitaRap, comuneNascitaRap, viaRap, numeroCivicoRap, capRap, + provinciaRap, comuneRap, comuneRapEstero, albo, alboDescr, regAlbo, provAlbo, numIscrAlbo, telefono, + fax, email, tipologiaSoggetto, tipoAltroSoggetto, aggiuntivo, rimosso, ambitoAttivita, + ambitoProfessione, intPraticaIdRimozione, dettPraticaIdRimozione, dtDataRimozione, + soggettoSostituitoId, oldSoggettoId, tmp, serviceContext); + } + + @Override + public void updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) + throws PortalException, SystemException { + + soggettoLocalService.updatePrincipale(dettPraticaId, codiceFiscale, tipologiaSoggetto); + } + + @Override + public List findByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) + throws SystemException { + + // TODO: permessi + return soggettoLocalService.findByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto); + } + + @Override + public List findByDettPratica_TipologiaSoggetto(long dettPraticaId, String tipologiaSoggetto) + throws SystemException { + + // TODO: permessi + return soggettoLocalService.findByDettPratica_TipologiaSoggetto(dettPraticaId, tipologiaSoggetto); + } + + @Override + public List findByIntPratica_TipologiaSoggetto_Rimosso(long intPraticaId, String tipologiaSoggetto, + boolean rimosso) throws SystemException { + + // TODO: permessi + return soggettoLocalService + .findByIntPratica_TipologiaSoggetto_Rimosso(intPraticaId, tipologiaSoggetto, rimosso); + } + + @Override + public List findByIntPratica_TipologiaSoggetto_DettPraticaIdRimozione(long intPraticaId, + String tipologiaSoggetto, long dettPraticaIdRimozione) throws SystemException { + + return soggettoLocalService.findByIntPratica_TipologiaSoggetto_DettPraticaIdRimozione(intPraticaId, + tipologiaSoggetto, dettPraticaIdRimozione); + } + + @Override + public List getValidByIntPratica(long intPraticaId) throws SystemException { + + return soggettoLocalService.getValidByIntPratica(intPraticaId); + } + + @Override + public int countValidByIntPratica(long intPraticaId) throws SystemException { + + return soggettoLocalService.countValidByIntPratica(intPraticaId); + } + + @Override + public List getValidTmpByIntPratica(long intPraticaId) throws SystemException { + + return soggettoLocalService.getValidTmpByIntPratica(intPraticaId); + } - // TODO: permessi - return soggettoLocalService.updateSoggetto(userId, soggettoId, dettPraticaId, intPraticaId, nome, cognome, - codiceFiscale, codiceFiscaleDelegato, dataNascita, provinciaNascita, comuneNascita, comuneDomicilio, - comuneDomicilioEstero, provinciaDomicilio, viaDomicilio, numeroCivicoDomicilio, capDomicilio, domicilioExtra, - comune, comuneEstero, provincia, via, numeroCivico, cap, denominazione, sedeLegale, legaleRap, dataNascitaRap, - provinciaNascitaRap, comuneNascitaRap, viaRap, numeroCivicoRap, capRap, provinciaRap, comuneRap, - comuneRapEstero, albo, alboDescr, regAlbo, provAlbo, numIscrAlbo, telefono, fax, email, tipologiaSoggetto,tipoAltroSoggetto, - aggiuntivo, rimosso, ambitoAttivita, ambitoProfessione, intPraticaIdRimozione, dettPraticaIdRimozione, - dtDataRimozione, soggettoSostituitoId, oldSoggettoId, tmp, serviceContext); - } + @Override + public int countValidTmpByIntPratica(long intPraticaId) throws SystemException { - public void updatePrincipale(long dettPraticaId, String codiceFiscale, String tipologiaSoggetto) - throws PortalException, SystemException { + return soggettoLocalService.countValidTmpByIntPratica(intPraticaId); + } + + @Override + public List getValidTmpByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, + long docDettPraticaId) throws SystemException { + + return soggettoLocalService + .getValidTmpByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, docDettPraticaId); + } + + @Override + public int countValidTmpByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, long docDettPraticaId) + throws SystemException { + + return soggettoLocalService.countValidTmpByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, + docDettPraticaId); + } - soggettoLocalService.updatePrincipale(dettPraticaId, codiceFiscale, tipologiaSoggetto); - } + @Override + public List getValidByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) + throws SystemException { - public List findByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) - throws SystemException { + return soggettoLocalService.getValidByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto); + } - // TODO: permessi - return soggettoLocalService.findByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto); - } + @Override + public List getValidTmpByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) + throws SystemException { - public List findByDettPratica_TipologiaSoggetto(long dettPraticaId, String tipologiaSoggetto) - throws SystemException { + return soggettoLocalService.getValidTmpByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto); + } - // TODO: permessi - return soggettoLocalService.findByDettPratica_TipologiaSoggetto(dettPraticaId, tipologiaSoggetto); - } + @Override + public List getInvalidByIntPratica(long intPraticaId) throws SystemException { - public List findByIntPratica_TipologiaSoggetto_Rimosso(long intPraticaId, String tipologiaSoggetto, - boolean rimosso) throws SystemException { + return soggettoLocalService.getInvalidByIntPratica(intPraticaId); + } - // TODO: permessi - return soggettoLocalService.findByIntPratica_TipologiaSoggetto_Rimosso(intPraticaId, tipologiaSoggetto, rimosso); - } + @Override + public List getInvalidTmpByIntPratica(long intPraticaId) throws SystemException { - public List findByIntPratica_TipologiaSoggetto_DettPraticaIdRimozione(long intPraticaId, - String tipologiaSoggetto, long dettPraticaIdRimozione) throws SystemException { + return soggettoLocalService.getInvalidTmpByIntPratica(intPraticaId); + } - return soggettoLocalService.findByIntPratica_TipologiaSoggetto_DettPraticaIdRimozione(intPraticaId, - tipologiaSoggetto, dettPraticaIdRimozione); - } + @Override + public List getValidUntilDettPraticaByIntPratica(long intPraticaId, long dettPraticaId) + throws SystemException { - public List getValidByIntPratica(long intPraticaId) throws SystemException { + return soggettoLocalService.getValidUntilDettPraticaByIntPratica(intPraticaId, dettPraticaId); + } - return soggettoLocalService.getValidByIntPratica(intPraticaId); - } - - public int countValidByIntPratica(long intPraticaId) throws SystemException { - - return soggettoLocalService.countValidByIntPratica(intPraticaId); - } - - public List getValidTmpByIntPratica(long intPraticaId) throws SystemException { - - return soggettoLocalService.getValidTmpByIntPratica(intPraticaId); - } - - public int countValidTmpByIntPratica(long intPraticaId) throws SystemException { - - return soggettoLocalService.countValidTmpByIntPratica(intPraticaId); - } - - public List getValidTmpByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, - long docDettPraticaId) throws SystemException { - - return soggettoLocalService.getValidTmpByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, docDettPraticaId); - } - - public int countValidTmpByIntPratica_CodiceFiscale(long intPraticaId, String codiceFiscale, long docDettPraticaId) - throws SystemException { - - return soggettoLocalService.countValidTmpByIntPratica_CodiceFiscale(intPraticaId, codiceFiscale, docDettPraticaId); - } - - public List getValidByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) - throws SystemException { - - return soggettoLocalService.getValidByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto); - } - - public List getValidTmpByIntPratica_TipologiaSoggetto(long intPraticaId, String tipologiaSoggetto) - throws SystemException { - - return soggettoLocalService.getValidTmpByIntPratica_TipologiaSoggetto(intPraticaId, tipologiaSoggetto); - } - - public List getInvalidByIntPratica(long intPraticaId) throws SystemException { - - return soggettoLocalService.getInvalidByIntPratica(intPraticaId); - } - - public List getInvalidTmpByIntPratica(long intPraticaId) throws SystemException { - - return soggettoLocalService.getInvalidTmpByIntPratica(intPraticaId); - } - - public List getValidUntilDettPraticaByIntPratica(long intPraticaId, long dettPraticaId) - throws SystemException { - - return soggettoLocalService.getValidUntilDettPraticaByIntPratica(intPraticaId, dettPraticaId); - } - - public List getValidUntilDettPraticaByIntPratica(long intPraticaId, long dettPraticaId, + @Override + public List getValidUntilDettPraticaByIntPratica(long intPraticaId, long dettPraticaId, String tipologiaSoggetto) throws SystemException { - return soggettoLocalService.getValidUntilDettPraticaByIntPratica(intPraticaId, dettPraticaId, tipologiaSoggetto); - } + return soggettoLocalService + .getValidUntilDettPraticaByIntPratica(intPraticaId, dettPraticaId, tipologiaSoggetto); + } - public int countValidUntilDettPraticaByIntPratica(long intPraticaId, long dettPraticaId) throws SystemException { + @Override + public int countValidUntilDettPraticaByIntPratica(long intPraticaId, long dettPraticaId) throws SystemException { - return soggettoLocalService.countValidUntilDettPraticaByIntPratica(intPraticaId, dettPraticaId); - } + return soggettoLocalService.countValidUntilDettPraticaByIntPratica(intPraticaId, dettPraticaId); + } - public List findByIntPratica(long intPraticaId) throws SystemException { + @Override + public List findByIntPratica(long intPraticaId) throws SystemException { - // TODO: permessi - return soggettoLocalService.findByIntPratica(intPraticaId); - } + // TODO: permessi + return soggettoLocalService.findByIntPratica(intPraticaId); + } - public int countByIntPratica(long intPraticaId) throws SystemException { + @Override + public int countByIntPratica(long intPraticaId) throws SystemException { - // TODO: permessi - return soggettoLocalService.countByIntPratica(intPraticaId); - } + // TODO: permessi + return soggettoLocalService.countByIntPratica(intPraticaId); + } - public List findByDettPratica(long dettPraticaId) throws SystemException { + @Override + public List findByDettPratica(long dettPraticaId) throws SystemException { - // TODO: permessi - return soggettoLocalService.findByDettPratica(dettPraticaId); - } + // TODO: permessi + return soggettoLocalService.findByDettPratica(dettPraticaId); + } - public int countByDettPratica(long dettPraticaId) throws SystemException { + @Override + public int countByDettPratica(long dettPraticaId) throws SystemException { - return soggettoLocalService.countByDettPratica(dettPraticaId); - } + return soggettoLocalService.countByDettPratica(dettPraticaId); + } - public Soggetto allegaFileModifica(long soggettoId, long userId, long intPraticaId, byte[] content, - String sourceFileName, String jsonFirmatari, ServiceContext serviceContext) throws SystemException, - PortalException { + @Override + public Soggetto allegaFileModifica(long soggettoId, long userId, long intPraticaId, byte[] content, + String sourceFileName, String jsonFirmatari, ServiceContext serviceContext) throws SystemException, + PortalException { - // TODO permessi - return soggettoLocalService.allegaFileModifica(soggettoId, userId, intPraticaId, content, sourceFileName, - jsonFirmatari, serviceContext); - } + // TODO permessi + return soggettoLocalService.allegaFileModifica(soggettoId, userId, intPraticaId, content, sourceFileName, + jsonFirmatari, serviceContext); + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java index 0a91ee76..180a14da 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -21,7 +21,6 @@ import java.util.List; import com.liferay.portal.kernel.dao.orm.DynamicQuery; import com.liferay.portal.kernel.dao.orm.Junction; import com.liferay.portal.kernel.dao.orm.OrderFactoryUtil; -import com.liferay.portal.kernel.dao.orm.ProjectionFactoryUtil; import com.liferay.portal.kernel.dao.orm.PropertyFactoryUtil; import com.liferay.portal.kernel.dao.orm.RestrictionsFactoryUtil; import com.liferay.portal.kernel.exception.SystemException; @@ -35,14 +34,12 @@ import com.liferay.util.dao.orm.CustomSQLUtil; * The implementation of the sorteggio local service. * *

- * All custom service methods should be put in this class. Whenever methods are - * added, rerun ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.SorteggioLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.SorteggioLocalService} interface. * *

- * This is a local service. Methods of this service will not have security - * checks based on the propagated JAAS credentials because this service can only - * be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -51,31 +48,26 @@ import com.liferay.util.dao.orm.CustomSQLUtil; */ public class SorteggioLocalServiceImpl extends SorteggioLocalServiceBaseImpl { /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use - * {@link it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil} to - * access the sorteggio local service. + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.SorteggioLocalServiceUtil} to access the sorteggio local service. */ - public Sorteggio addSorteggio(long intPraticaId, long dettPraticaId, String anno, String mese, - int settimana, Date dtSorteggio, String note, String stato, String dettagli, - long numeroEstrazione, String pratica, String committente, String comune, String provincia, - boolean esterna, long praticaEsternaId, boolean mesePrecedente, ServiceContext serviceContext) - throws SystemException { + @Override + public Sorteggio addSorteggio(long intPraticaId, long dettPraticaId, String anno, String mese, int settimana, + Date dtSorteggio, String note, String stato, String dettagli, long numeroEstrazione, String pratica, + String committente, String comune, String provincia, boolean esterna, long praticaEsternaId, + boolean mesePrecedente, ServiceContext serviceContext) throws SystemException { User user = userLocalService.fetchUser(serviceContext.getUserId()); - Date now = new Date(); - - Sorteggio sorteggio = sorteggioLocalService.createSorteggio(counterLocalService - .increment(Sorteggio.class.getName())); - + Sorteggio sorteggio = sorteggioLocalService.createSorteggio(counterLocalService.increment(Sorteggio.class + .getName())); sorteggio.setCompanyId(serviceContext.getCompanyId()); sorteggio.setGroupId(serviceContext.getScopeGroupId()); sorteggio.setUserId(serviceContext.getUserId()); sorteggio.setUserName(user.getFullName()); sorteggio.setCreateDate(serviceContext.getCreateDate(now)); sorteggio.setModifiedDate(serviceContext.getModifiedDate(now)); - sorteggio.setAnno(anno); sorteggio.setMese(mese); sorteggio.setSettimana(settimana); @@ -85,130 +77,44 @@ public class SorteggioLocalServiceImpl extends SorteggioLocalServiceBaseImpl { sorteggio.setNote(note); sorteggio.setDettagli(dettagli); sorteggio.setStato(stato); - sorteggio.setNumeroEstrazione(numeroEstrazione); sorteggio.setPratica(pratica); sorteggio.setCommittente(committente); sorteggio.setComune(comune); sorteggio.setProvincia(provincia); - sorteggio.setMesePrecedente(Boolean.toString(mesePrecedente)); - // in avvio in draft -> pratiche sempre controllate nella loro vita sorteggio.setStatus(WorkflowConstants.STATUS_DRAFT); - sorteggio.setEsterna(esterna); sorteggio.setPraticaEsternaId(praticaEsternaId); - - return sorteggioLocalService.addSorteggio(sorteggio); - } - - public Sorteggio addSorteggioForImport(long intPraticaId, long dettPraticaId, String anno, String mese, - int settimana, Date dtSorteggio, String note, String stato, String dettagli, - long numeroEstrazione, String pratica, String committente, String comune, String provincia, - boolean esterna, long praticaEsternaId, boolean mesePrecedente, int status, long oldSorteggioId, - ServiceContext serviceContext) throws SystemException { - - Date now = new Date(); - - Sorteggio sorteggio = sorteggioLocalService.createSorteggio(counterLocalService - .increment(Sorteggio.class.getName())); - - sorteggio.setCompanyId(serviceContext.getCompanyId()); - sorteggio.setGroupId(serviceContext.getScopeGroupId()); - sorteggio.setUserId(serviceContext.getUserId()); - if (serviceContext.getUserId() > 0) { - User user = userLocalService.fetchUser(serviceContext.getUserId()); - sorteggio.setUserName(user.getFullName()); - } - sorteggio.setCreateDate(serviceContext.getCreateDate(now)); - sorteggio.setModifiedDate(serviceContext.getModifiedDate(now)); - - sorteggio.setAnno(anno); - sorteggio.setMese(mese); - sorteggio.setSettimana(settimana); - sorteggio.setDtSorteggio(dtSorteggio); - sorteggio.setDettPraticaId(dettPraticaId); - sorteggio.setIntPraticaId(intPraticaId); - sorteggio.setNote(note); - sorteggio.setDettagli(dettagli); - sorteggio.setStato(stato); - - sorteggio.setNumeroEstrazione(numeroEstrazione); - sorteggio.setPratica(pratica); - sorteggio.setCommittente(committente); - sorteggio.setComune(comune); - sorteggio.setProvincia(provincia); - - sorteggio.setMesePrecedente(Boolean.toString(mesePrecedente)); - sorteggio.setStatus(status); - - sorteggio.setEsterna(esterna); - sorteggio.setPraticaEsternaId(praticaEsternaId); - sorteggio.setOldSorteggioId(oldSorteggioId); - return sorteggioLocalService.addSorteggio(sorteggio); } - public List getYears(Long groupId, int lastResults) throws SystemException { - - DynamicQuery dynamicQuery = sorteggioLocalService.dynamicQuery(); - dynamicQuery.setProjection(ProjectionFactoryUtil.groupProperty("anno")); - if (Validator.isNotNull(groupId)) { - dynamicQuery.add(PropertyFactoryUtil.forName("groupId").eq(groupId)); - } - dynamicQuery.addOrder(OrderFactoryUtil.desc("anno")); - return sorteggioPersistence.findWithDynamicQuery(dynamicQuery, 0, lastResults); - } - - public int countDettPraticaWorkflowNonAvviato() throws SystemException { - - DynamicQuery dynamicQuery = dynamicQueryDettPraticaWorkflowNonAvviato(); - return (int) sorteggioPersistence.countWithDynamicQuery(dynamicQuery); - } - - public List getDettPraticaWorkflowNonAvviato(int start, int end) throws SystemException { - - DynamicQuery dynamicQuery = dynamicQueryDettPraticaWorkflowNonAvviato(); - dynamicQuery.setProjection(ProjectionFactoryUtil.groupProperty("dettPraticaId")); - return sorteggioPersistence.findWithDynamicQuery(dynamicQuery); - } - - private DynamicQuery dynamicQueryDettPraticaWorkflowNonAvviato() { - - DynamicQuery dynamicQuery = sorteggioLocalService.dynamicQuery(); - dynamicQuery.add(PropertyFactoryUtil.forName("status").eq(WorkflowConstants.STATUS_DRAFT)); - dynamicQuery.add(PropertyFactoryUtil.forName("esterna").eq(false)); - return dynamicQuery; - } - + @Override public List search(long groupId, String anno, String mese, int settimana, int start, int end) throws SystemException { - // Task 31433 - DynamicQuery dynamicQuery = searchDynamicQuery(groupId, anno, mese, settimana, null, null, null, - null, null, null); + DynamicQuery dynamicQuery = searchDynamicQuery(groupId, anno, mese, settimana, null, null, null, null, null, + null); dynamicQuery.addOrder(OrderFactoryUtil.desc("anno")); dynamicQuery.addOrder(OrderFactoryUtil.desc("mese")); return sorteggioPersistence.findWithDynamicQuery(dynamicQuery, start, end); } + @Override public int countSearch(long groupId, String anno, String mese, int settimana) throws SystemException { - return (int) sorteggioPersistence.countWithDynamicQuery(searchDynamicQuery(groupId, anno, mese, - settimana, null, null, null, - // Task 31433 - null, null, null)); + return (int) sorteggioPersistence.countWithDynamicQuery(searchDynamicQuery(groupId, anno, mese, settimana, + null, null, null, null, null, null)); } - // Task 31433 - public List search(String anno, String mese, int settimana, String committente, - String tecnico, String comune, String pratica, Long numeroEstrazione, String provincia, - int start, int end) throws SystemException { + @Override + public List search(String anno, String mese, int settimana, String committente, String tecnico, + String comune, String pratica, Long numeroEstrazione, String provincia, int start, int end) + throws SystemException { - // Task 31433 - DynamicQuery dynamicQuery = searchDynamicQuery(null, anno, mese, settimana, committente, tecnico, - comune, pratica, numeroEstrazione, provincia); + DynamicQuery dynamicQuery = searchDynamicQuery(null, anno, mese, settimana, committente, tecnico, comune, + pratica, numeroEstrazione, provincia); dynamicQuery.addOrder(OrderFactoryUtil.desc("anno")); dynamicQuery.addOrder(OrderFactoryUtil.desc("mese")); dynamicQuery.addOrder(OrderFactoryUtil.asc("provincia")); @@ -217,25 +123,21 @@ public class SorteggioLocalServiceImpl extends SorteggioLocalServiceBaseImpl { return sorteggioPersistence.findWithDynamicQuery(dynamicQuery, start, end); } - // Task 31433 - public int countSearch(String anno, String mese, int settimana, String committente, String tecnico, - String comune, String pratica, Long numeroEstrazione, String provincia) throws SystemException { + @Override + public int countSearch(String anno, String mese, int settimana, String committente, String tecnico, String comune, + String pratica, Long numeroEstrazione, String provincia) throws SystemException { - // Task 31433 - return (int) sorteggioPersistence.countWithDynamicQuery(searchDynamicQuery(null, anno, mese, - settimana, committente, tecnico, comune, pratica, numeroEstrazione, provincia)); + return (int) sorteggioPersistence.countWithDynamicQuery(searchDynamicQuery(null, anno, mese, settimana, + committente, tecnico, comune, pratica, numeroEstrazione, provincia)); } - private DynamicQuery searchDynamicQuery(Long groupId, String anno, String mese, int settimana, - String committente, String tecnico, String comune, String pratica, Long numeroEstrazione, - String provincia) { + private DynamicQuery searchDynamicQuery(Long groupId, String anno, String mese, int settimana, String committente, + String tecnico, String comune, String pratica, Long numeroEstrazione, String provincia) { DynamicQuery dynamicQuery = sorteggioLocalService.dynamicQuery(); - if (Validator.isNotNull(groupId)) { dynamicQuery.add(PropertyFactoryUtil.forName("groupId").eq(groupId)); } - if (Validator.isNotNull(anno)) { dynamicQuery.add(PropertyFactoryUtil.forName("anno").eq(anno)); } @@ -270,33 +172,20 @@ public class SorteggioLocalServiceImpl extends SorteggioLocalServiceBaseImpl { if (Validator.isNotNull(numeroEstrazione)) { dynamicQuery.add(PropertyFactoryUtil.forName("numeroEstrazione").eq(numeroEstrazione)); } - - // Task 31433 if (Validator.isNotNull(provincia)) { dynamicQuery.add(RestrictionsFactoryUtil.ilike("provincia", provincia)); } - return dynamicQuery; } - public boolean isDettPraticaSorteggiata(long companyId, long dettPraticaId) throws SystemException { - - int count = sorteggioPersistence.countByC_DettPratica(companyId, dettPraticaId); - return count > 0; - } - - public Sorteggio fetchByOldSorteggioId(long oldSorteggioId) throws SystemException { - - return sorteggioPersistence.fetchByOldSorteggioId(oldSorteggioId); - } - + @Override public Sorteggio findByC_DettPratica(long companyId, long dettPraticaId) throws SystemException { - List dettPraticas = sorteggioPersistence.findByC_DettPratica(companyId, dettPraticaId, 0, - 1); + List dettPraticas = sorteggioPersistence.findByC_DettPratica(companyId, dettPraticaId, 0, 1); return dettPraticas != null && !dettPraticas.isEmpty() ? dettPraticas.get(0) : null; } + @Override public Sorteggio findByIntPratica(long intPraticaId) throws SystemException { // XXX verificare se torna uno o più @@ -304,104 +193,88 @@ public class SorteggioLocalServiceImpl extends SorteggioLocalServiceBaseImpl { return sorteggis != null && !sorteggis.isEmpty() ? sorteggis.get(0) : null; } - /* - * FIXME public Sorteggio updateStatus(long userId, long resourcePk, - * ServiceContext serviceContext, int status) throws PortalException, - * SystemException { User user = userLocalService.getUser(userId); Sorteggio - * sorteggio = - * sorteggioLocalService.findByC_DettPratica(serviceContext.getCompanyId(), - * resourcePk); sorteggio.setStatus(status); - * sorteggio.setStatusByUserId(userId); - * sorteggio.setStatusByUserName(user.getFullName()); - * sorteggio.setStatusDate(serviceContext.getModifiedDate()); return - * sorteggioLocalService.updateSorteggio(sorteggio); } public Sorteggio - * updateSorteggioTecnico(long companyId, long dettPraticaId, String - * tecnico) throws PortalException, SystemException { Sorteggio sorteggio = - * sorteggioLocalService.findByC_DettPratica(companyId, dettPraticaId); - * sorteggio.setTecnico(tecnico); return - * sorteggioLocalService.updateSorteggio(sorteggio); } - */ - - public List findByGroupId_Anno_Mese_Settimana(long groupId, String anno, String mese, - int settimana) throws SystemException { + @Override + public List findByGroupId_Anno_Mese_Settimana(long groupId, String anno, String mese, int settimana) + throws SystemException { return sorteggioPersistence.findByGroupId_Anno_Mese_Settimana(groupId, anno, mese, settimana); } + @Override public List findByCompanyIdGroupId(long companyId, long groupId) throws SystemException { return sorteggioPersistence.findByC_GroupId(companyId, groupId); } - public List findByAnno_Mese_Settimana(String anno, String mese, int settimana) - throws SystemException { + @Override + public List findByAnno_Mese_Settimana(String anno, String mese, int settimana) throws SystemException { return sorteggioPersistence.findByAnno_Mese_Settimana(anno, mese, settimana); } - /* - * Finder - */ - + @Override public List findSorteggiGroupByAnnoMeseSettimana(int start, int end) throws SystemException { return sorteggioFinder.findSorteggiGroupByAnnoMeseSettimana(start, end); } + @Override public int countSorteggiGroupByAnnoMeseSettimana() throws SystemException { return sorteggioFinder.countSorteggiGroupByAnnoMeseSettimana(); } - public int countSorteggioMese(Date dtMin, Date dtMax, List territorioIds, - List tipoPraticaIds) throws SystemException { + @Override + public int countSorteggioMese(Date dtMin, Date dtMax, List territorioIds, List tipoPraticaIds) + throws SystemException { return sorteggioFinder.countSorteggioMese(dtMin, dtMax, territorioIds, tipoPraticaIds); } + @Override public List findSorteggioMese(Date dtMin, Date dtMax, List territorioIds, List tipoPraticaIds, List statiPratica, int maxResults) throws SystemException { - return sorteggioFinder.findSorteggioMese(dtMin, dtMax, territorioIds, tipoPraticaIds, statiPratica, - maxResults); + return sorteggioFinder.findSorteggioMese(dtMin, dtMax, territorioIds, tipoPraticaIds, statiPratica, maxResults); } + @Override public List findSorteggioAnno(Date dtMin, Date dtMax, List territorioIds, List tipoPraticaIds, List statiPratica, int maxResults) throws SystemException { - return sorteggioFinder.findSorteggioAnno(dtMin, dtMax, territorioIds, tipoPraticaIds, statiPratica, - maxResults); + return sorteggioFinder.findSorteggioAnno(dtMin, dtMax, territorioIds, tipoPraticaIds, statiPratica, maxResults); } - public void updateDataSorteggioPraticaEsterna(long praticaEsternaId, Date dataSorteggio) - throws SystemException { + @Override + public void updateDataSorteggioPraticaEsterna(long praticaEsternaId, Date dataSorteggio) throws SystemException { sorteggioFinder.updateDataSorteggioPraticaEsterna(praticaEsternaId, dataSorteggio); } + @Override public String getTecnicoSorteggioPraticaEsterna(long praticaEsternaId) throws SystemException { return sorteggioFinder.findTecnicoSorteggioPraticaEsterna(praticaEsternaId); } + @Override public long findTipoPraticaIdSorteggioPraticaEsterna(long praticaEsternaId) throws SystemException { return sorteggioFinder.findTipoPraticaIdSorteggioPraticaEsterna(praticaEsternaId); - + } - // Bug 32653 + @Override public List search(Long groupId, String anno, String mese, int settimana, String committente, - String tecnico, String comune, String pratica, Long numeroEstrazione, String provincia, - int start, int end) throws SystemException { + String tecnico, String comune, String pratica, Long numeroEstrazione, String provincia, int start, int end) + throws SystemException { return sorteggioFinder.search(groupId, anno, mese, settimana, committente, tecnico, comune, pratica, numeroEstrazione, provincia, start, end); } - // Bug 32653 - public int count(Long groupId, String anno, String mese, int settimana, String committente, - String tecnico, String comune, String pratica, Long numeroEstrazione, String provincia) - throws SystemException { + @Override + public int count(Long groupId, String anno, String mese, int settimana, String committente, String tecnico, + String comune, String pratica, Long numeroEstrazione, String provincia) throws SystemException { return sorteggioFinder.count(groupId, anno, mese, settimana, committente, tecnico, comune, pratica, numeroEstrazione, provincia); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java index ec90713d..350621f2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/SorteggioServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -18,13 +18,12 @@ import it.tref.liferay.portos.bo.service.base.SorteggioServiceBaseImpl; * The implementation of the sorteggio remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.SorteggioService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.SorteggioService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on - * the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting @@ -32,11 +31,11 @@ import it.tref.liferay.portos.bo.service.base.SorteggioServiceBaseImpl; * @see it.tref.liferay.portos.bo.service.SorteggioServiceUtil */ public class SorteggioServiceImpl extends SorteggioServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: - * - * Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.SorteggioServiceUtil} to access the sorteggio remote service. - */ + /* + * NOTE FOR DEVELOPERS: + * + * Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.SorteggioServiceUtil} to access the sorteggio remote service. + */ } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java index d4784d09..4f3d49bf 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -27,13 +27,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the storico soggetto pratica local service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalService} interface. * *

- * This is a local service. Methods of this service will not have security checks based on the - * propagated JAAS credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -41,82 +40,42 @@ import com.liferay.portal.service.ServiceContext; * @see it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil */ public class StoricoSoggettoPraticaLocalServiceImpl extends StoricoSoggettoPraticaLocalServiceBaseImpl { - /* - * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil} to access the storico - * soggetto pratica local service. - */ - public StoricoSoggettoPratica addStoricoSoggettoPratica(long intPraticaId, String nome, String cognome, - String codiceFiscale, ServiceContext serviceContext) throws PortalException, SystemException { - - User user = userLocalService.getUser(serviceContext.getUserId()); - - Date now = new Date(); - - StoricoSoggettoPratica storicoSoggettoPratica = - storicoSoggettoPraticaLocalService.createStoricoSoggettoPratica(counterLocalService.increment(StoricoSoggettoPratica.class.getName())); - - storicoSoggettoPratica.setCompanyId(serviceContext.getCompanyId()); - storicoSoggettoPratica.setGroupId(serviceContext.getScopeGroupId()); - storicoSoggettoPratica.setUserId(serviceContext.getUserId()); - storicoSoggettoPratica.setUserName(user.getFullName()); - storicoSoggettoPratica.setCreateDate(serviceContext.getCreateDate(now)); - storicoSoggettoPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - - storicoSoggettoPratica.setIntPraticaId(intPraticaId); - - storicoSoggettoPratica.setNome(nome); - storicoSoggettoPratica.setCognome(cognome); - storicoSoggettoPratica.setCodiceFiscale(codiceFiscale); - - return addStoricoSoggettoPratica(storicoSoggettoPratica); - } - - public StoricoSoggettoPratica addStoricoSoggettoPraticaForImport(long intPraticaId, String nome, String cognome, - String codiceFiscale, long oldStoricoSoggettoPraticaId, ServiceContext serviceContext) throws PortalException, - SystemException { - - Date now = new Date(); - - StoricoSoggettoPratica storicoSoggettoPratica = - storicoSoggettoPraticaLocalService.createStoricoSoggettoPratica(counterLocalService.increment(StoricoSoggettoPratica.class.getName())); - - storicoSoggettoPratica.setCompanyId(serviceContext.getCompanyId()); - storicoSoggettoPratica.setGroupId(serviceContext.getScopeGroupId()); - storicoSoggettoPratica.setUserId(serviceContext.getUserId()); - - if (serviceContext.getUserId() > 0) { - User user = userLocalService.getUser(serviceContext.getUserId()); - storicoSoggettoPratica.setUserName(user.getFullName()); - } - - storicoSoggettoPratica.setCreateDate(serviceContext.getCreateDate(now)); - storicoSoggettoPratica.setModifiedDate(serviceContext.getModifiedDate(now)); - - storicoSoggettoPratica.setIntPraticaId(intPraticaId); - - storicoSoggettoPratica.setNome(nome); - storicoSoggettoPratica.setCognome(cognome); - storicoSoggettoPratica.setCodiceFiscale(codiceFiscale); - storicoSoggettoPratica.setOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - - return addStoricoSoggettoPratica(storicoSoggettoPratica); - } - - public StoricoSoggettoPratica fetchByOldStoricoSoggettoPraticaId(long oldStoricoSoggettoPraticaId) - throws SystemException { - - return storicoSoggettoPraticaPersistence.fetchByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - } - - public List findByIntPratica(long companyId, long intPraticaId, int start, int end) - throws SystemException { - - return storicoSoggettoPraticaPersistence.findByC_IntPratica(companyId, intPraticaId, start, end); - } - - public int countByIntPratica(long companyId, long intPraticaId) throws SystemException { - - return storicoSoggettoPraticaPersistence.countByC_IntPratica(companyId, intPraticaId); - } -} + /* + * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaLocalServiceUtil} to access the storico soggetto pratica + * local service. + */ + @Override + public StoricoSoggettoPratica addStoricoSoggettoPratica(long intPraticaId, String nome, String cognome, + String codiceFiscale, ServiceContext serviceContext) throws PortalException, SystemException { + + User user = userLocalService.getUser(serviceContext.getUserId()); + Date now = new Date(); + StoricoSoggettoPratica storicoSoggettoPratica = storicoSoggettoPraticaLocalService + .createStoricoSoggettoPratica(counterLocalService.increment(StoricoSoggettoPratica.class.getName())); + storicoSoggettoPratica.setCompanyId(serviceContext.getCompanyId()); + storicoSoggettoPratica.setGroupId(serviceContext.getScopeGroupId()); + storicoSoggettoPratica.setUserId(serviceContext.getUserId()); + storicoSoggettoPratica.setUserName(user.getFullName()); + storicoSoggettoPratica.setCreateDate(serviceContext.getCreateDate(now)); + storicoSoggettoPratica.setModifiedDate(serviceContext.getModifiedDate(now)); + storicoSoggettoPratica.setIntPraticaId(intPraticaId); + storicoSoggettoPratica.setNome(nome); + storicoSoggettoPratica.setCognome(cognome); + storicoSoggettoPratica.setCodiceFiscale(codiceFiscale); + return addStoricoSoggettoPratica(storicoSoggettoPratica); + } + + @Override + public List findByIntPratica(long companyId, long intPraticaId, int start, int end) + throws SystemException { + + return storicoSoggettoPraticaPersistence.findByC_IntPratica(companyId, intPraticaId, start, end); + } + + @Override + public int countByIntPratica(long companyId, long intPraticaId) throws SystemException { + + return storicoSoggettoPraticaPersistence.countByC_IntPratica(companyId, intPraticaId); + } +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java index c13421d2..5abb7441 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/StoricoSoggettoPraticaServiceImpl.java @@ -1,14 +1,12 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. */ @@ -20,21 +18,24 @@ import it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaServiceBaseI * The implementation of the storico soggetto pratica remote service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy their definitions into the {@link it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaService} interface. * *

- * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS credentials because this service can be accessed remotely. + * This is a remote service. Methods of this service are expected to have security checks based on the propagated JAAS + * credentials because this service can be accessed remotely. *

* * @author Davide Barbagallo, 3F Consulting * @see it.tref.liferay.portos.bo.service.base.StoricoSoggettoPraticaServiceBaseImpl * @see it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil */ -public class StoricoSoggettoPraticaServiceImpl - extends StoricoSoggettoPraticaServiceBaseImpl { +public class StoricoSoggettoPraticaServiceImpl extends StoricoSoggettoPraticaServiceBaseImpl { /* * NOTE FOR DEVELOPERS: * - * Never reference this interface directly. Always use {@link it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil} to access the storico soggetto pratica remote service. + * Never reference this interface directly. Always use {@link + * it.tref.liferay.portos.bo.service.StoricoSoggettoPraticaServiceUtil} to access the storico soggetto pratica + * remote service. */ } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java index 80e3ff5f..efd62ba6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/TempisticaLocalServiceImpl.java @@ -1,13 +1,13 @@ /** * Copyright (c) 2000-present Liferay, Inc. All rights reserved. * - * This library is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General + * Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without - * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. */ package it.tref.liferay.portos.bo.service.impl; @@ -19,6 +19,7 @@ import it.tref.liferay.portos.bo.model.impl.TempisticaImpl; import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.base.TempisticaLocalServiceBaseImpl; +import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import java.text.SimpleDateFormat; @@ -37,6 +38,7 @@ import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.OrderByComparatorFactoryUtil; +import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.model.User; import com.liferay.portal.service.ServiceContext; @@ -44,13 +46,12 @@ import com.liferay.portal.service.ServiceContext; * The implementation of the tempistica local service. * *

- * All custom service methods should be put in this class. Whenever methods are added, rerun - * ServiceBuilder to copy their definitions into the - * {@link it.tref.liferay.portos.bo.service.TempisticaLocalService} interface. + * All custom service methods should be put in this class. Whenever methods are added, rerun ServiceBuilder to copy + * their definitions into the {@link it.tref.liferay.portos.bo.service.TempisticaLocalService} interface. * *

- * This is a local service. Methods of this service will not have security checks based on the - * propagated JAAS credentials because this service can only be accessed from within the same VM. + * This is a local service. Methods of this service will not have security checks based on the propagated JAAS + * credentials because this service can only be accessed from within the same VM. *

* * @author Davide Barbagallo, 3F Consulting @@ -60,36 +61,32 @@ import com.liferay.portal.service.ServiceContext; public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { /* * NOTE FOR DEVELOPERS: Never reference this interface directly. Always use {@link - * it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil} to access the tempistica local - * service. + * it.tref.liferay.portos.bo.service.TempisticaLocalServiceUtil} to access the tempistica local service. */ private static Log _log = LogFactoryUtil.getLog(TempisticaLocalServiceImpl.class); + @Override public Tempistica addTempistica(long intPraticaId, long dettPraticaId, String tipo, Date start, ServiceContext serviceContext) throws SystemException { User user = userLocalService.fetchUser(serviceContext.getUserId()); - Date now = new Date(); - - Tempistica tempistica = - tempisticaLocalService.createTempistica(counterLocalService.increment(Tempistica.class.getName())); - + Tempistica tempistica = tempisticaLocalService.createTempistica(counterLocalService.increment(Tempistica.class + .getName())); tempistica.setCompanyId(serviceContext.getCompanyId()); tempistica.setGroupId(serviceContext.getScopeGroupId()); tempistica.setUserId(serviceContext.getUserId()); tempistica.setUserName(user.getFullName()); tempistica.setCreateDate(serviceContext.getCreateDate(now)); tempistica.setModifiedDate(serviceContext.getModifiedDate(now)); - tempistica.setIntPraticaId(intPraticaId); tempistica.setDettPraticaId(dettPraticaId); tempistica.setTipo(tipo); tempistica.setStart(DateUtils.truncate(start, Calendar.DATE).getTime()); - return tempisticaLocalService.addTempistica(tempistica); } + @Override public Tempistica stopTempistica(long tempisticaId, Date stop) throws SystemException { Tempistica tempistica = tempisticaLocalService.fetchTempistica(tempisticaId); @@ -97,6 +94,7 @@ public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { return tempisticaLocalService.updateTempistica(tempistica); } + @Override public Tempistica ravvioTempistica(long tempisticaId, Date date) throws SystemException { Tempistica tempistica = tempisticaLocalService.fetchTempistica(tempisticaId); @@ -106,6 +104,7 @@ public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { return tempisticaLocalService.updateTempistica(tempistica); } + @Override public Tempistica concludiTempistica(long tempisticaId, Date stop) throws SystemException { Tempistica tempistica = tempisticaLocalService.fetchTempistica(tempisticaId); @@ -114,152 +113,166 @@ public class TempisticaLocalServiceImpl extends TempisticaLocalServiceBaseImpl { return tempisticaLocalService.updateTempistica(tempistica); } + @Override public Tempistica getTempistica(long companyId, long intPraticaId, String tipo, boolean completo) throws SystemException { - List tempistiche = - tempisticaPersistence.findByC_IntPratica_Tipo_Completo(companyId, intPraticaId, tipo, completo, 0, 1, - OrderByComparatorFactoryUtil.create(TempisticaImpl.TABLE_NAME, "createDate", false)); + List tempistiche = tempisticaPersistence.findByC_IntPratica_Tipo_Completo(companyId, intPraticaId, + tipo, completo, 0, 1, + OrderByComparatorFactoryUtil.create(TempisticaImpl.TABLE_NAME, "createDate", false)); return !tempistiche.isEmpty() ? tempistiche.get(0) : null; } + @Override public int countScadenzePraticheInScadenza(long companyId, long groupId) { return tempisticaFinder.countScadenzePraticheInScadenza(companyId, groupId); } + @Override public int countScadenzePraticheScadute(long companyId, long groupId) { return tempisticaFinder.countScadenzePraticheScadute(companyId, groupId); } + @Override public int countScadenzeIntegrazioniScadute(long companyId, long groupId) { return tempisticaFinder.countScadenzeIntegrazioniScadute(companyId, groupId); } + @Override public int countPraticheAttive(long companyId, long groupId) { return tempisticaFinder.countPraticheAttive(companyId, groupId); } - //ADT - BUG-14 - Scadenziario - //ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca - public List getScadenzePratiche(long companyId, long groupId, int start, int end, Integer statoPratica, String tipoPratica, String istruttore) throws SystemException { - _log.info("getScadenzePratiche statoPratica="+statoPratica); + // ADT - BUG-14 - Scadenziario + // ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca + @Override + public List getScadenzePratiche(long companyId, long groupId, int start, int end, Integer statoPratica, + String tipoPratica, String istruttore) throws SystemException { + + _log.info("getScadenzePratiche statoPratica=" + statoPratica); return tempisticaFinder.scadenzePratiche(companyId, groupId, start, end, statoPratica, tipoPratica, istruttore); } - //ADT - BUG-14 - Scadenziario - //ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca + // ADT - BUG-14 - Scadenziario + // ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca + @Override public List getScadenzeIntegrazioni(long companyId, long groupId, int start, int end, Integer statoPratica) throws SystemException { return tempisticaFinder.scadenzeIntegrazioni(companyId, groupId, start, end, statoPratica); } - - //ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca - public int countScadenzePratiche(long companyId, long groupId, Integer statoPratica, String tipoPratica, String istruttore) throws SystemException { + + // ADT - BUG-29 - Scadenziario / Creazione Filtri Ricerca + @Override + public int countScadenzePratiche(long companyId, long groupId, Integer statoPratica, String tipoPratica, + String istruttore) throws SystemException { return tempisticaFinder.countScadenzePratiche(companyId, groupId, statoPratica, tipoPratica, istruttore); } + @Override public int countScadenzeIntegrazioni(long companyId, long groupId) throws SystemException { return tempisticaFinder.countScadenzeIntegrazioni(companyId, groupId); } - public Tempistica fetchByOldTempisticaId(long oldTempisticaId) throws SystemException { - - return tempisticaPersistence.fetchByOldTempisticaId(oldTempisticaId); - } - + @Override public List findByIntPratica_Tipo(long intPraticaId, String tipo) throws SystemException { return tempisticaPersistence.findByIntPratica_Tipo(intPraticaId, tipo); } + @Override public int countPraticheScaduteAutorizzazione(long companyId, long groupId) throws SystemException { return tempisticaFinder.countPraticheScaduteAutorizzazione(companyId, groupId); } + @Override public int countPraticheScaduteSorteggiate(long companyId, long groupId) throws SystemException { return tempisticaFinder.countPraticheScaduteSorteggiate(companyId, groupId); } + @Override public int countPraticheScaduteControlloObbligatorio(long companyId, long groupId) throws SystemException { return tempisticaFinder.countPraticheScaduteControlloObbligatorio(companyId, groupId); } - + + @Override public int countPraticheInScadenzaAutorizzazioni(long companyId, long groupId) throws SystemException { return tempisticaFinder.countPraticheInScadenzaAutorizzazioni(companyId, groupId); } + @Override public int countPraticheInScadenzaSorteggiate(long companyId, long groupId) throws SystemException { return tempisticaFinder.countPraticheInScadenzaSorteggiate(companyId, groupId); } + @Override public int countPraticheInScadenzaControlloObbligatorio(long companyId, long groupId) throws SystemException { return tempisticaFinder.countPraticheInScadenzaControlloObbligatorio(companyId, groupId); } - + + @Override public List praticheAttiveAutorizzazioni(long companyId, long groupId) throws SystemException { return tempisticaFinder.praticheAttiveAutorizzazioni(companyId, groupId); } + @Override public List praticheAttiveSorteggiate(long companyId, long groupId) throws SystemException { return tempisticaFinder.praticheAttiveSorteggiate(companyId, groupId); } + @Override public List praticheAttiveControlloObbligatorio(long companyId, long groupId) throws SystemException { return tempisticaFinder.praticheAttiveControlloObbligatorio(companyId, groupId); } - public String getDtSottopostaAParere(long intPraticaId) throws SystemException{ + @Override + public String getDtSottopostaAParere(long intPraticaId) throws SystemException { SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - - ////////////////////ADT: BUG SCADENZARIO - DettPratica dettPratica=DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); - if (dettPratica!=null&&dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)){ - Date d=dettPratica.getDtProtocollo(); - if (d!=null) + + // //////////////////ADT: BUG SCADENZARIO + DettPratica dettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); + if (dettPratica != null && dettPratica.getTipoIntegrazione().equals(TipoIntegrazioneUtil.VARIANTE)) { + Date d = dettPratica.getDtProtocollo(); + if (d != null) { return sdf.format(d); + } } - ////////////// - - - DynamicQuery queryAvv = DynamicQueryFactoryUtil.forClass(Avviso.class); - queryAvv.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); - queryAvv.add(RestrictionsFactoryUtil.eq("tipoDocumento", "SP")); - queryAvv.add(RestrictionsFactoryUtil.eq("className", DettPratica.class.getName())); - - Order defaultOrder = OrderFactoryUtil.desc("createDate"); - queryAvv.addOrder(defaultOrder); - - List listaAvv = AvvisoLocalServiceUtil.dynamicQuery(queryAvv); - if(listaAvv != null && !listaAvv.isEmpty()){ - return sdf.format(listaAvv.get(0).getDtInvio()); - } else { - return ""; - } - + queryAvv.add(RestrictionsFactoryUtil.eq("intPraticaId", intPraticaId)); + queryAvv.add(RestrictionsFactoryUtil.eq("tipoDocumento", StatoPraticaConstants.SOTTOPOSTA_A_PARERE)); + queryAvv.add(RestrictionsFactoryUtil.eq("className", DettPratica.class.getName())); + Order defaultOrder = OrderFactoryUtil.desc("createDate"); + queryAvv.addOrder(defaultOrder); + List listaAvv = AvvisoLocalServiceUtil.dynamicQuery(queryAvv); + if (listaAvv != null && !listaAvv.isEmpty()) { + return sdf.format(listaAvv.get(0).getDtInvio()); + } else { + return StringPool.BLANK; + } } - - public List countPraticheAttivePerDiscriminazione(long companyId, long groupId){ + + @Override + public List countPraticheAttivePerDiscriminazione(long companyId, long groupId) { return tempisticaFinder.countPraticheAttivePerDiscriminazione(companyId, groupId); } - - public List scadenzePraticheForBackwardCompatibility(long companyId, long groupId, int start, int end){ + + @Override + public List scadenzePraticheForBackwardCompatibility(long companyId, long groupId, int start, int end) { return tempisticaFinder.scadenzePraticheForBackwardCompatibility(companyId, groupId, start, end); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java index 4ce032ca..02dcaba3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/CollaudoPersistenceImpl.java @@ -4759,226 +4759,6 @@ public class CollaudoPersistenceImpl extends BasePersistenceImpl private static final String _FINDER_COLUMN_INTPRATICAID_PARZIALE_INTPRATICAID_2 = "collaudo.intPraticaId = ? AND "; private static final String _FINDER_COLUMN_INTPRATICAID_PARZIALE_PARZIALE_2 = "collaudo.parziale = ?"; - public static final FinderPath FINDER_PATH_FETCH_BY_OLDDETTPRATICAID = new FinderPath(CollaudoModelImpl.ENTITY_CACHE_ENABLED, - CollaudoModelImpl.FINDER_CACHE_ENABLED, CollaudoImpl.class, - FINDER_CLASS_NAME_ENTITY, "fetchByOldDettPraticaId", - new String[] { Long.class.getName() }, - CollaudoModelImpl.OLDDETTPRATICAID_COLUMN_BITMASK); - public static final FinderPath FINDER_PATH_COUNT_BY_OLDDETTPRATICAID = new FinderPath(CollaudoModelImpl.ENTITY_CACHE_ENABLED, - CollaudoModelImpl.FINDER_CACHE_ENABLED, Long.class, - FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, - "countByOldDettPraticaId", new String[] { Long.class.getName() }); - - /** - * Returns the collaudo where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchCollaudoException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching collaudo - * @throws it.tref.liferay.portos.bo.NoSuchCollaudoException if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Collaudo findByOldDettPraticaId(long oldDettPraticaId) - throws NoSuchCollaudoException, SystemException { - Collaudo collaudo = fetchByOldDettPraticaId(oldDettPraticaId); - - if (collaudo == null) { - StringBundler msg = new StringBundler(4); - - msg.append(_NO_SUCH_ENTITY_WITH_KEY); - - msg.append("oldDettPraticaId="); - msg.append(oldDettPraticaId); - - msg.append(StringPool.CLOSE_CURLY_BRACE); - - if (_log.isWarnEnabled()) { - _log.warn(msg.toString()); - } - - throw new NoSuchCollaudoException(msg.toString()); - } - - return collaudo; - } - - /** - * Returns the collaudo where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching collaudo, or null if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Collaudo fetchByOldDettPraticaId(long oldDettPraticaId) - throws SystemException { - return fetchByOldDettPraticaId(oldDettPraticaId, true); - } - - /** - * Returns the collaudo where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching collaudo, or null if a matching collaudo could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Collaudo fetchByOldDettPraticaId(long oldDettPraticaId, - boolean retrieveFromCache) throws SystemException { - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Object result = null; - - if (retrieveFromCache) { - result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, this); - } - - if (result instanceof Collaudo) { - Collaudo collaudo = (Collaudo)result; - - if ((oldDettPraticaId != collaudo.getOldDettPraticaId())) { - result = null; - } - } - - if (result == null) { - StringBundler query = new StringBundler(3); - - query.append(_SQL_SELECT_COLLAUDO_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - List list = q.list(); - - if (list.isEmpty()) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, list); - } - else { - if ((list.size() > 1) && _log.isWarnEnabled()) { - _log.warn( - "CollaudoPersistenceImpl.fetchByOldDettPraticaId(long, boolean) with parameters (" + - StringUtil.merge(finderArgs) + - ") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder."); - } - - Collaudo collaudo = list.get(0); - - result = collaudo; - - cacheResult(collaudo); - - if ((collaudo.getOldDettPraticaId() != oldDettPraticaId)) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, collaudo); - } - } - } - catch (Exception e) { - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - if (result instanceof List) { - return null; - } - else { - return (Collaudo)result; - } - } - - /** - * Removes the collaudo where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the collaudo that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public Collaudo removeByOldDettPraticaId(long oldDettPraticaId) - throws NoSuchCollaudoException, SystemException { - Collaudo collaudo = findByOldDettPraticaId(oldDettPraticaId); - - return remove(collaudo); - } - - /** - * Returns the number of collaudos where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching collaudos - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldDettPraticaId(long oldDettPraticaId) - throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDDETTPRATICAID; - - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_COLLAUDO_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2 = - "collaudo.oldDettPraticaId = ?"; public CollaudoPersistenceImpl() { setModelClass(Collaudo.class); @@ -5006,9 +4786,6 @@ public class CollaudoPersistenceImpl extends BasePersistenceImpl collaudo.getProtocollo() }, collaudo); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - new Object[] { collaudo.getOldDettPraticaId() }, collaudo); - collaudo.resetOriginalValues(); } @@ -5109,13 +4886,6 @@ public class CollaudoPersistenceImpl extends BasePersistenceImpl args, Long.valueOf(1)); FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args, collaudo); - - args = new Object[] { collaudo.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args, collaudo); } else { CollaudoModelImpl collaudoModelImpl = (CollaudoModelImpl)collaudo; @@ -5154,16 +4924,6 @@ public class CollaudoPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args, collaudo); } - - if ((collaudoModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICAID.getColumnBitmask()) != 0) { - Object[] args = new Object[] { collaudo.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args, collaudo); - } } } @@ -5220,21 +4980,6 @@ public class CollaudoPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args); } - - args = new Object[] { collaudo.getOldDettPraticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, args); - - if ((collaudoModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICAID.getColumnBitmask()) != 0) { - args = new Object[] { collaudoModelImpl.getOriginalOldDettPraticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args); - } } /** @@ -5580,7 +5325,6 @@ public class CollaudoPersistenceImpl extends BasePersistenceImpl collaudoImpl.setMezzoPagamento(collaudo.getMezzoPagamento()); collaudoImpl.setNormEsenteBollo(collaudo.isNormEsenteBollo()); collaudoImpl.setImportoBolli(collaudo.getImportoBolli()); - collaudoImpl.setOldDettPraticaId(collaudo.getOldDettPraticaId()); return collaudoImpl; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java index 2b25c300..54e6cd24 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DettPraticaPersistenceImpl.java @@ -2496,226 +2496,6 @@ public class DettPraticaPersistenceImpl extends BasePersistenceImpl private static final String _FINDER_COLUMN_C_G_PROTOCOLLO_PROTOCOLLO_1 = "dettPratica.protocollo IS NULL"; private static final String _FINDER_COLUMN_C_G_PROTOCOLLO_PROTOCOLLO_2 = "dettPratica.protocollo = ?"; private static final String _FINDER_COLUMN_C_G_PROTOCOLLO_PROTOCOLLO_3 = "(dettPratica.protocollo IS NULL OR dettPratica.protocollo = '')"; - public static final FinderPath FINDER_PATH_FETCH_BY_OLDDETTPRATICA = new FinderPath(DettPraticaModelImpl.ENTITY_CACHE_ENABLED, - DettPraticaModelImpl.FINDER_CACHE_ENABLED, DettPraticaImpl.class, - FINDER_CLASS_NAME_ENTITY, "fetchByOldDettPratica", - new String[] { Long.class.getName() }, - DettPraticaModelImpl.OLDDETTPRATICAID_COLUMN_BITMASK); - public static final FinderPath FINDER_PATH_COUNT_BY_OLDDETTPRATICA = new FinderPath(DettPraticaModelImpl.ENTITY_CACHE_ENABLED, - DettPraticaModelImpl.FINDER_CACHE_ENABLED, Long.class, - FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByOldDettPratica", - new String[] { Long.class.getName() }); - - /** - * Returns the dett pratica where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDettPraticaException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica - * @throws it.tref.liferay.portos.bo.NoSuchDettPraticaException if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica findByOldDettPratica(long oldDettPraticaId) - throws NoSuchDettPraticaException, SystemException { - DettPratica dettPratica = fetchByOldDettPratica(oldDettPraticaId); - - if (dettPratica == null) { - StringBundler msg = new StringBundler(4); - - msg.append(_NO_SUCH_ENTITY_WITH_KEY); - - msg.append("oldDettPraticaId="); - msg.append(oldDettPraticaId); - - msg.append(StringPool.CLOSE_CURLY_BRACE); - - if (_log.isWarnEnabled()) { - _log.warn(msg.toString()); - } - - throw new NoSuchDettPraticaException(msg.toString()); - } - - return dettPratica; - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica fetchByOldDettPratica(long oldDettPraticaId) - throws SystemException { - return fetchByOldDettPratica(oldDettPraticaId, true); - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica fetchByOldDettPratica(long oldDettPraticaId, - boolean retrieveFromCache) throws SystemException { - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Object result = null; - - if (retrieveFromCache) { - result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - finderArgs, this); - } - - if (result instanceof DettPratica) { - DettPratica dettPratica = (DettPratica)result; - - if ((oldDettPraticaId != dettPratica.getOldDettPraticaId())) { - result = null; - } - } - - if (result == null) { - StringBundler query = new StringBundler(3); - - query.append(_SQL_SELECT_DETTPRATICA_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICA_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - List list = q.list(); - - if (list.isEmpty()) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - finderArgs, list); - } - else { - if ((list.size() > 1) && _log.isWarnEnabled()) { - _log.warn( - "DettPraticaPersistenceImpl.fetchByOldDettPratica(long, boolean) with parameters (" + - StringUtil.merge(finderArgs) + - ") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder."); - } - - DettPratica dettPratica = list.get(0); - - result = dettPratica; - - cacheResult(dettPratica); - - if ((dettPratica.getOldDettPraticaId() != oldDettPraticaId)) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - finderArgs, dettPratica); - } - } - } - catch (Exception e) { - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - if (result instanceof List) { - return null; - } - else { - return (DettPratica)result; - } - } - - /** - * Removes the dett pratica where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the dett pratica that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica removeByOldDettPratica(long oldDettPraticaId) - throws NoSuchDettPraticaException, SystemException { - DettPratica dettPratica = findByOldDettPratica(oldDettPraticaId); - - return remove(dettPratica); - } - - /** - * Returns the number of dett praticas where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching dett praticas - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldDettPratica(long oldDettPraticaId) - throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDDETTPRATICA; - - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_DETTPRATICA_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICA_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDDETTPRATICA_OLDDETTPRATICAID_2 = - "dettPratica.oldDettPraticaId = ?"; public static final FinderPath FINDER_PATH_WITH_PAGINATION_FIND_BY_INTPRATICAID_TIPOINTEGRAZIONE_COMPLETA = new FinderPath(DettPraticaModelImpl.ENTITY_CACHE_ENABLED, DettPraticaModelImpl.FINDER_CACHE_ENABLED, DettPraticaImpl.class, @@ -3952,226 +3732,6 @@ public class DettPraticaPersistenceImpl extends BasePersistenceImpl "dettPratica.tipoIntegrazione = ?"; private static final String _FINDER_COLUMN_INTPRATICAID_TIPOINTEGRAZIONE_TIPOINTEGRAZIONE_3 = "(dettPratica.tipoIntegrazione IS NULL OR dettPratica.tipoIntegrazione = '')"; - public static final FinderPath FINDER_PATH_FETCH_BY_OLDDETTPRATICAID = new FinderPath(DettPraticaModelImpl.ENTITY_CACHE_ENABLED, - DettPraticaModelImpl.FINDER_CACHE_ENABLED, DettPraticaImpl.class, - FINDER_CLASS_NAME_ENTITY, "fetchByOldDettPraticaId", - new String[] { Long.class.getName() }, - DettPraticaModelImpl.OLDDETTPRATICAID_COLUMN_BITMASK); - public static final FinderPath FINDER_PATH_COUNT_BY_OLDDETTPRATICAID = new FinderPath(DettPraticaModelImpl.ENTITY_CACHE_ENABLED, - DettPraticaModelImpl.FINDER_CACHE_ENABLED, Long.class, - FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, - "countByOldDettPraticaId", new String[] { Long.class.getName() }); - - /** - * Returns the dett pratica where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDettPraticaException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica - * @throws it.tref.liferay.portos.bo.NoSuchDettPraticaException if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica findByOldDettPraticaId(long oldDettPraticaId) - throws NoSuchDettPraticaException, SystemException { - DettPratica dettPratica = fetchByOldDettPraticaId(oldDettPraticaId); - - if (dettPratica == null) { - StringBundler msg = new StringBundler(4); - - msg.append(_NO_SUCH_ENTITY_WITH_KEY); - - msg.append("oldDettPraticaId="); - msg.append(oldDettPraticaId); - - msg.append(StringPool.CLOSE_CURLY_BRACE); - - if (_log.isWarnEnabled()) { - _log.warn(msg.toString()); - } - - throw new NoSuchDettPraticaException(msg.toString()); - } - - return dettPratica; - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica fetchByOldDettPraticaId(long oldDettPraticaId) - throws SystemException { - return fetchByOldDettPraticaId(oldDettPraticaId, true); - } - - /** - * Returns the dett pratica where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching dett pratica, or null if a matching dett pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica fetchByOldDettPraticaId(long oldDettPraticaId, - boolean retrieveFromCache) throws SystemException { - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Object result = null; - - if (retrieveFromCache) { - result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, this); - } - - if (result instanceof DettPratica) { - DettPratica dettPratica = (DettPratica)result; - - if ((oldDettPraticaId != dettPratica.getOldDettPraticaId())) { - result = null; - } - } - - if (result == null) { - StringBundler query = new StringBundler(3); - - query.append(_SQL_SELECT_DETTPRATICA_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - List list = q.list(); - - if (list.isEmpty()) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, list); - } - else { - if ((list.size() > 1) && _log.isWarnEnabled()) { - _log.warn( - "DettPraticaPersistenceImpl.fetchByOldDettPraticaId(long, boolean) with parameters (" + - StringUtil.merge(finderArgs) + - ") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder."); - } - - DettPratica dettPratica = list.get(0); - - result = dettPratica; - - cacheResult(dettPratica); - - if ((dettPratica.getOldDettPraticaId() != oldDettPraticaId)) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, dettPratica); - } - } - } - catch (Exception e) { - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - if (result instanceof List) { - return null; - } - else { - return (DettPratica)result; - } - } - - /** - * Removes the dett pratica where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the dett pratica that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public DettPratica removeByOldDettPraticaId(long oldDettPraticaId) - throws NoSuchDettPraticaException, SystemException { - DettPratica dettPratica = findByOldDettPraticaId(oldDettPraticaId); - - return remove(dettPratica); - } - - /** - * Returns the number of dett praticas where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching dett praticas - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldDettPraticaId(long oldDettPraticaId) - throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDDETTPRATICAID; - - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_DETTPRATICA_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2 = - "dettPratica.oldDettPraticaId = ?"; public DettPraticaPersistenceImpl() { setModelClass(DettPratica.class); @@ -4200,12 +3760,6 @@ public class DettPraticaPersistenceImpl extends BasePersistenceImpl dettPratica.getProtocollo() }, dettPratica); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - new Object[] { dettPratica.getOldDettPraticaId() }, dettPratica); - - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - new Object[] { dettPratica.getOldDettPraticaId() }, dettPratica); - dettPratica.resetOriginalValues(); } @@ -4306,20 +3860,6 @@ public class DettPraticaPersistenceImpl extends BasePersistenceImpl args, Long.valueOf(1)); FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args, dettPratica); - - args = new Object[] { dettPratica.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICA, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - args, dettPratica); - - args = new Object[] { dettPratica.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args, dettPratica); } else { DettPraticaModelImpl dettPraticaModelImpl = (DettPraticaModelImpl)dettPratica; @@ -4358,26 +3898,6 @@ public class DettPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args, dettPratica); } - - if ((dettPraticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICA.getColumnBitmask()) != 0) { - Object[] args = new Object[] { dettPratica.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICA, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - args, dettPratica); - } - - if ((dettPraticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICAID.getColumnBitmask()) != 0) { - Object[] args = new Object[] { dettPratica.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args, dettPratica); - } } } @@ -4436,40 +3956,6 @@ public class DettPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args); } - - args = new Object[] { dettPratica.getOldDettPraticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICA, args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, args); - - if ((dettPraticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICA.getColumnBitmask()) != 0) { - args = new Object[] { - dettPraticaModelImpl.getOriginalOldDettPraticaId() - }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICA, - args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICA, - args); - } - - args = new Object[] { dettPratica.getOldDettPraticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, args); - - if ((dettPraticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICAID.getColumnBitmask()) != 0) { - args = new Object[] { - dettPraticaModelImpl.getOriginalOldDettPraticaId() - }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args); - } } /** @@ -4783,7 +4269,6 @@ public class DettPraticaPersistenceImpl extends BasePersistenceImpl dettPraticaImpl.setWorkflowForzato(dettPratica.isWorkflowForzato()); dettPraticaImpl.setSoggettoSostituitoId(dettPratica.getSoggettoSostituitoId()); dettPraticaImpl.setDtInvioSignal(dettPratica.getDtInvioSignal()); - dettPraticaImpl.setOldDettPraticaId(dettPratica.getOldDettPraticaId()); dettPraticaImpl.setDestinazione(dettPratica.getDestinazione()); dettPraticaImpl.setAg(dettPratica.getAg()); dettPraticaImpl.setDescLongIntervento(dettPratica.getDescLongIntervento()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java index 255330f7..04f271fe 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/DocPraticaPersistenceImpl.java @@ -1671,225 +1671,6 @@ public class DocPraticaPersistenceImpl extends BasePersistenceImpl } private static final String _FINDER_COLUMN_DLFILEENTRY_DLFILEENTRYID_2 = "docPratica.dlFileEntryId = ?"; - public static final FinderPath FINDER_PATH_FETCH_BY_OLDDOCPRATICA = new FinderPath(DocPraticaModelImpl.ENTITY_CACHE_ENABLED, - DocPraticaModelImpl.FINDER_CACHE_ENABLED, DocPraticaImpl.class, - FINDER_CLASS_NAME_ENTITY, "fetchByOldDocPratica", - new String[] { Long.class.getName() }, - DocPraticaModelImpl.OLDDOCPRATICAID_COLUMN_BITMASK); - public static final FinderPath FINDER_PATH_COUNT_BY_OLDDOCPRATICA = new FinderPath(DocPraticaModelImpl.ENTITY_CACHE_ENABLED, - DocPraticaModelImpl.FINDER_CACHE_ENABLED, Long.class, - FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByOldDocPratica", - new String[] { Long.class.getName() }); - - /** - * Returns the doc pratica where oldDocPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchDocPraticaException} if it could not be found. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the matching doc pratica - * @throws it.tref.liferay.portos.bo.NoSuchDocPraticaException if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DocPratica findByOldDocPratica(long oldDocPraticaId) - throws NoSuchDocPraticaException, SystemException { - DocPratica docPratica = fetchByOldDocPratica(oldDocPraticaId); - - if (docPratica == null) { - StringBundler msg = new StringBundler(4); - - msg.append(_NO_SUCH_ENTITY_WITH_KEY); - - msg.append("oldDocPraticaId="); - msg.append(oldDocPraticaId); - - msg.append(StringPool.CLOSE_CURLY_BRACE); - - if (_log.isWarnEnabled()) { - _log.warn(msg.toString()); - } - - throw new NoSuchDocPraticaException(msg.toString()); - } - - return docPratica; - } - - /** - * Returns the doc pratica where oldDocPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the matching doc pratica, or null if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DocPratica fetchByOldDocPratica(long oldDocPraticaId) - throws SystemException { - return fetchByOldDocPratica(oldDocPraticaId, true); - } - - /** - * Returns the doc pratica where oldDocPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDocPraticaId the old doc pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching doc pratica, or null if a matching doc pratica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public DocPratica fetchByOldDocPratica(long oldDocPraticaId, - boolean retrieveFromCache) throws SystemException { - Object[] finderArgs = new Object[] { oldDocPraticaId }; - - Object result = null; - - if (retrieveFromCache) { - result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, - finderArgs, this); - } - - if (result instanceof DocPratica) { - DocPratica docPratica = (DocPratica)result; - - if ((oldDocPraticaId != docPratica.getOldDocPraticaId())) { - result = null; - } - } - - if (result == null) { - StringBundler query = new StringBundler(3); - - query.append(_SQL_SELECT_DOCPRATICA_WHERE); - - query.append(_FINDER_COLUMN_OLDDOCPRATICA_OLDDOCPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDocPraticaId); - - List list = q.list(); - - if (list.isEmpty()) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, - finderArgs, list); - } - else { - if ((list.size() > 1) && _log.isWarnEnabled()) { - _log.warn( - "DocPraticaPersistenceImpl.fetchByOldDocPratica(long, boolean) with parameters (" + - StringUtil.merge(finderArgs) + - ") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder."); - } - - DocPratica docPratica = list.get(0); - - result = docPratica; - - cacheResult(docPratica); - - if ((docPratica.getOldDocPraticaId() != oldDocPraticaId)) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, - finderArgs, docPratica); - } - } - } - catch (Exception e) { - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, - finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - if (result instanceof List) { - return null; - } - else { - return (DocPratica)result; - } - } - - /** - * Removes the doc pratica where oldDocPraticaId = ? from the database. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the doc pratica that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public DocPratica removeByOldDocPratica(long oldDocPraticaId) - throws NoSuchDocPraticaException, SystemException { - DocPratica docPratica = findByOldDocPratica(oldDocPraticaId); - - return remove(docPratica); - } - - /** - * Returns the number of doc praticas where oldDocPraticaId = ?. - * - * @param oldDocPraticaId the old doc pratica ID - * @return the number of matching doc praticas - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldDocPratica(long oldDocPraticaId) - throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDDOCPRATICA; - - Object[] finderArgs = new Object[] { oldDocPraticaId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_DOCPRATICA_WHERE); - - query.append(_FINDER_COLUMN_OLDDOCPRATICA_OLDDOCPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDocPraticaId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDDOCPRATICA_OLDDOCPRATICAID_2 = "docPratica.oldDocPraticaId = ?"; public static final FinderPath FINDER_PATH_WITH_PAGINATION_FIND_BY_INTPRATICA = new FinderPath(DocPraticaModelImpl.ENTITY_CACHE_ENABLED, DocPraticaModelImpl.FINDER_CACHE_ENABLED, DocPraticaImpl.class, @@ -7214,9 +6995,6 @@ public class DocPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_DLFILEENTRY, new Object[] { docPratica.getDlFileEntryId() }, docPratica); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, - new Object[] { docPratica.getOldDocPraticaId() }, docPratica); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_DLFILEENTRY_VERSION, new Object[] { docPratica.getDlFileEntryId(), docPratica.getVersion() }, docPratica); @@ -7312,13 +7090,6 @@ public class DocPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_DLFILEENTRY, args, docPratica); - args = new Object[] { docPratica.getOldDocPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDOCPRATICA, args, - Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, args, - docPratica); - args = new Object[] { docPratica.getDlFileEntryId(), docPratica.getVersion() }; @@ -7353,16 +7124,6 @@ public class DocPraticaPersistenceImpl extends BasePersistenceImpl args, docPratica); } - if ((docPraticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDOCPRATICA.getColumnBitmask()) != 0) { - Object[] args = new Object[] { docPratica.getOldDocPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDOCPRATICA, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, - args, docPratica); - } - if ((docPraticaModelImpl.getColumnBitmask() & FINDER_PATH_FETCH_BY_DLFILEENTRY_VERSION.getColumnBitmask()) != 0) { Object[] args = new Object[] { @@ -7411,21 +7172,6 @@ public class DocPraticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_DLFILEENTRY, args); } - args = new Object[] { docPratica.getOldDocPraticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDOCPRATICA, args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, args); - - if ((docPraticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDOCPRATICA.getColumnBitmask()) != 0) { - args = new Object[] { docPraticaModelImpl.getOriginalOldDocPraticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDOCPRATICA, - args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDOCPRATICA, - args); - } - args = new Object[] { docPratica.getDlFileEntryId(), docPratica.getVersion() }; @@ -7852,7 +7598,6 @@ public class DocPraticaPersistenceImpl extends BasePersistenceImpl docPraticaImpl.setJsonFirmatari(docPratica.getJsonFirmatari()); docPraticaImpl.setStatus(docPratica.getStatus()); docPraticaImpl.setErrorCode(docPratica.getErrorCode()); - docPraticaImpl.setOldDocPraticaId(docPratica.getOldDocPraticaId()); docPraticaImpl.setRimosso(docPratica.isRimosso()); docPraticaImpl.setDettPraticaIdRimozione(docPratica.getDettPraticaIdRimozione()); docPraticaImpl.setDtDataRimozione(docPratica.getDtDataRimozione()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java index 7ba24480..15f0504f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/FineLavoriPersistenceImpl.java @@ -5356,226 +5356,6 @@ public class FineLavoriPersistenceImpl extends BasePersistenceImpl "fineLavori.parziale = ? AND "; private static final String _FINDER_COLUMN_INTPRATICAID_PARZIALE_COMPLETATA_COMPLETATA_2 = "fineLavori.completata = ?"; - public static final FinderPath FINDER_PATH_FETCH_BY_OLDDETTPRATICAID = new FinderPath(FineLavoriModelImpl.ENTITY_CACHE_ENABLED, - FineLavoriModelImpl.FINDER_CACHE_ENABLED, FineLavoriImpl.class, - FINDER_CLASS_NAME_ENTITY, "fetchByOldDettPraticaId", - new String[] { Long.class.getName() }, - FineLavoriModelImpl.OLDDETTPRATICAID_COLUMN_BITMASK); - public static final FinderPath FINDER_PATH_COUNT_BY_OLDDETTPRATICAID = new FinderPath(FineLavoriModelImpl.ENTITY_CACHE_ENABLED, - FineLavoriModelImpl.FINDER_CACHE_ENABLED, Long.class, - FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, - "countByOldDettPraticaId", new String[] { Long.class.getName() }); - - /** - * Returns the fine lavori where oldDettPraticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchFineLavoriException} if it could not be found. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching fine lavori - * @throws it.tref.liferay.portos.bo.NoSuchFineLavoriException if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public FineLavori findByOldDettPraticaId(long oldDettPraticaId) - throws NoSuchFineLavoriException, SystemException { - FineLavori fineLavori = fetchByOldDettPraticaId(oldDettPraticaId); - - if (fineLavori == null) { - StringBundler msg = new StringBundler(4); - - msg.append(_NO_SUCH_ENTITY_WITH_KEY); - - msg.append("oldDettPraticaId="); - msg.append(oldDettPraticaId); - - msg.append(StringPool.CLOSE_CURLY_BRACE); - - if (_log.isWarnEnabled()) { - _log.warn(msg.toString()); - } - - throw new NoSuchFineLavoriException(msg.toString()); - } - - return fineLavori; - } - - /** - * Returns the fine lavori where oldDettPraticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the matching fine lavori, or null if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public FineLavori fetchByOldDettPraticaId(long oldDettPraticaId) - throws SystemException { - return fetchByOldDettPraticaId(oldDettPraticaId, true); - } - - /** - * Returns the fine lavori where oldDettPraticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldDettPraticaId the old dett pratica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching fine lavori, or null if a matching fine lavori could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public FineLavori fetchByOldDettPraticaId(long oldDettPraticaId, - boolean retrieveFromCache) throws SystemException { - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Object result = null; - - if (retrieveFromCache) { - result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, this); - } - - if (result instanceof FineLavori) { - FineLavori fineLavori = (FineLavori)result; - - if ((oldDettPraticaId != fineLavori.getOldDettPraticaId())) { - result = null; - } - } - - if (result == null) { - StringBundler query = new StringBundler(3); - - query.append(_SQL_SELECT_FINELAVORI_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - List list = q.list(); - - if (list.isEmpty()) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, list); - } - else { - if ((list.size() > 1) && _log.isWarnEnabled()) { - _log.warn( - "FineLavoriPersistenceImpl.fetchByOldDettPraticaId(long, boolean) with parameters (" + - StringUtil.merge(finderArgs) + - ") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder."); - } - - FineLavori fineLavori = list.get(0); - - result = fineLavori; - - cacheResult(fineLavori); - - if ((fineLavori.getOldDettPraticaId() != oldDettPraticaId)) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs, fineLavori); - } - } - } - catch (Exception e) { - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - if (result instanceof List) { - return null; - } - else { - return (FineLavori)result; - } - } - - /** - * Removes the fine lavori where oldDettPraticaId = ? from the database. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the fine lavori that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public FineLavori removeByOldDettPraticaId(long oldDettPraticaId) - throws NoSuchFineLavoriException, SystemException { - FineLavori fineLavori = findByOldDettPraticaId(oldDettPraticaId); - - return remove(fineLavori); - } - - /** - * Returns the number of fine lavoris where oldDettPraticaId = ?. - * - * @param oldDettPraticaId the old dett pratica ID - * @return the number of matching fine lavoris - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldDettPraticaId(long oldDettPraticaId) - throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDDETTPRATICAID; - - Object[] finderArgs = new Object[] { oldDettPraticaId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_FINELAVORI_WHERE); - - query.append(_FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldDettPraticaId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDDETTPRATICAID_OLDDETTPRATICAID_2 = - "fineLavori.oldDettPraticaId = ?"; public FineLavoriPersistenceImpl() { setModelClass(FineLavori.class); @@ -5604,9 +5384,6 @@ public class FineLavoriPersistenceImpl extends BasePersistenceImpl fineLavori.getProtocollo() }, fineLavori); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - new Object[] { fineLavori.getOldDettPraticaId() }, fineLavori); - fineLavori.resetOriginalValues(); } @@ -5707,13 +5484,6 @@ public class FineLavoriPersistenceImpl extends BasePersistenceImpl args, Long.valueOf(1)); FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args, fineLavori); - - args = new Object[] { fineLavori.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args, fineLavori); } else { FineLavoriModelImpl fineLavoriModelImpl = (FineLavoriModelImpl)fineLavori; @@ -5752,16 +5522,6 @@ public class FineLavoriPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args, fineLavori); } - - if ((fineLavoriModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICAID.getColumnBitmask()) != 0) { - Object[] args = new Object[] { fineLavori.getOldDettPraticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args, fineLavori); - } } } @@ -5820,23 +5580,6 @@ public class FineLavoriPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_C_G_PROTOCOLLO, args); } - - args = new Object[] { fineLavori.getOldDettPraticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, args); - - if ((fineLavoriModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDDETTPRATICAID.getColumnBitmask()) != 0) { - args = new Object[] { - fineLavoriModelImpl.getOriginalOldDettPraticaId() - }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDDETTPRATICAID, - args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDDETTPRATICAID, - args); - } } /** @@ -6211,7 +5954,6 @@ public class FineLavoriPersistenceImpl extends BasePersistenceImpl fineLavoriImpl.setCausalePagamento(fineLavori.getCausalePagamento()); fineLavoriImpl.setMezzoPagamento(fineLavori.getMezzoPagamento()); fineLavoriImpl.setImportoBolli(fineLavori.getImportoBolli()); - fineLavoriImpl.setOldDettPraticaId(fineLavori.getOldDettPraticaId()); return fineLavoriImpl; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java index fc566b28..5eb63999 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/SorteggioPersistenceImpl.java @@ -1451,225 +1451,6 @@ public class SorteggioPersistenceImpl extends BasePersistenceImpl private static final String _FINDER_COLUMN_UUID_C_UUID_2 = "sorteggio.uuid = ? AND "; private static final String _FINDER_COLUMN_UUID_C_UUID_3 = "(sorteggio.uuid IS NULL OR sorteggio.uuid = '') AND "; private static final String _FINDER_COLUMN_UUID_C_COMPANYID_2 = "sorteggio.companyId = ?"; - public static final FinderPath FINDER_PATH_FETCH_BY_OLDSORTEGGIOID = new FinderPath(SorteggioModelImpl.ENTITY_CACHE_ENABLED, - SorteggioModelImpl.FINDER_CACHE_ENABLED, SorteggioImpl.class, - FINDER_CLASS_NAME_ENTITY, "fetchByOldSorteggioId", - new String[] { Long.class.getName() }, - SorteggioModelImpl.OLDSORTEGGIOID_COLUMN_BITMASK); - public static final FinderPath FINDER_PATH_COUNT_BY_OLDSORTEGGIOID = new FinderPath(SorteggioModelImpl.ENTITY_CACHE_ENABLED, - SorteggioModelImpl.FINDER_CACHE_ENABLED, Long.class, - FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, "countByOldSorteggioId", - new String[] { Long.class.getName() }); - - /** - * Returns the sorteggio where oldSorteggioId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchSorteggioException} if it could not be found. - * - * @param oldSorteggioId the old sorteggio ID - * @return the matching sorteggio - * @throws it.tref.liferay.portos.bo.NoSuchSorteggioException if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Sorteggio findByOldSorteggioId(long oldSorteggioId) - throws NoSuchSorteggioException, SystemException { - Sorteggio sorteggio = fetchByOldSorteggioId(oldSorteggioId); - - if (sorteggio == null) { - StringBundler msg = new StringBundler(4); - - msg.append(_NO_SUCH_ENTITY_WITH_KEY); - - msg.append("oldSorteggioId="); - msg.append(oldSorteggioId); - - msg.append(StringPool.CLOSE_CURLY_BRACE); - - if (_log.isWarnEnabled()) { - _log.warn(msg.toString()); - } - - throw new NoSuchSorteggioException(msg.toString()); - } - - return sorteggio; - } - - /** - * Returns the sorteggio where oldSorteggioId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldSorteggioId the old sorteggio ID - * @return the matching sorteggio, or null if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Sorteggio fetchByOldSorteggioId(long oldSorteggioId) - throws SystemException { - return fetchByOldSorteggioId(oldSorteggioId, true); - } - - /** - * Returns the sorteggio where oldSorteggioId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldSorteggioId the old sorteggio ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching sorteggio, or null if a matching sorteggio could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Sorteggio fetchByOldSorteggioId(long oldSorteggioId, - boolean retrieveFromCache) throws SystemException { - Object[] finderArgs = new Object[] { oldSorteggioId }; - - Object result = null; - - if (retrieveFromCache) { - result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - finderArgs, this); - } - - if (result instanceof Sorteggio) { - Sorteggio sorteggio = (Sorteggio)result; - - if ((oldSorteggioId != sorteggio.getOldSorteggioId())) { - result = null; - } - } - - if (result == null) { - StringBundler query = new StringBundler(3); - - query.append(_SQL_SELECT_SORTEGGIO_WHERE); - - query.append(_FINDER_COLUMN_OLDSORTEGGIOID_OLDSORTEGGIOID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldSorteggioId); - - List list = q.list(); - - if (list.isEmpty()) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - finderArgs, list); - } - else { - if ((list.size() > 1) && _log.isWarnEnabled()) { - _log.warn( - "SorteggioPersistenceImpl.fetchByOldSorteggioId(long, boolean) with parameters (" + - StringUtil.merge(finderArgs) + - ") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder."); - } - - Sorteggio sorteggio = list.get(0); - - result = sorteggio; - - cacheResult(sorteggio); - - if ((sorteggio.getOldSorteggioId() != oldSorteggioId)) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - finderArgs, sorteggio); - } - } - } - catch (Exception e) { - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - if (result instanceof List) { - return null; - } - else { - return (Sorteggio)result; - } - } - - /** - * Removes the sorteggio where oldSorteggioId = ? from the database. - * - * @param oldSorteggioId the old sorteggio ID - * @return the sorteggio that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public Sorteggio removeByOldSorteggioId(long oldSorteggioId) - throws NoSuchSorteggioException, SystemException { - Sorteggio sorteggio = findByOldSorteggioId(oldSorteggioId); - - return remove(sorteggio); - } - - /** - * Returns the number of sorteggios where oldSorteggioId = ?. - * - * @param oldSorteggioId the old sorteggio ID - * @return the number of matching sorteggios - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldSorteggioId(long oldSorteggioId) - throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDSORTEGGIOID; - - Object[] finderArgs = new Object[] { oldSorteggioId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_SORTEGGIO_WHERE); - - query.append(_FINDER_COLUMN_OLDSORTEGGIOID_OLDSORTEGGIOID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldSorteggioId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDSORTEGGIOID_OLDSORTEGGIOID_2 = "sorteggio.oldSorteggioId = ?"; public static final FinderPath FINDER_PATH_WITH_PAGINATION_FIND_BY_C_GROUPID = new FinderPath(SorteggioModelImpl.ENTITY_CACHE_ENABLED, SorteggioModelImpl.FINDER_CACHE_ENABLED, SorteggioImpl.class, @@ -4621,9 +4402,6 @@ public class SorteggioPersistenceImpl extends BasePersistenceImpl new Object[] { sorteggio.getUuid(), sorteggio.getGroupId() }, sorteggio); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - new Object[] { sorteggio.getOldSorteggioId() }, sorteggio); - sorteggio.resetOriginalValues(); } @@ -4707,13 +4485,6 @@ public class SorteggioPersistenceImpl extends BasePersistenceImpl Long.valueOf(1)); FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_UUID_G, args, sorteggio); - - args = new Object[] { sorteggio.getOldSorteggioId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDSORTEGGIOID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - args, sorteggio); } else { SorteggioModelImpl sorteggioModelImpl = (SorteggioModelImpl)sorteggio; @@ -4729,16 +4500,6 @@ public class SorteggioPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_UUID_G, args, sorteggio); } - - if ((sorteggioModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDSORTEGGIOID.getColumnBitmask()) != 0) { - Object[] args = new Object[] { sorteggio.getOldSorteggioId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDSORTEGGIOID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - args, sorteggio); - } } } @@ -4760,21 +4521,6 @@ public class SorteggioPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_UUID_G, args); FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_UUID_G, args); } - - args = new Object[] { sorteggio.getOldSorteggioId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDSORTEGGIOID, args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, args); - - if ((sorteggioModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDSORTEGGIOID.getColumnBitmask()) != 0) { - args = new Object[] { sorteggioModelImpl.getOriginalOldSorteggioId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDSORTEGGIOID, - args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDSORTEGGIOID, - args); - } } /** @@ -5134,7 +4880,6 @@ public class SorteggioPersistenceImpl extends BasePersistenceImpl sorteggioImpl.setMesePrecedente(sorteggio.getMesePrecedente()); sorteggioImpl.setEsterna(sorteggio.isEsterna()); sorteggioImpl.setPraticaEsternaId(sorteggio.getPraticaEsternaId()); - sorteggioImpl.setOldSorteggioId(sorteggio.getOldSorteggioId()); return sorteggioImpl; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java index 0c095d3d..26f13dda 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/StoricoSoggettoPraticaPersistenceImpl.java @@ -625,234 +625,6 @@ public class StoricoSoggettoPraticaPersistenceImpl extends BasePersistenceImpl) { - return null; - } - else { - return (StoricoSoggettoPratica)result; - } - } - - /** - * Removes the storico soggetto pratica where oldStoricoSoggettoPraticaId = ? from the database. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the storico soggetto pratica that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public StoricoSoggettoPratica removeByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) - throws NoSuchStoricoSoggettoPraticaException, SystemException { - StoricoSoggettoPratica storicoSoggettoPratica = findByOldStoricoSoggettoPraticaId(oldStoricoSoggettoPraticaId); - - return remove(storicoSoggettoPratica); - } - - /** - * Returns the number of storico soggetto praticas where oldStoricoSoggettoPraticaId = ?. - * - * @param oldStoricoSoggettoPraticaId the old storico soggetto pratica ID - * @return the number of matching storico soggetto praticas - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldStoricoSoggettoPraticaId( - long oldStoricoSoggettoPraticaId) throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDSTORICOSOGGETTOPRATICAID; - - Object[] finderArgs = new Object[] { oldStoricoSoggettoPraticaId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_STORICOSOGGETTOPRATICA_WHERE); - - query.append(_FINDER_COLUMN_OLDSTORICOSOGGETTOPRATICAID_OLDSTORICOSOGGETTOPRATICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldStoricoSoggettoPraticaId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDSTORICOSOGGETTOPRATICAID_OLDSTORICOSOGGETTOPRATICAID_2 = - "storicoSoggettoPratica.oldStoricoSoggettoPraticaId = ?"; public StoricoSoggettoPraticaPersistenceImpl() { setModelClass(StoricoSoggettoPratica.class); @@ -869,10 +641,6 @@ public class StoricoSoggettoPraticaPersistenceImpl extends BasePersistenceImpl private static final String _FINDER_COLUMN_INTPRATICA_TIPO_TIPO_1 = "tempistica.tipo IS NULL"; private static final String _FINDER_COLUMN_INTPRATICA_TIPO_TIPO_2 = "tempistica.tipo = ?"; private static final String _FINDER_COLUMN_INTPRATICA_TIPO_TIPO_3 = "(tempistica.tipo IS NULL OR tempistica.tipo = '')"; - public static final FinderPath FINDER_PATH_FETCH_BY_OLDTEMPISTICAID = new FinderPath(TempisticaModelImpl.ENTITY_CACHE_ENABLED, - TempisticaModelImpl.FINDER_CACHE_ENABLED, TempisticaImpl.class, - FINDER_CLASS_NAME_ENTITY, "fetchByOldTempisticaId", - new String[] { Long.class.getName() }, - TempisticaModelImpl.OLDTEMPISTICAID_COLUMN_BITMASK); - public static final FinderPath FINDER_PATH_COUNT_BY_OLDTEMPISTICAID = new FinderPath(TempisticaModelImpl.ENTITY_CACHE_ENABLED, - TempisticaModelImpl.FINDER_CACHE_ENABLED, Long.class, - FINDER_CLASS_NAME_LIST_WITHOUT_PAGINATION, - "countByOldTempisticaId", new String[] { Long.class.getName() }); - - /** - * Returns the tempistica where oldTempisticaId = ? or throws a {@link it.tref.liferay.portos.bo.NoSuchTempisticaException} if it could not be found. - * - * @param oldTempisticaId the old tempistica ID - * @return the matching tempistica - * @throws it.tref.liferay.portos.bo.NoSuchTempisticaException if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Tempistica findByOldTempisticaId(long oldTempisticaId) - throws NoSuchTempisticaException, SystemException { - Tempistica tempistica = fetchByOldTempisticaId(oldTempisticaId); - - if (tempistica == null) { - StringBundler msg = new StringBundler(4); - - msg.append(_NO_SUCH_ENTITY_WITH_KEY); - - msg.append("oldTempisticaId="); - msg.append(oldTempisticaId); - - msg.append(StringPool.CLOSE_CURLY_BRACE); - - if (_log.isWarnEnabled()) { - _log.warn(msg.toString()); - } - - throw new NoSuchTempisticaException(msg.toString()); - } - - return tempistica; - } - - /** - * Returns the tempistica where oldTempisticaId = ? or returns null if it could not be found. Uses the finder cache. - * - * @param oldTempisticaId the old tempistica ID - * @return the matching tempistica, or null if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Tempistica fetchByOldTempisticaId(long oldTempisticaId) - throws SystemException { - return fetchByOldTempisticaId(oldTempisticaId, true); - } - - /** - * Returns the tempistica where oldTempisticaId = ? or returns null if it could not be found, optionally using the finder cache. - * - * @param oldTempisticaId the old tempistica ID - * @param retrieveFromCache whether to use the finder cache - * @return the matching tempistica, or null if a matching tempistica could not be found - * @throws SystemException if a system exception occurred - */ - @Override - public Tempistica fetchByOldTempisticaId(long oldTempisticaId, - boolean retrieveFromCache) throws SystemException { - Object[] finderArgs = new Object[] { oldTempisticaId }; - - Object result = null; - - if (retrieveFromCache) { - result = FinderCacheUtil.getResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - finderArgs, this); - } - - if (result instanceof Tempistica) { - Tempistica tempistica = (Tempistica)result; - - if ((oldTempisticaId != tempistica.getOldTempisticaId())) { - result = null; - } - } - - if (result == null) { - StringBundler query = new StringBundler(3); - - query.append(_SQL_SELECT_TEMPISTICA_WHERE); - - query.append(_FINDER_COLUMN_OLDTEMPISTICAID_OLDTEMPISTICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldTempisticaId); - - List list = q.list(); - - if (list.isEmpty()) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - finderArgs, list); - } - else { - if ((list.size() > 1) && _log.isWarnEnabled()) { - _log.warn( - "TempisticaPersistenceImpl.fetchByOldTempisticaId(long, boolean) with parameters (" + - StringUtil.merge(finderArgs) + - ") yields a result set with more than 1 result. This violates the logical unique restriction. There is no order guarantee on which result is returned by this finder."); - } - - Tempistica tempistica = list.get(0); - - result = tempistica; - - cacheResult(tempistica); - - if ((tempistica.getOldTempisticaId() != oldTempisticaId)) { - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - finderArgs, tempistica); - } - } - } - catch (Exception e) { - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - if (result instanceof List) { - return null; - } - else { - return (Tempistica)result; - } - } - - /** - * Removes the tempistica where oldTempisticaId = ? from the database. - * - * @param oldTempisticaId the old tempistica ID - * @return the tempistica that was removed - * @throws SystemException if a system exception occurred - */ - @Override - public Tempistica removeByOldTempisticaId(long oldTempisticaId) - throws NoSuchTempisticaException, SystemException { - Tempistica tempistica = findByOldTempisticaId(oldTempisticaId); - - return remove(tempistica); - } - - /** - * Returns the number of tempisticas where oldTempisticaId = ?. - * - * @param oldTempisticaId the old tempistica ID - * @return the number of matching tempisticas - * @throws SystemException if a system exception occurred - */ - @Override - public int countByOldTempisticaId(long oldTempisticaId) - throws SystemException { - FinderPath finderPath = FINDER_PATH_COUNT_BY_OLDTEMPISTICAID; - - Object[] finderArgs = new Object[] { oldTempisticaId }; - - Long count = (Long)FinderCacheUtil.getResult(finderPath, finderArgs, - this); - - if (count == null) { - StringBundler query = new StringBundler(2); - - query.append(_SQL_COUNT_TEMPISTICA_WHERE); - - query.append(_FINDER_COLUMN_OLDTEMPISTICAID_OLDTEMPISTICAID_2); - - String sql = query.toString(); - - Session session = null; - - try { - session = openSession(); - - Query q = session.createQuery(sql); - - QueryPos qPos = QueryPos.getInstance(q); - - qPos.add(oldTempisticaId); - - count = (Long)q.uniqueResult(); - - FinderCacheUtil.putResult(finderPath, finderArgs, count); - } - catch (Exception e) { - FinderCacheUtil.removeResult(finderPath, finderArgs); - - throw processException(e); - } - finally { - closeSession(session); - } - } - - return count.intValue(); - } - - private static final String _FINDER_COLUMN_OLDTEMPISTICAID_OLDTEMPISTICAID_2 = - "tempistica.oldTempisticaId = ?"; public static final FinderPath FINDER_PATH_WITH_PAGINATION_FIND_BY_C_INTPRATICA_TIPO_COMPLETO = new FinderPath(TempisticaModelImpl.ENTITY_CACHE_ENABLED, TempisticaModelImpl.FINDER_CACHE_ENABLED, TempisticaImpl.class, @@ -3435,9 +3215,6 @@ public class TempisticaPersistenceImpl extends BasePersistenceImpl new Object[] { tempistica.getUuid(), tempistica.getGroupId() }, tempistica); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - new Object[] { tempistica.getOldTempisticaId() }, tempistica); - tempistica.resetOriginalValues(); } @@ -3521,13 +3298,6 @@ public class TempisticaPersistenceImpl extends BasePersistenceImpl Long.valueOf(1)); FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_UUID_G, args, tempistica); - - args = new Object[] { tempistica.getOldTempisticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDTEMPISTICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - args, tempistica); } else { TempisticaModelImpl tempisticaModelImpl = (TempisticaModelImpl)tempistica; @@ -3543,16 +3313,6 @@ public class TempisticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_UUID_G, args, tempistica); } - - if ((tempisticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDTEMPISTICAID.getColumnBitmask()) != 0) { - Object[] args = new Object[] { tempistica.getOldTempisticaId() }; - - FinderCacheUtil.putResult(FINDER_PATH_COUNT_BY_OLDTEMPISTICAID, - args, Long.valueOf(1)); - FinderCacheUtil.putResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - args, tempistica); - } } } @@ -3576,21 +3336,6 @@ public class TempisticaPersistenceImpl extends BasePersistenceImpl FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_UUID_G, args); FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_UUID_G, args); } - - args = new Object[] { tempistica.getOldTempisticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDTEMPISTICAID, args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, args); - - if ((tempisticaModelImpl.getColumnBitmask() & - FINDER_PATH_FETCH_BY_OLDTEMPISTICAID.getColumnBitmask()) != 0) { - args = new Object[] { tempisticaModelImpl.getOriginalOldTempisticaId() }; - - FinderCacheUtil.removeResult(FINDER_PATH_COUNT_BY_OLDTEMPISTICAID, - args); - FinderCacheUtil.removeResult(FINDER_PATH_FETCH_BY_OLDTEMPISTICAID, - args); - } } /** @@ -3887,7 +3632,6 @@ public class TempisticaPersistenceImpl extends BasePersistenceImpl tempisticaImpl.setStop(tempistica.getStop()); tempisticaImpl.setWait(tempistica.getWait()); tempisticaImpl.setCompleto(tempistica.isCompleto()); - tempisticaImpl.setOldTempisticaId(tempistica.getOldTempisticaId()); return tempisticaImpl; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/OggettoProtocollo.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/OggettoProtocollo.java index e7b2c5d0..a146e053 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/OggettoProtocollo.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/OggettoProtocollo.java @@ -8,68 +8,63 @@ import org.apache.commons.lang.StringUtils; public class OggettoProtocollo { - private final String protocolloEntityId; - private final String protocolloEntityUtenteId; - private final String protocolloEntityUfficioId; - private final String dataInserimento; - private final String protocolloEntityOggetto; - private final String protocolloEntityFascicoloNumero; - private final String fascicoloEntityTipo; + private final String protocolloEntityId; + private final String protocolloEntityUtenteId; + private final String protocolloEntityUfficioId; + private final String dataInserimento; + private final String protocolloEntityOggetto; + private final String protocolloEntityFascicoloNumero; + private final String fascicoloEntityTipo; - public OggettoProtocollo(String protocolloEntityId, String protocolloEntityUtenteId, - String protocolloEntityUfficioId, String protocolloEntityOggetto, String protocolloEntityFascicoloNumero, - String dataInserimento, String fascicoloEntityTipo) throws ParseException { + public OggettoProtocollo(String protocolloEntityId, String protocolloEntityUtenteId, + String protocolloEntityUfficioId, String protocolloEntityOggetto, String protocolloEntityFascicoloNumero, + String dataInserimento, String fascicoloEntityTipo) throws ParseException { - super(); - this.protocolloEntityId = protocolloEntityId; - this.protocolloEntityUtenteId = protocolloEntityUtenteId; - this.protocolloEntityUfficioId = protocolloEntityUfficioId; - this.protocolloEntityOggetto = protocolloEntityOggetto; - this.dataInserimento = dataInserimento; - SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(sdf.parse(dataInserimento)); + this.protocolloEntityId = protocolloEntityId; + this.protocolloEntityUtenteId = protocolloEntityUtenteId; + this.protocolloEntityUfficioId = protocolloEntityUfficioId; + this.protocolloEntityOggetto = protocolloEntityOggetto; + this.dataInserimento = dataInserimento; + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(sdf.parse(dataInserimento)); + this.protocolloEntityFascicoloNumero = calendar.get(Calendar.YEAR) + + StringUtils.leftPad(protocolloEntityFascicoloNumero, 7).replace(' ', '0'); + this.fascicoloEntityTipo = fascicoloEntityTipo.equals("1") ? "partenza" : "arrivo"; + } - this.protocolloEntityFascicoloNumero = - calendar.get(Calendar.YEAR) + StringUtils.leftPad(protocolloEntityFascicoloNumero, 7).replace(' ', '0'); + public String getProtocolloEntityId() { - this.fascicoloEntityTipo = fascicoloEntityTipo.equals("1") ? "partenza" : "arrivo"; - } + return protocolloEntityId; + } - public String getProtocolloEntityId() { + public String getProtocolloEntityUtenteId() { - return protocolloEntityId; - } + return protocolloEntityUtenteId; + } - public String getProtocolloEntityUtenteId() { + public String getProtocolloEntityUfficioId() { - return protocolloEntityUtenteId; - } + return protocolloEntityUfficioId; + } - public String getProtocolloEntityUfficioId() { + public String getProtocolloEntityOggetto() { - return protocolloEntityUfficioId; - } + return protocolloEntityOggetto; + } - public String getProtocolloEntityOggetto() { + public String getDataInserimento() { - return protocolloEntityOggetto; - } + return dataInserimento; + } - public String getDataInserimento() { + public String getProtocolloEntityFascicoloNumero() { - return dataInserimento; - } - - public String getProtocolloEntityFascicoloNumero() { - - return protocolloEntityFascicoloNumero; - } - - public String getFascicoloEntityTipo() { - - return fascicoloEntityTipo; - } + return protocolloEntityFascicoloNumero; + } + public String getFascicoloEntityTipo() { + return fascicoloEntityTipo; + } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java index 77578646..a03fc584 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/PagamentiUtil.java @@ -49,161 +49,19 @@ public abstract class PagamentiUtil { private static final Log _log = LogFactoryUtil.getLog(PagamentiUtil.class); - public static void verificaPagamentoIRIS(Pagamento pagamento) throws IOException, SystemException, - PortalException { - - // long companyId = pagamento.getCompanyId(); - // long groupId = pagamento.getGroupId(); - // - // InformazioniPagamentoType[] statoPagamentiType = - // IrisVerificaPagamenti - // .verificaPagamenti(companyId, groupId, pagamento.getCodice(), - // pagamento.getTipoPagamento()); - - // List infoPagamentoTypes = - // IrisVerificaPagamenti - // .verificaPagamenti(companyId, groupId, pagamento.getCodice(), - // pagamento.getTipoPagamento()); - // String statoPagamento = StringPool.BLANK; - // if (infoPagamentoTypes != null) { - // InformazioniPagamentoType infoPagamentoType = - // infoPagamentoTypes.get(0); - // if - // (infoPagamentoType.getStato().equals(VerificaStatoPagamentoDettagliato.POSIZIONE_NON_PRESENTE)) - // { - // // "Posizione non presente" -> si riprova successivamente - // return; - // } else if - // (infoPagamentoType.getStato().equals(VerificaStatoPagamentoDettagliato.POSIZIONE_NON_PAGABILE)) - // { - // // "Posizione non pagabile" -> esito negativo - // statoPagamento = PagamentoConstants.UTILIZZATA_NON_PAGABILE; - // } else if - // (infoPagamentoType.getStato().equals(VerificaStatoPagamentoDettagliato.POSIZIONE_NON_PAGATA)) - // { - // // "Pagamento non eseguito" -> esito negativo - // statoPagamento = PagamentoConstants.UTILIZZATA_RIFIUTATA; - // } else if - // (infoPagamentoType.getStato().equals(VerificaStatoPagamentoDettagliato.POSIZIONE_CON_PAG_IN_CORSO)) - // { - // // "Pagamento non eseguito" -> esito in corso - // statoPagamento = PagamentoConstants.UTILIZZATA_IN_CORSO; - // return; - // } else if - // (infoPagamentoType.getStato().equals(VerificaStatoPagamentoDettagliato.POSIZIONE_PAGATA) - // || - // infoPagamentoType.getStato().equals(VerificaStatoPagamentoDettagliato.POSIZIONE_PAGATA_SBF)) - // { - // // "Pagamento eseguito" -> esito positivo - // statoPagamento = PagamentoConstants.UTILIZZATA_PAGATA; - // } - - // String statoPagamento = StringPool.BLANK; - // if (statoPagamentiType != null) { - // InformazioniPagamentoType statoPagamentoType = statoPagamentiType[0]; - // String statoPendenza = statoPagamentoType.getStato().getValue(); - // - // if - // (statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_NON_PAGATA)) - // { - // if (statoPagamentoType.getDescrizioneStato().equalsIgnoreCase( - // VerificaStatoPagamentoDettagliato._POSIZIONE_NON_PAGATA)) { - // // "Posizione non presente" -> si riprova successivamente - // return; - // } else if - // (statoPagamentoType.getDescrizioneStato().equalsIgnoreCase("PAG_NON_ESEGUITO")) - // { - // statoPagamento = PagamentoConstants.UTILIZZATA_RIFIUTATA; - // } - // } else if - // (statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_NON_PAGABILE)) - // { - // // "Posizione non pagabile" -> esito negativo - // statoPagamento = PagamentoConstants.UTILIZZATA_NON_PAGABILE; - // // } else if (statoPendenza.equals(StatoPagamentoType._value3)) { - // // "Pagamento non ancora eseguito" -> si riprova successivamente - // // if (!pagamento.getOtf()) { - // // return; - // // } - // // "Pagamento non eseguito" -> esito negativo - // // statoPagamento = PagamentoConstants.UTILIZZATA_RIFIUTATA; - // } else if - // (statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_PAGATA) - // || - // statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_PAGATA_SBF)) - // { - // // "Pagamento eseguito" -> esito positivo - // statoPagamento = PagamentoConstants.UTILIZZATA_PAGATA; - // } else if - // (statoPendenza.equals(VerificaStatoPagamentoDettagliato.POSIZIONE_CON_PAG_IN_CORSO)) - // { - // // "Pagamento non eseguito" -> esito in corso - // statoPagamento = PagamentoConstants.UTILIZZATA_IN_CORSO; - // return; - // } - - // StatoPagamentoType statoPagamentoType = statoPagamentiType[0]; - // if - // (statoPagamentoType.enumValue().equals(VerificaStatoPagamento.POSIZIONE_NON_PRESENTE)) - // { - // // "Posizione non presente" -> si riprova successivamente - // return; - // } else if - // (statoPagamentoType.enumValue().equals(VerificaStatoPagamento.POSIZIONE_NON_PAGABILE)) - // { - // // "Posizione non pagabile" -> esito negativo - // statoPagamento = PagamentoConstants.UTILIZZATA_NON_PAGABILE; - // } else if - // (statoPagamentoType.enumValue().equals(VerificaStatoPagamento.PAGAMENTO_NON_ESEGUITO)) - // { - // // "Pagamento non ancora eseguito" -> si riprova successivamente - // if (!pagamento.getOtf()) { - // return; - // } - // // "Pagamento non eseguito" -> esito negativo - // statoPagamento = PagamentoConstants.UTILIZZATA_RIFIUTATA; - // } else if - // (statoPagamentoType.enumValue().equals(VerificaStatoPagamento.POSIZIONE_NON_PAGABILE)) - // { - // // "Pagamento eseguito" -> esito positivo - // statoPagamento = PagamentoConstants.UTILIZZATA_PAGATA; - // } - - // if (DettPratica.class.getName().equals(pagamento.getClassName())) { - // DettPraticaLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), - // pagamento.getClassPk(), - // statoPagamento); - // } else if - // (FineLavori.class.getName().equals(pagamento.getClassName())) { - // FineLavoriLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), - // pagamento.getClassPk(), - // statoPagamento); - // } else if (Collaudo.class.getName().equals(pagamento.getClassName())) - // { - // CollaudoLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), - // pagamento.getClassPk(), - // statoPagamento); - // } else { - // throw new - // RuntimeException("unable to update pagamento esito for entity type " - // + - // pagamento.getClassName() - // + " with id " + pagamento.getClassPk()); - // } - // - // } + public static void verificaPagamentoIRIS(Pagamento pagamento) throws IOException, SystemException, PortalException { String statoPagamento = callVerificaPagamenti(pagamento); if (Validator.isNotNull(statoPagamento)) { if (DettPratica.class.getName().equals(pagamento.getClassName())) { - DettPraticaLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), - pagamento.getClassPk(), statoPagamento); + DettPraticaLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), pagamento.getClassPk(), + statoPagamento); } else if (FineLavori.class.getName().equals(pagamento.getClassName())) { - FineLavoriLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), - pagamento.getClassPk(), statoPagamento); + FineLavoriLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), pagamento.getClassPk(), + statoPagamento); } else if (Collaudo.class.getName().equals(pagamento.getClassName())) { - CollaudoLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), - pagamento.getClassPk(), statoPagamento); + CollaudoLocalServiceUtil.updateEsitoPagamento(pagamento.getPagamentoId(), pagamento.getClassPk(), + statoPagamento); } else { throw new RuntimeException("unable to update pagamento esito for entity type " + pagamento.getClassName() + " with id " + pagamento.getClassPk()); @@ -216,32 +74,24 @@ public abstract class PagamentiUtil { long companyId = pagamento.getCompanyId(); long groupId = pagamento.getGroupId(); - if (PagamentoConstants.PAGAMENTO_ONERI.equals(pagamento.getTipoPagamento())) { - InformazioniPagamentoType[] statoPagamentiType = IrisVerificaPagamenti.verificaPagamenti( - companyId, groupId, pagamento.getCodice(), pagamento.getTipoPagamento()); - + InformazioniPagamentoType[] statoPagamentiType = IrisVerificaPagamenti.verificaPagamenti(companyId, + groupId, pagamento.getCodice(), pagamento.getTipoPagamento()); return checkStatoPagamento(statoPagamentiType); - } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(pagamento.getTipoPagamento())) { List iuvs = IUVLocalServiceUtil.findByPagamento(pagamento.getPagamentoId()); List statiPagamento = new ArrayList(); for (IUV iuv : iuvs) { - InformazioniPagamentoType[] statoPagamentiType = IrisVerificaPagamenti.verificaPagamenti( - companyId, groupId, iuv.getCodice(), pagamento.getTipoPagamento()); + InformazioniPagamentoType[] statoPagamentiType = IrisVerificaPagamenti.verificaPagamenti(companyId, + groupId, iuv.getCodice(), pagamento.getTipoPagamento()); GenericUtils.addIfnotExist(statiPagamento, checkStatoPagamento(statoPagamentiType)); } - if (statiPagamento.size() > 1) { - // return - // VerificaStatoPagamentoDettagliato._POSIZIONE_CON_PAG_IN_CORSO; return StringPool.BLANK; } return statiPagamento.get(0); } - throw new SystemException("error.geniocivile.tipopagamento.notexist"); - } private static String checkStatoPagamento(InformazioniPagamentoType[] statoPagamentiType) { @@ -249,10 +99,8 @@ public abstract class PagamentiUtil { if (statoPagamentiType == null) { return null; } - InformazioniPagamentoType statoPagamentoType = statoPagamentiType[0]; String statoPendenza = statoPagamentoType.getStato().getValue(); - String statoPagamento = StringPool.BLANK; if (statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_NON_PAGATA)) { if (statoPagamentoType.getDescrizioneStato().equalsIgnoreCase( @@ -268,26 +116,17 @@ public abstract class PagamentiUtil { } else if (statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_NON_PAGABILE)) { // "Posizione non pagabile" -> esito negativo statoPagamento = PagamentoConstants.UTILIZZATA_NON_PAGABILE; - // } else if (statoPendenza.equals(StatoPagamentoType._value3)) { - // "Pagamento non ancora eseguito" -> si riprova successivamente - // if (!pagamento.getOtf()) { - // return; - // } - // "Pagamento non eseguito" -> esito negativo - // statoPagamento = PagamentoConstants.UTILIZZATA_RIFIUTATA; _log.debug(statoPagamento); } else if (statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_PAGATA) || statoPendenza.equals(VerificaStatoPagamentoDettagliato._POSIZIONE_PAGATA_SBF)) { // "Pagamento eseguito" -> esito positivo statoPagamento = PagamentoConstants.UTILIZZATA_PAGATA; _log.debug(statoPagamento); - } else if (statoPendenza - .equalsIgnoreCase(VerificaStatoPagamentoDettagliato._POSIZIONE_CON_PAG_IN_CORSO)) { + } else if (statoPendenza.equalsIgnoreCase(VerificaStatoPagamentoDettagliato._POSIZIONE_CON_PAG_IN_CORSO)) { // "Pagamento non eseguito" -> esito in corso statoPagamento = PagamentoConstants.UTILIZZATA_IN_CORSO; return StringPool.BLANK; } - return statoPagamento; } @@ -310,19 +149,16 @@ public abstract class PagamentiUtil { return pagamento.getCreateDate().compareTo(getScadenzaPending()) < 0; } - public static Pagamento nuovoPagamento(String currentURL, long classPk, String className, - String tipoPagamento, String importo, String codiceFiscaleCommittente, - ServiceContext serviceContext) throws PortalException, SystemException { + public static Pagamento nuovoPagamento(String currentURL, long classPk, String className, String tipoPagamento, + String importo, String codiceFiscaleCommittente, ServiceContext serviceContext) throws PortalException, + SystemException { boolean irisDisabled = !PagamentiCommonUtil.irisIsEnable(serviceContext.getCompanyId()); - boolean esenzioneBolli = false; boolean esenzioneSpeseIstruttoria = false; String tipoIntegrazione = StringPool.BLANK; - long pagamentoId = 0l; - long intPraticaId = 0l; - - // long dettPraticaId = 0l; + long pagamentoId = 0L; + long intPraticaId = 0L; if (DettPratica.class.getName().equals(className)) { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(classPk); esenzioneBolli = dettPratica.isNormEsenteBollo(); @@ -334,7 +170,6 @@ public abstract class PagamentiUtil { pagamentoId = dettPratica.getPagamentoIdBolli(); } intPraticaId = dettPratica.getIntPraticaId(); - // dettPraticaId = classPk; } else if (FineLavori.class.getName().equals(className)) { FineLavori fineLavori = FineLavoriLocalServiceUtil.getFineLavori(classPk); esenzioneBolli = fineLavori.isNormEsenteBollo(); @@ -345,8 +180,6 @@ public abstract class PagamentiUtil { } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { pagamentoId = fineLavori.getPagamentoId(); } - // dettPraticaId = - // DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(fineLavori.getIntPraticaId()).getDettPraticaId(); intPraticaId = fineLavori.getIntPraticaId(); } else if (Collaudo.class.getName().equals(className)) { Collaudo collaudo = CollaudoLocalServiceUtil.getCollaudo(classPk); @@ -358,21 +191,16 @@ public abstract class PagamentiUtil { } else if (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento)) { pagamentoId = collaudo.getPagamentoId(); } - // dettPraticaId = - // DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(collaudo.getIntPraticaId()).getDettPraticaId(); intPraticaId = collaudo.getIntPraticaId(); } else { throw new SystemException("error.fields.pratica.pagamento.classPk.invalid"); } - List importi = new ArrayList<>(); - if (esenzioneSpeseIstruttoria && esenzioneBolli) { throw new SystemException("error.fields.pratica.pagamento.esente.oneri.bolli"); } else { if ((PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) && !esenzioneBolli) || (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento) && !esenzioneSpeseIstruttoria)) { - if (Validator.isNotNull(importo)) { importo = importo.replaceAll(StringPool.COMMA, StringPool.PERIOD); try { @@ -387,7 +215,6 @@ public abstract class PagamentiUtil { } else if (PagamentoConstants.PAGAMENTO_ONERI.equals(tipoPagamento)) { importi.add(importo); } - } catch (NumberFormatException e) { throw new SystemException("error.fields.pratica.pagamento." + (PagamentoConstants.PAGAMENTO_BOLLI.equals(tipoPagamento) ? "bolli" @@ -405,10 +232,8 @@ public abstract class PagamentiUtil { return null; } } - if (!irisDisabled) { if (Validator.isNull(pagamentoId)) { - Soggetto committente = SoggettoLocalServiceUtil .getValidTmpByIntPratica_CodiceFiscale_TipologiaSoggetto(intPraticaId, codiceFiscaleCommittente, TipoSoggettoUtil.COMMITTENTE); @@ -417,68 +242,51 @@ public abstract class PagamentiUtil { if (codiceProvincia.equalsIgnoreCase("ee")) { provincia = "EE"; } else { - Provincia provinciaEntity = ProvinciaLocalServiceUtil.fetchByC_C( - serviceContext.getCompanyId(), codiceProvincia); + Provincia provinciaEntity = ProvinciaLocalServiceUtil.fetchByC_C(serviceContext.getCompanyId(), + codiceProvincia); if (Validator.isNotNull(provinciaEntity)) { provincia = provinciaEntity.getSigla(); } } - String codice = IrisCommonUtil.createCodicePendenza(); String causale = IrisCommonUtil.getDescrizioneCausale(tipoPagamento); - long irisPagamentoId = PagamentoLocalServiceUtil.createPagamentoId(); - currentURL = StringUtil.replaceLast(currentURL, "/0", StringPool.SLASH + irisPagamentoId); - String auth = HttpUtil.getParameter(currentURL, "p_auth", false); - // XXX Se non li rimuovi non funziona più - Map parameters = HttpUtil.getParameterMap(HttpUtil - .getQueryString(currentURL)); + Map parameters = HttpUtil.getParameterMap(HttpUtil.getQueryString(currentURL)); for (String key : parameters.keySet()) { currentURL = HttpUtil.removeParameter(currentURL, key); } - if (Validator.isNotNull(auth)) { currentURL = HttpUtil.addParameter(currentURL, "p_auth", auth); } - if (Validator.isNull(codiceFiscaleCommittente)) { throw new SystemException("error.fields.pratica.pagamento.codicefiscale.richiesto"); } - List iuvs = new ArrayList(); if (PagamentoConstants.PAGAMENTO_BOLLI.equalsIgnoreCase(tipoPagamento)) { - iuvs = IrisComunicaPosizioniDebitorie.generaIUV(serviceContext.getCompanyId(), - importi.size()); + iuvs = IrisComunicaPosizioniDebitorie.generaIUV(serviceContext.getCompanyId(), importi.size()); } - IdpOTFType idpOTFType = IrisComunicaPosizioniDebitorie.comunicaPosizioniDebitorieOTF( - serviceContext.getCompanyId(), serviceContext.getScopeGroupId(), - serviceContext.getUserId(), codice, causale, codiceFiscaleCommittente, tipoPagamento, - importi, iuvs, currentURL, currentURL, provincia); - - String urlPagamento = ""; - + serviceContext.getCompanyId(), serviceContext.getScopeGroupId(), serviceContext.getUserId(), + codice, causale, codiceFiscaleCommittente, tipoPagamento, importi, iuvs, currentURL, + currentURL, provincia); + String urlPagamento = StringPool.BLANK; if (idpOTFType == null) { urlPagamento = currentURL; - throw new SystemException("error.geniocivilefe.pratica.pagamento | intPraticaId=" - + intPraticaId + " | classPk=" + classPk + " | className=" + className); - + throw new SystemException("error.geniocivilefe.pratica.pagamento | intPraticaId=" + intPraticaId + + " | classPk=" + classPk + " | className=" + className); } else { urlPagamento = idpOTFType.getUrlGW().toString(); } - return PagamentoLocalServiceUtil.addPagamentoAndUpdate(irisPagamentoId, codice, causale, PagamentoConstants.MEZZO_IRIS, codiceFiscaleCommittente, tipoPagamento, importo, - PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, 0l, urlPagamento, iuvs, + PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, 0L, urlPagamento, iuvs, serviceContext); - // actionResponse.sendRedirect(idpOTFType.getUrlGW().toString()); } else { return PagamentoLocalServiceUtil.getPagamento(pagamentoId); } - // } } else { boolean add = true; if (Validator.isNotNull(pagamentoId)) { @@ -492,10 +300,9 @@ public abstract class PagamentiUtil { if (add) { return PagamentoLocalServiceUtil.addPagamentoAndUpdate(StringPool.BLANK, StringPool.BLANK, PagamentoConstants.MEZZO_MANUALE, codiceFiscaleCommittente, tipoPagamento, importo, - PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, 0l, serviceContext); + PagamentoConstants.UTILIZZATA_IN_CORSO, classPk, className, 0L, serviceContext); } return null; } - } -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java index cca45d77..087146e0 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/ProtocollazioneUtil.java @@ -29,10 +29,12 @@ import java.util.Collections; import java.util.List; import javax.servlet.http.HttpServletRequest; + import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVRecord; import org.apache.commons.io.IOUtils; + import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.json.JSONObject; @@ -53,38 +55,27 @@ public class ProtocollazioneUtil { public static String protocollaPartenza(Avviso avviso, Long fileEntryId) throws Exception { String protocollo = null; - InputStream inputStream = null; - try { IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(avviso.getIntPraticaId()); long groupId = avviso.getGroupId(); - File allegato = new File(); if (Validator.isNotNull(fileEntryId)) { FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(fileEntryId); - inputStream = DLFileEntryLocalServiceUtil.getFileAsStream(fileEntry.getFileEntryId(), fileEntry.getVersion()); - String sha256 = DigestUtils.sha256Hex(inputStream); allegato.setFileId(String.valueOf(fileEntryId)); allegato.setFileSha256(sha256); - } else { String doc = String.valueOf(avviso.getAvvisoId()); - String sha256 = DigestUtils.sha256Hex(doc); - allegato.setFileId("0"); allegato.setFileSha256(sha256); } - - // utilizzato anche come discriminate tra la 1a e la 2a chiamata 1a - // recupero numero protocollo -> 1 allegato finto 2a aggiorno dati - // del documento prodotto -> 2 allegati, il 1o giusto e il 2o per - // recupero num protocollo - + // utilizzato anche come discriminate tra la 1a e la 2a chiamata 1a recupero numero protocollo -> 1 allegato + // finto 2a aggiorno dati del documento prodotto -> 2 allegati, il 1o giusto e il 2o per recupero num + // protocollo Protocollo protocolloBean = new Protocollo(); protocolloBean.setOggetto(generaOggettoProtocollo(avviso.getClassName(), avviso.getAvvisoId())); protocolloBean.setChiuso(false); @@ -98,15 +89,14 @@ public class ProtocollazioneUtil { } finally { StreamUtil.cleanUp(inputStream); } - return protocollo; } public static String protocollaArrivo(Object praticaInstance, String title) throws Exception { - long groupId = 0l; - long praticaId = 0l; - long companyId = 0l; + long groupId = 0L; + long praticaId = 0L; + long companyId = 0L; String utenteScreenName = StringPool.BLANK; String className = StringPool.BLANK; if (praticaInstance instanceof DettPratica) { @@ -118,20 +108,17 @@ public class ProtocollazioneUtil { className = DettPratica.class.getName(); } else if (praticaInstance instanceof FineLavori) { groupId = ((FineLavori) praticaInstance).getGroupId(); - utenteScreenName = UserLocalServiceUtil.getUser(((FineLavori) praticaInstance).getUserId()) - .getScreenName(); + utenteScreenName = UserLocalServiceUtil.getUser(((FineLavori) praticaInstance).getUserId()).getScreenName(); praticaId = ((FineLavori) praticaInstance).getFineLavoriId(); companyId = ((FineLavori) praticaInstance).getCompanyId(); className = FineLavori.class.getName(); } else if (praticaInstance instanceof Collaudo) { groupId = ((Collaudo) praticaInstance).getGroupId(); - utenteScreenName = UserLocalServiceUtil.getUser(((Collaudo) praticaInstance).getUserId()) - .getScreenName(); + utenteScreenName = UserLocalServiceUtil.getUser(((Collaudo) praticaInstance).getUserId()).getScreenName(); praticaId = ((Collaudo) praticaInstance).getCollaudoId(); companyId = ((Collaudo) praticaInstance).getCompanyId(); className = Collaudo.class.getName(); } - List allegati = new ArrayList(); List docPraticas = DocPraticaLocalServiceUtil.findByClassPk(praticaId); for (DocPratica docPratica : docPraticas) { @@ -150,12 +137,10 @@ public class ProtocollazioneUtil { StreamUtil.cleanUp(inputStream); } } - allegato.setFileId(String.valueOf(docPratica.getDlFileEntryId())); allegato.setFileSha256(sha256); allegati.add(allegato); } - Protocollo protocolloBean = new Protocollo(); protocolloBean.setOggetto(generaOggettoProtocollo(className, praticaId)); protocolloBean.setChiuso(false); @@ -163,14 +148,13 @@ public class ProtocollazioneUtil { protocolloBean.setUtenteId(utenteScreenName); protocolloBean.setUfficioId(String.valueOf(groupId)); protocolloBean.setPraticaId(String.valueOf(praticaId)); - protocolloBean.setFiles(allegati); JSONObject risposta = HttpServiceUtil.postProtocolloBean(companyId, protocolloBean); return risposta.getString("anno") + String.format("%07d", risposta.getInt("numero")); } - public static String protocollaArrivoAccessoAtti(long groupId, long companyId, String userName, - long accessoAttiId, String className) throws Exception { + public static String protocollaArrivoAccessoAtti(long groupId, long companyId, String userName, long accessoAttiId, + String className) throws Exception { List allegati = new ArrayList(); File allegato = new File(); @@ -179,7 +163,6 @@ public class ProtocollazioneUtil { allegato.setFileId("0"); allegato.setFileSha256(sha256); allegati.add(allegato); - Protocollo protocolloBean = new Protocollo(); protocolloBean.setOggetto(generaOggettoProtocollo(className, accessoAttiId)); protocolloBean.setChiuso(false); @@ -187,7 +170,6 @@ public class ProtocollazioneUtil { protocolloBean.setUtenteId(userName); protocolloBean.setUfficioId(String.valueOf(groupId)); protocolloBean.setPraticaId(String.valueOf(accessoAttiId)); - protocolloBean.setFiles(allegati); JSONObject risposta = HttpServiceUtil.postProtocolloBean(companyId, protocolloBean); return risposta.getString("anno") + String.format("%07d", risposta.getInt("numero")); @@ -203,113 +185,78 @@ public class ProtocollazioneUtil { } catch (SystemException | PortalException e) { e.printStackTrace(); } - return "Oggetto: " + className + " " + classPk; } - public static List csvToOggettoProtocollo(java.io.File file) - throws FileNotFoundException, IOException, ParseException { + public static List csvToOggettoProtocollo(java.io.File file) throws FileNotFoundException, + IOException, ParseException { String[] FILE_PROTOCOLLO_HEADER = { "id", "mittente/destinatario id", "ufficio id", "oggetto", "numero fascicolo", "data inserimento", "tipo" }; - CSVFormat format = CSVFormat.EXCEL.withTrailingDelimiter().withHeader(FILE_PROTOCOLLO_HEADER) .withSkipHeaderRecord().withIgnoreEmptyLines().withIgnoreSurroundingSpaces(); - Iterable records = format.parse(new FileReader(file)); - List listaOggettoProtocollo = new ArrayList<>(); - for (CSVRecord csvRecord : records) { - listaOggettoProtocollo.add(new OggettoProtocollo(csvRecord.get("id"), csvRecord - .get("mittente/destinatario id"), csvRecord.get("ufficio id"), csvRecord.get("oggetto"), - csvRecord.get("numero fascicolo"), csvRecord.get("data inserimento"), csvRecord - .get("tipo"))); - + .get("mittente/destinatario id"), csvRecord.get("ufficio id"), csvRecord.get("oggetto"), csvRecord + .get("numero fascicolo"), csvRecord.get("data inserimento"), csvRecord.get("tipo"))); } - return listaOggettoProtocollo; } - public static List searchProtocolli(HttpServletRequest request, long companyId, - long userId) { - - List result = Collections.emptyList(); - - String ufficioIds = ""; + public static List searchProtocolli(HttpServletRequest request, long companyId, long userId) { + List result = Collections. emptyList(); + String ufficioIds = StringPool.BLANK; String anno = ParamUtil.getString(request, "annoRiferimento"); String numeroProtocollo = ParamUtil.getString(request, "numeroProtocollo"); int ufficioId = ParamUtil.getInteger(request, "ufficio"); - - if ((anno.equals("0000") || anno.equals(StringPool.BLANK)) - && (numeroProtocollo.equals(StringPool.BLANK))) { + if ((anno.equals("0000") || anno.equals(StringPool.BLANK)) && (numeroProtocollo.equals(StringPool.BLANK))) { return result; } - try { - if (ufficioId == -1) { - List organizationList = OrganizationLocalServiceUtil - .getUserOrganizations(userId); + List organizationList = OrganizationLocalServiceUtil.getUserOrganizations(userId); if (organizationList != null && !organizationList.isEmpty()) { List lista = new ArrayList(); - for (Organization org : organizationList) { lista.add(GetterUtil.getInteger(org.getGroupId())); } - ufficioIds = lista.toString().substring(1, lista.toString().length() - 1); } } else { - ufficioIds = "" + ufficioId; + ufficioIds = String.valueOf(ufficioId); } - - ufficioIds = ufficioIds.replaceAll(" ", ""); - - // String urlCSVService = PortletProps.get("protocollo.cvs.url"); + ufficioIds = ufficioIds.replaceAll(StringPool.SPACE, StringPool.BLANK); String urlCSVService = ConfigurazioneLocalServiceUtil.findByC_ChiaveString(companyId, ConfigurazioneConstants.PROTOCOLLAZIONE_SERVICE_EXPORT_URL); - String numeroFascicoloEntity = StringPool.BLANK; if (Validator.isNotNull(numeroProtocollo)) { anno = numeroProtocollo.substring(0, 4); - numeroFascicoloEntity = numeroProtocollo.substring(4, numeroProtocollo.length()) - .replaceFirst("^0+(?!$)", StringPool.BLANK); + numeroFascicoloEntity = numeroProtocollo.substring(4, numeroProtocollo.length()).replaceFirst( + "^0+(?!$)", StringPool.BLANK); } - String data = String.format("?anno=%s&ufficioIds=%s&numeroFascicolo=%s", anno, ufficioIds, numeroFascicoloEntity); - URL url = new URL(urlCSVService + data); - HttpURLConnection conn = (HttpURLConnection) url.openConnection(); conn.setDoOutput(true); conn.setRequestMethod("POST"); conn.setRequestProperty("Content-Type", "application/json"); - if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) { throw new RuntimeException("Failed : HTTP error code : " + conn.getResponseCode()); } - byte[] bytes = IOUtils.toByteArray(conn.getInputStream()); - java.io.File tempFile = java.io.File.createTempFile("prefix", "suffix", null); FileOutputStream fos = new FileOutputStream(tempFile); fos.write(bytes); - fos.flush(); fos.close(); conn.disconnect(); - return ProtocollazioneUtil.csvToOggettoProtocollo(tempFile); - } catch (Exception e) { - } - return result; - } -} +} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java index 24578633..9cc6d01c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/util/TempisticaConstants.java @@ -8,5 +8,4 @@ public class TempisticaConstants { public static final int STATO_ATTIVA = 1; public static final int STATO_IN_SCADENZA = 0; public static final int STATO_SCADUTA = -1; - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 147634ea..3859ae98 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2936 - build.date=1616499614230 + build.number=2962 + build.date=1616669288051 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/tld/c.tld b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/tld/c.tld similarity index 100% rename from liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/tld/c.tld rename to liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/tld/c.tld diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.tern-project b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.tern-project new file mode 100644 index 00000000..a185ba0d --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/.tern-project @@ -0,0 +1 @@ +{"ide":{"scriptPaths":[]},"plugins":{"aui":{},"liferay":{},"yui":{}},"libs":["ecma5","browser"]} \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/commons-lang.jar b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/commons-lang.jar deleted file mode 100644 index 98467d3a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/lib/commons-lang.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/src/it/tref/portos/comunicazione/ComunicazioneMediata.java b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/src/it/tref/portos/comunicazione/ComunicazioneMediata.java index a4e40322..c4be12d8 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/src/it/tref/portos/comunicazione/ComunicazioneMediata.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/WEB-INF/src/it/tref/portos/comunicazione/ComunicazioneMediata.java @@ -1,5 +1,12 @@ package it.tref.portos.comunicazione; +import it.tref.liferay.portos.bo.model.IntPratica; +import it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil; +import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; + import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; @@ -10,13 +17,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextFactory; import com.liferay.util.bridges.mvc.MVCPortlet; -import it.tref.liferay.portos.bo.model.IntPratica; -import it.tref.liferay.portos.bo.service.ComunicazioneServiceUtil; -import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; - -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; - /** * Portlet implementation class ComunicazioneMediata */ @@ -28,29 +28,25 @@ public class ComunicazioneMediata extends MVCPortlet { long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); String domanda = ParamUtil.getString(actionRequest, "domanda"); - try { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); if (Validator.isNotNull(intPratica)) { - ComunicazioneServiceUtil.addComunicazione(serviceContext.getUserId(), - intPratica.getIntPraticaId(), domanda, serviceContext); + ComunicazioneServiceUtil.addComunicazione(serviceContext.getUserId(), intPratica.getIntPraticaId(), + domanda, serviceContext); } } catch (PortalException | SystemException e) { _log.error(e, e); } } - public void updateComunicazione(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException { + public void updateComunicazione(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException { long comunicazioneId = ParamUtil.getLong(actionRequest, "comunicazioneId"); String risposta = ParamUtil.getString(actionRequest, "risposta"); try { ComunicazioneServiceUtil.updateComunicazione(comunicazioneId, risposta); - } catch (SystemException e) { _log.error(e, e); } } - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/html/comunicazionemediata/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/html/comunicazionemediata/view.jsp index 212fff46..43a04b7b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/html/comunicazionemediata/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-comunicazioni-portlet/docroot/html/comunicazionemediata/view.jsp @@ -1,147 +1,136 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.model.Comunicazione"%> +<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> <%@page import="it.tref.liferay.portos.bo.model.Territorio"%> -<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> -<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> -<%@page import="it.tref.liferay.portos.bo.service.DettPraticaServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.DettPratica"%> +<%@page import="it.tref.liferay.portos.bo.service.ComunicazioneLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> -<%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> +<%@page import="it.tref.liferay.portos.bo.service.TerritorioLocalServiceUtil"%> +<%@page import="it.tref.liferay.portos.bo.service.permission.IntPraticaPermission"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.ActionKeys"%> <%@page import="java.util.Date"%> -<%@page import="it.tref.liferay.portos.bo.model.Comunicazione"%> -<%@page import="it.tref.liferay.portos.bo.service.ComunicazioneLocalServiceUtil"%> -<%@ include file="/html/comunicazionemediata/init.jsp" %> - +<%@include file="/html/comunicazionemediata/init.jsp"%> <% - boolean inBO = ParamUtil.getBoolean(request,"inBO",false); - long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); - long territorioGroupId = territorio.getGroupId(); +boolean inBO = ParamUtil.getBoolean(request, "inBO", false); +long intPraticaId = ParamUtil.getLong(request, "intPraticaId"); +IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); +Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(intPratica.getTerritorioId()); +long territorioGroupId = territorio.getGroupId(); %> - - - +
<% - List comunicazioni = ComunicazioneLocalServiceUtil.findByIntPratica(intPraticaId, QueryUtil.ALL_POS, QueryUtil.ALL_POS, - OrderByComparatorFactoryUtil.create("portos_bo_Comunicazione", "comunicazioneId", true)); - if(comunicazioni.isEmpty()){ + List comunicazioni = ComunicazioneLocalServiceUtil.findByIntPratica(intPraticaId, + QueryUtil.ALL_POS, QueryUtil.ALL_POS, + OrderByComparatorFactoryUtil.create("portos_bo_Comunicazione", "comunicazioneId", true)); + if (comunicazioni.isEmpty()) { %>
-
Nessuna Comunicazione attiva
+
Nessuna Comunicazione attiva
<% - } else { - for(Comunicazione comunicazione : comunicazioni){ - + } else { + for (Comunicazione comunicazione : comunicazioni) { %> -
-
- - <%= dateFormatDateTime.format(comunicazione.getCreateDate()) %> - - <%= comunicazione.getDomanda() %> -
+
+
+ + <%= dateFormatDateTime.format(comunicazione.getCreateDate()) %> + + <%= comunicazione.getDomanda() %>
-
-
- - <%= comunicazione.getRisposta() %> - +
+
+
+ + <%= comunicazione.getRisposta() %> + + <% + String dataRisposta = StringPool.BLANK; + Date dtRisposta = comunicazione.getDtRisposta(); + if (Validator.isNotNull(dtRisposta)) { + dataRisposta = dateFormatDate.format(comunicazione.getDtRisposta()); + } + %> + <%= dataRisposta %> + + + + + Attualmente Nessuna Risposta + + <% - String dataRisposta = ""; - Date dtRisposta = comunicazione.getDtRisposta(); - if(Validator.isNotNull(dtRisposta)){ - dataRisposta = dateFormatDate.format(comunicazione.getDtRisposta()); - } + String random = StringUtil.randomId(); + String rispostaContentDiv = "ripostaContentComunicazione" + random; + String rispostaButtonId = "rispostaAddComunicazione" + random; + String rispostaFormName = "rispostaComunicazioneForm" + random; %> - <%= dataRisposta %> - - - - - Attualmente Nessuna Risposta - - - <% - String random = StringUtil.randomId(); - String rispostaContentDiv = "ripostaContentComunicazione"+random; - String rispostaButtonId = "rispostaAddComunicazione"+random; - String rispostaFormName = "rispostaComunicazioneForm"+random; - %> - - - - - - - -
- -
-
-
- - - -
+ + + + + + + +
+ +
+
+
+ + +
- -
- - - - - - - - +
+ +
+ + + + + + + - -
+
- - <% - } +
+ <% } + } %> - - - <% + + <% String contentDiv = "contentComunicazione"; String buttonId = "addComunicazione"; String formName = "comunicazioneForm"; - %> - + %>
- - + +
- - - + + + - -
- +
+
@@ -154,32 +143,29 @@
- - - - - + + + + +
- - - - +
- + - +
-
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java index 1b823330..0f770905 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java @@ -119,8 +119,8 @@ public class FascicoloFePortlet extends MVCPortlet { private static Log _log = LogFactoryUtil.getLog(FascicoloFePortlet.class); @Override - public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) - throws IOException, PortletException { + public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws IOException, + PortletException { ThemeDisplay themeDisplay = (ThemeDisplay) resourceRequest.getAttribute(WebKeys.THEME_DISPLAY); @@ -147,8 +147,7 @@ public class FascicoloFePortlet extends MVCPortlet { String provinciaId = ParamUtil.getString(resourceRequest, "provinciaId"); JSONArray jsonArray = JSONFactoryUtil.createJSONArray(); if (Validator.isNotNull(provinciaId) && !provinciaId.equals("0")) { - List comuni = TerritorioLocalServiceUtil - .getActiveComuniByCodiceProvincia(provinciaId); + List comuni = TerritorioLocalServiceUtil.getActiveComuniByCodiceProvincia(provinciaId); for (long comuneId : comuni) { JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); Comune comune = ComuneLocalServiceUtil.getComune(comuneId); @@ -165,8 +164,7 @@ public class FascicoloFePortlet extends MVCPortlet { JSONArray jsonArray = JSONFactoryUtil.createJSONArray(); if (Validator.isNotNull(comuneId)) { - List territori = TerritorioLocalServiceUtil - .getActiveTerritoriByComune(comuneId); + List territori = TerritorioLocalServiceUtil.getActiveTerritoriByComune(comuneId); for (Territorio territorio : territori) { JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); @@ -188,12 +186,10 @@ public class FascicoloFePortlet extends MVCPortlet { // List soggetti = // SoggettoLocalServiceUtil.findByIntPratica(intPraticaId); List soggetti = SoggettoLocalServiceUtil.getValidTmpByIntPratica(intPraticaId); - String cfTitolare = UserLocalServiceUtil.getUserById(intPratica.getUserId()) - .getScreenName(); + String cfTitolare = UserLocalServiceUtil.getUserById(intPratica.getUserId()).getScreenName(); for (Soggetto soggetto : soggetti) { - if (!soggetto.isRimosso() - && !soggetto.getCodiceFiscale().equalsIgnoreCase(cfTitolare)) { + if (!soggetto.isRimosso() && !soggetto.getCodiceFiscale().equalsIgnoreCase(cfTitolare)) { JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); jsonObject.put("soggettoId", soggetto.getSoggettoId()); @@ -260,8 +256,8 @@ public class FascicoloFePortlet extends MVCPortlet { InfoFascicolo infoFascicolo = InfoFascicoloLocalServiceUtil.fetchByIntPratica(intPratica .getIntPraticaId()); if (Validator.isNull(infoFascicolo)) { - infoFascicolo = InfoFascicoloLocalServiceUtil.addInfoFascicolo( - intPratica.getIntPraticaId(), intPratica.getNumeroProgetto(), serviceContext); + infoFascicolo = InfoFascicoloLocalServiceUtil.addInfoFascicolo(intPratica.getIntPraticaId(), + intPratica.getNumeroProgetto(), serviceContext); } else { if (infoFascicolo.getAlreadyImported() && comingFrom.equalsIgnoreCase("fe")) { _log.error("intpratica.import.file.already-clicked with intpraticaid=" + intPraticaId); @@ -308,21 +304,18 @@ public class FascicoloFePortlet extends MVCPortlet { long intPraticaId = ParamUtil.getLong(resourceRequest, "intPraticaId"); IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); - DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, - "Template"); + DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, "Template"); if (folder != null) { - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry( - themeDisplay.getCompanyGroupId(), folder.getFolderId(), - "visualizza_fascicolo.jrxml"); + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(themeDisplay.getCompanyGroupId(), + folder.getFolderId(), "visualizza_fascicolo.jrxml"); if (fileEntry != null) { JasperDesign jd = JRXmlLoader.load(fileEntry.getContentStream()); JasperReport jasperReport = JasperCompileManager.compileReport(jd); - Map parameters = ReportFascicoloUtil - .generateParametersReportFascicolo(intPraticaId, themeDisplay.getLocale(), - themeDisplay.getCompanyId()); + Map parameters = ReportFascicoloUtil.generateParametersReportFascicolo( + intPraticaId, themeDisplay.getLocale(), themeDisplay.getCompanyId()); parameters.put(ReportConstants.LOGO_REGIONE, getClass().getResource(ReportConstants.PATH_LOGO_REGIONE).getPath()); @@ -331,12 +324,10 @@ public class FascicoloFePortlet extends MVCPortlet { JRDataSource dataSource = new JREmptyDataSource(); - JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, - dataSource); + JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, dataSource); // Export to PDF. - String titleDoc = intPratica.getNumeroProgetto() + "_" + new Date().getTime() - + ".pdf"; + String titleDoc = intPratica.getNumeroProgetto() + "_" + new Date().getTime() + ".pdf"; jasperPrint.setName(titleDoc); @@ -344,8 +335,7 @@ public class FascicoloFePortlet extends MVCPortlet { HttpServletResponse response = PortalUtil.getHttpServletResponse(resourceResponse); ServletResponseUtil.sendFile(request, response, titleDoc, - JasperExportManager.exportReportToPdf(jasperPrint), - ContentTypes.APPLICATION_PDF); + JasperExportManager.exportReportToPdf(jasperPrint), ContentTypes.APPLICATION_PDF); // JasperExportManager.exportReportToPdfFile(jasperPrint, // "/DevCode/jasperreport/StyledTextReport "+ new @@ -362,22 +352,19 @@ public class FascicoloFePortlet extends MVCPortlet { IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); - DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, - "Template"); + DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, "Template"); if (folder != null) { - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry( - themeDisplay.getCompanyGroupId(), folder.getFolderId(), - "visualizza_fascicolo.jrxml"); + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(themeDisplay.getCompanyGroupId(), + folder.getFolderId(), "visualizza_fascicolo.jrxml"); if (fileEntry != null) { JasperDesign jd = JRXmlLoader.load(fileEntry.getContentStream()); JasperReport jasperReport = JasperCompileManager.compileReport(jd); - Map parameters = ReportFascicoloUtil - .generateParametersReportFascicoloVariante(intPraticaId, - dettPratica.getDettPraticaId(), themeDisplay.getLocale(), - themeDisplay.getCompanyId()); + Map parameters = ReportFascicoloUtil.generateParametersReportFascicoloVariante( + intPraticaId, dettPratica.getDettPraticaId(), themeDisplay.getLocale(), + themeDisplay.getCompanyId()); parameters.put(ReportConstants.LOGO_REGIONE, getClass().getResource(ReportConstants.PATH_LOGO_REGIONE).getPath()); @@ -386,12 +373,11 @@ public class FascicoloFePortlet extends MVCPortlet { JRDataSource dataSource = new JREmptyDataSource(); - JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, - dataSource); + JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, dataSource); // Export to PDF. - String titleDoc = "variante_" + intPratica.getNumeroProgetto() + "_" - + new Date().getTime() + ".pdf"; + String titleDoc = "variante_" + intPratica.getNumeroProgetto() + "_" + new Date().getTime() + + ".pdf"; jasperPrint.setName(titleDoc); @@ -399,8 +385,7 @@ public class FascicoloFePortlet extends MVCPortlet { HttpServletResponse response = PortalUtil.getHttpServletResponse(resourceResponse); ServletResponseUtil.sendFile(request, response, titleDoc, - JasperExportManager.exportReportToPdf(jasperPrint), - ContentTypes.APPLICATION_PDF); + JasperExportManager.exportReportToPdf(jasperPrint), ContentTypes.APPLICATION_PDF); } } @@ -411,13 +396,11 @@ public class FascicoloFePortlet extends MVCPortlet { IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); - DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, - "Template"); + DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, "Template"); if (folder != null) { - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry( - themeDisplay.getCompanyGroupId(), folder.getFolderId(), - "visualizza_fine_lavori.jrxml"); + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(themeDisplay.getCompanyGroupId(), + folder.getFolderId(), "visualizza_fine_lavori.jrxml"); if (fileEntry != null) { JasperDesign jd = JRXmlLoader.load(fileEntry.getContentStream()); @@ -434,12 +417,11 @@ public class FascicoloFePortlet extends MVCPortlet { JRDataSource dataSource = new JREmptyDataSource(); - JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, - dataSource); + JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, dataSource); // Export to PDF. - String titleDoc = "fine_lavori_" + intPratica.getNumeroProgetto() + "_" - + new Date().getTime() + ".pdf"; + String titleDoc = "fine_lavori_" + intPratica.getNumeroProgetto() + "_" + new Date().getTime() + + ".pdf"; jasperPrint.setName(titleDoc); @@ -447,8 +429,7 @@ public class FascicoloFePortlet extends MVCPortlet { HttpServletResponse response = PortalUtil.getHttpServletResponse(resourceResponse); ServletResponseUtil.sendFile(request, response, titleDoc, - JasperExportManager.exportReportToPdf(jasperPrint), - ContentTypes.APPLICATION_PDF); + JasperExportManager.exportReportToPdf(jasperPrint), ContentTypes.APPLICATION_PDF); } @@ -464,21 +445,18 @@ public class FascicoloFePortlet extends MVCPortlet { IntPratica intPratica = IntPraticaLocalServiceUtil.fetchIntPratica(intPraticaId); - DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, - "Template"); + DLFolder folder = DLFolderLocalServiceUtil.getFolder(themeDisplay.getCompanyGroupId(), 0L, "Template"); if (folder != null) { - FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry( - themeDisplay.getCompanyGroupId(), folder.getFolderId(), - "visualizza_collaudo.jrxml"); + FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(themeDisplay.getCompanyGroupId(), + folder.getFolderId(), "visualizza_collaudo.jrxml"); if (fileEntry != null) { JasperDesign jd = JRXmlLoader.load(fileEntry.getContentStream()); JasperReport jasperReport = JasperCompileManager.compileReport(jd); - Map parameters = ReportFascicoloUtil - .generateParametersReportFascicoloCollaudo(intPraticaId, collaudoId, - themeDisplay.getLocale(), themeDisplay.getCompanyId()); + Map parameters = ReportFascicoloUtil.generateParametersReportFascicoloCollaudo( + intPraticaId, collaudoId, themeDisplay.getLocale(), themeDisplay.getCompanyId()); parameters.put(ReportConstants.LOGO_REGIONE, getClass().getResource(ReportConstants.PATH_LOGO_REGIONE).getPath()); @@ -487,12 +465,11 @@ public class FascicoloFePortlet extends MVCPortlet { JRDataSource dataSource = new JREmptyDataSource(); - JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, - dataSource); + JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, dataSource); // Export to PDF. - String titleDoc = "collaudo_" + intPratica.getNumeroProgetto() + "_" - + new Date().getTime() + ".pdf"; + String titleDoc = "collaudo_" + intPratica.getNumeroProgetto() + "_" + new Date().getTime() + + ".pdf"; jasperPrint.setName(titleDoc); @@ -500,8 +477,7 @@ public class FascicoloFePortlet extends MVCPortlet { HttpServletResponse response = PortalUtil.getHttpServletResponse(resourceResponse); ServletResponseUtil.sendFile(request, response, titleDoc, - JasperExportManager.exportReportToPdf(jasperPrint), - ContentTypes.APPLICATION_PDF); + JasperExportManager.exportReportToPdf(jasperPrint), ContentTypes.APPLICATION_PDF); } } @@ -516,8 +492,8 @@ public class FascicoloFePortlet extends MVCPortlet { } - public void addFascicolo(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException, IOException { + public void addFascicolo(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, + SystemException, IOException { long comuneId = ParamUtil.getLong(actionRequest, "comune"); Territorio territorio = TerritorioLocalServiceUtil.findByComuneId(comuneId, 0, 1).get(0); @@ -525,8 +501,8 @@ public class FascicoloFePortlet extends MVCPortlet { String tipoProcedura = ParamUtil.getString(actionRequest, "tipoProcedura"); String successURL = ParamUtil.getString(actionRequest, "successURL"); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); - DettPratica dettPratica = DettPraticaServiceUtil.addDettPratica(territorio.getTerritorioId(), - tipoProcedura, serviceContext); + DettPratica dettPratica = DettPraticaServiceUtil.addDettPratica(territorio.getTerritorioId(), tipoProcedura, + serviceContext); successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "mvcPath", "/html/fascicolofe/edit_fascicolo.jsp"); @@ -546,8 +522,8 @@ public class FascicoloFePortlet extends MVCPortlet { Soggetto soggetto = SoggettoLocalServiceUtil.getSoggetto(soggettoId); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); - DelegaServiceUtil.addDelega(serviceContext.getUserId(), intPratica.getIntPraticaId(), - dettPraticaId, tipologia, soggetto.getCodiceFiscale(), serviceContext); + DelegaServiceUtil.addDelega(serviceContext.getUserId(), intPratica.getIntPraticaId(), dettPraticaId, + tipologia, soggetto.getCodiceFiscale(), serviceContext); } } catch (PortalException | SystemException e) { @@ -571,27 +547,24 @@ public class FascicoloFePortlet extends MVCPortlet { } - public void addGestioneUtenti(ActionRequest actionRequest, ActionResponse actionResponse) - throws Exception { + public void addGestioneUtenti(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); String successURL = ParamUtil.getString(actionRequest, "successURL"); try { - DettPratica lastDettPratica = DettPraticaLocalServiceUtil - .getLastCompletedByIntPratica(intPraticaId); + DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); // ADT BUG VARIAZIONE SOGGETTO MULTI-CLICK List tipoPraticheVariazioneSoggetto = new ArrayList(); tipoPraticheVariazioneSoggetto.add(TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO); DettPratica lastDettPraticaEditableVS = null; - lastDettPraticaEditableVS = DettPraticaLocalServiceUtil - .getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, tipoPraticheVariazioneSoggetto); + lastDettPraticaEditableVS = DettPraticaLocalServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( + intPraticaId, tipoPraticheVariazioneSoggetto); if (lastDettPraticaEditableVS == null) { - lastDettPraticaEditableVS = DettPraticaServiceUtil.addDettPraticaClonedToIntPratica( - intPraticaId, lastDettPratica.getDettPraticaId(), - TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO, serviceContext); + lastDettPraticaEditableVS = DettPraticaServiceUtil.addDettPraticaClonedToIntPratica(intPraticaId, + lastDettPratica.getDettPraticaId(), TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO, serviceContext); } successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "dettPraticaId", @@ -614,14 +587,13 @@ public class FascicoloFePortlet extends MVCPortlet { } - public void deleteGestioneUtenti(ActionRequest actionRequest, ActionResponse actionResponse) - throws Exception { + public void deleteGestioneUtenti(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { try { long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); String successURL = ParamUtil.getString(actionRequest, "successURL"); - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( - intPraticaId, Arrays.asList(new String[] { TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO })); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(new String[] { TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO })); if (Validator.isNull(dettPratica)) { throw new SystemException("no variazione-soggetti in progress int fascicolo #" + intPraticaId); } @@ -646,8 +618,7 @@ public class FascicoloFePortlet extends MVCPortlet { throw new SystemException("Impossibile creare variante"); } - DettPratica lastDettPratica = DettPraticaLocalServiceUtil - .getLastCompletedByIntPratica(intPraticaId); + DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); DettPratica dettPratica = DettPraticaServiceUtil.addDettPraticaClonedToIntPratica(intPraticaId, lastDettPratica.getDettPraticaId(), TipoIntegrazioneUtil.VARIANTE, serviceContext); @@ -677,8 +648,8 @@ public class FascicoloFePortlet extends MVCPortlet { try { long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); - DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica( - intPraticaId, Arrays.asList(new String[] { TipoIntegrazioneUtil.VARIANTE })); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(new String[] { TipoIntegrazioneUtil.VARIANTE })); if (Validator.isNull(dettPratica)) { throw new SystemException("no variante in progress int fascicolo #" + intPraticaId); } @@ -702,11 +673,9 @@ public class FascicoloFePortlet extends MVCPortlet { throw new SystemException("Impossibile creare integrazione"); } - DettPratica lastDettPratica = DettPraticaLocalServiceUtil - .getLastCompletedByIntPratica(intPraticaId); + DettPratica lastDettPratica = DettPraticaLocalServiceUtil.getLastCompletedByIntPratica(intPraticaId); DettPratica dettPratica = DettPraticaServiceUtil.addDettPraticaClonedToIntPratica(intPraticaId, - lastDettPratica.getDettPraticaId(), TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, - serviceContext); + lastDettPratica.getDettPraticaId(), TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE, serviceContext); successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "dettPraticaId", String.valueOf(dettPratica.getDettPraticaId())); @@ -722,14 +691,12 @@ public class FascicoloFePortlet extends MVCPortlet { } - public void deleteIntegrazione(ActionRequest actionRequest, ActionResponse actionResponse) - throws Exception { + public void deleteIntegrazione(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { try { long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); - DettPratica dettPratica = DettPraticaServiceUtil - .getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, - Arrays.asList(new String[] { TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE })); + DettPratica dettPratica = DettPraticaServiceUtil.getLastEditabledByIntPraticaAndTipoPratica(intPraticaId, + Arrays.asList(new String[] { TipoIntegrazioneUtil.RICHIESTA_INTEGRAZIONE })); if (Validator.isNull(dettPratica)) { throw new SystemException("no integrazione in progress int fascicolo #" + intPraticaId); } @@ -761,8 +728,7 @@ public class FascicoloFePortlet extends MVCPortlet { successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "fineLavoriId", String.valueOf(fineLavori.getFineLavoriId())); /* - * SDB: forse non è più necessario distinguere la fase i creazione - * di una nuovo fineLavori da un editing + * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un editing */ // successURL = // HttpUtil.addParameter(successURL, actionResponse.getNamespace() + @@ -836,8 +802,7 @@ public class FascicoloFePortlet extends MVCPortlet { public void verifyEntry(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { - ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), - actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), actionRequest); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); if (ValidazionePraticaUtil.praticaIsEditable(dettPraticaId) @@ -848,8 +813,7 @@ public class FascicoloFePortlet extends MVCPortlet { public void saveDettPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { - ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), - actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), actionRequest); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); @@ -864,8 +828,7 @@ public class FascicoloFePortlet extends MVCPortlet { String successURL = ParamUtil.getString(actionRequest, "successURL"); actionResponse.sendRedirect(successURL); } else if ("asseverazione".equalsIgnoreCase(cmd) - && AsseverazioniUtil.hasAsseverazioneAttiva(serviceContext.getUserId(), - dettPratica.getIntPraticaId())) { + && AsseverazioniUtil.hasAsseverazioneAttiva(serviceContext.getUserId(), dettPratica.getIntPraticaId())) { asseveraDomanda(actionRequest, actionResponse); String successURL = ParamUtil.getString(actionRequest, "successURL"); actionResponse.sendRedirect(successURL); @@ -880,8 +843,7 @@ public class FascicoloFePortlet extends MVCPortlet { public void saveTipoPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { - ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), - actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), actionRequest); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); @@ -896,8 +858,7 @@ public class FascicoloFePortlet extends MVCPortlet { String successURL = ParamUtil.getString(actionRequest, "successURL"); actionResponse.sendRedirect(successURL); } else if ("asseverazione".equalsIgnoreCase(cmd) - && AsseverazioniUtil.hasAsseverazioneAttiva(serviceContext.getUserId(), - dettPratica.getIntPraticaId())) { + && AsseverazioniUtil.hasAsseverazioneAttiva(serviceContext.getUserId(), dettPratica.getIntPraticaId())) { asseveraDomanda(actionRequest, actionResponse); String successURL = ParamUtil.getString(actionRequest, "successURL"); actionResponse.sendRedirect(successURL); @@ -937,14 +898,12 @@ public class FascicoloFePortlet extends MVCPortlet { if (bozza) { FineLavoriServiceUtil.updateFineLavori(userId, fineLavori.getFineLavoriId(), - fineLavori.getIntPraticaId(), parziale, false, dataFineLavori, - codiceFiscaleDelegato, normEsenteBollo, normEsenteCollaudo, - comunicazioneDirettoreLavori); + fineLavori.getIntPraticaId(), parziale, false, dataFineLavori, codiceFiscaleDelegato, + normEsenteBollo, normEsenteCollaudo, comunicazioneDirettoreLavori); } else { FineLavoriServiceUtil.updateFineLavori(userId, fineLavori.getFineLavoriId(), - fineLavori.getIntPraticaId(), parziale, false, dataFineLavori, - codiceFiscaleDelegato, normEsenteBollo, normEsenteCollaudo, - comunicazioneDirettoreLavori); + fineLavori.getIntPraticaId(), parziale, false, dataFineLavori, codiceFiscaleDelegato, + normEsenteBollo, normEsenteCollaudo, comunicazioneDirettoreLavori); } } @@ -953,17 +912,15 @@ public class FascicoloFePortlet extends MVCPortlet { if (Validator.isNull(redirect)) { String successURL = ParamUtil.getString(actionRequest, "successURL"); if (Validator.isNotNull(successURL)) { - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "fineLavoriId"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "fineLavoriId", String.valueOf(fineLavoriId)); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl", String.valueOf(!bozza)); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "fineLavoriId"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "fineLavoriId", + String.valueOf(fineLavoriId)); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl", + String.valueOf(!bozza)); /* - * SDB: forse non è più necessario distinguere la fase i - * creazione di una nuovo fineLavori da un editing + * SDB: forse non è più necessario distinguere la fase i creazione di una nuovo fineLavori da un + * editing */ // boolean isNewFineLavori = // ParamUtil.getBoolean(actionRequest, "isNewFineLavori"); @@ -1009,13 +966,11 @@ public class FascicoloFePortlet extends MVCPortlet { if (!collaudo.isCompletata()) { if (bozza) { - CollaudoServiceUtil.updateCollaudo(userId, collaudo.getCollaudoId(), - collaudo.getIntPraticaId(), parziale, false, dataCollaudo, codiceFiscaleDelegato, - normEsenteBollo, noteCollaudo); + CollaudoServiceUtil.updateCollaudo(userId, collaudo.getCollaudoId(), collaudo.getIntPraticaId(), + parziale, false, dataCollaudo, codiceFiscaleDelegato, normEsenteBollo, noteCollaudo); } else { - CollaudoServiceUtil.updateCollaudo(userId, collaudo.getCollaudoId(), - collaudo.getIntPraticaId(), parziale, false, dataCollaudo, codiceFiscaleDelegato, - normEsenteBollo, noteCollaudo); + CollaudoServiceUtil.updateCollaudo(userId, collaudo.getCollaudoId(), collaudo.getIntPraticaId(), + parziale, false, dataCollaudo, codiceFiscaleDelegato, normEsenteBollo, noteCollaudo); } } @@ -1024,14 +979,12 @@ public class FascicoloFePortlet extends MVCPortlet { if (Validator.isNull(redirect)) { String successURL = ParamUtil.getString(actionRequest, "successURL"); if (Validator.isNotNull(successURL)) { - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "collaudoId"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "collaudoId", String.valueOf(collaudoId)); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl", String.valueOf(!bozza)); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "collaudoId"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "collaudoId", + String.valueOf(collaudoId)); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl", + String.valueOf(!bozza)); actionResponse.sendRedirect(successURL); } } @@ -1051,8 +1004,8 @@ public class FascicoloFePortlet extends MVCPortlet { } } - private void asseveraDomanda(ActionRequest actionRequest, ActionResponse actionResponse) - throws IOException, NestableException { + private void asseveraDomanda(ActionRequest actionRequest, ActionResponse actionResponse) throws IOException, + NestableException { try { String dichiarazioni = ""; @@ -1069,13 +1022,11 @@ public class FascicoloFePortlet extends MVCPortlet { actionRequest); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); - if (AsseverazioniUtil.hasAsseverazioneAttiva(serviceContext.getUserId(), - dettPratica.getIntPraticaId())) { + if (AsseverazioniUtil.hasAsseverazioneAttiva(serviceContext.getUserId(), dettPratica.getIntPraticaId())) { User user = UserLocalServiceUtil.getUser(serviceContext.getUserId()); - List asseverazioni = AsseverazioneServiceUtil - .findByIntPratica_CodiceFiscale_InEsito(dettPratica.getIntPraticaId(), - user.getScreenName(), new String[] { DelegheUtil.STATO_ASSEGNATA }, - QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); + List asseverazioni = AsseverazioneServiceUtil.findByIntPratica_CodiceFiscale_InEsito( + dettPratica.getIntPraticaId(), user.getScreenName(), + new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); for (Asseverazione asseverazione : asseverazioni) { asseverazione.setDichiarazioni(dichiarazioni); AsseverazioneLocalServiceUtil.updateAsseverazione(asseverazione); @@ -1089,8 +1040,7 @@ public class FascicoloFePortlet extends MVCPortlet { } } - private void concludiDelegaDomanda(ActionRequest actionRequest, ActionResponse actionResponse) - throws Exception { + private void concludiDelegaDomanda(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception { try { ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), @@ -1098,15 +1048,13 @@ public class FascicoloFePortlet extends MVCPortlet { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); if (DelegheUtil.hasDelegaCompilazioneDomanda(serviceContext.getUserId(), dettPraticaId) - || DelegheUtil.hasDelegaCompilazioneSezioneGeologica(serviceContext.getUserId(), - dettPraticaId) + || DelegheUtil.hasDelegaCompilazioneSezioneGeologica(serviceContext.getUserId(), dettPraticaId) || DelegheUtil.hasDelegaFirmaAllegati(serviceContext.getUserId(), dettPraticaId)) { User user = UserLocalServiceUtil.getUser(serviceContext.getUserId()); List deleghe = DelegaServiceUtil.findByIntPratica_CodiceFiscale_InEsito( dettPratica.getIntPraticaId(), user.getScreenName(), - new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, - null); + new String[] { DelegheUtil.STATO_ASSEGNATA }, QueryUtil.ALL_POS, QueryUtil.ALL_POS, null); saveDatiDettPratica(dettPraticaId, actionRequest, actionResponse); @@ -1138,11 +1086,10 @@ public class FascicoloFePortlet extends MVCPortlet { } } - private void saveDatiDettPratica(long dettPraticaId, ActionRequest actionRequest, - ActionResponse actionResponse) throws Exception { + private void saveDatiDettPratica(long dettPraticaId, ActionRequest actionRequest, ActionResponse actionResponse) + throws Exception { - ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), - actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), actionRequest); DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); @@ -1159,7 +1106,6 @@ public class FascicoloFePortlet extends MVCPortlet { int statusTask = ParamUtil.getInteger(actionRequest, "statusTask"); boolean workflowForzato = ParamUtil.getBoolean(actionRequest, "workflowForzato"); long soggettoSostituitoId = ParamUtil.getLong(actionRequest, "soggettoSostituitoId"); - long oldDettPraticaId = ParamUtil.getLong(actionRequest, "oldDettPraticaId"); long variataDa = ParamUtil.getLong(actionRequest, "variataDa"); long varianteNumero = ParamUtil.getLong(actionRequest, "varianteNumero"); boolean varianteSostanziale = ParamUtil.getBoolean(actionRequest, "varianteSostanziale"); @@ -1176,19 +1122,18 @@ public class FascicoloFePortlet extends MVCPortlet { boolean isCodiceFiscaleDelegatoFineLavoriAuthorized = ParamUtil.getBoolean(actionRequest, "codiceFiscaleDelegatoFineLavoriEnabled"); - String codiceFiscaleDelegatoFineLavori = isCodiceFiscaleDelegatoFineLavoriAuthorized ? ParamUtil - .getString(actionRequest, "codiceFiscaleDelegatoFineLavori") : ""; + String codiceFiscaleDelegatoFineLavori = isCodiceFiscaleDelegatoFineLavoriAuthorized ? ParamUtil.getString( + actionRequest, "codiceFiscaleDelegatoFineLavori") : ""; boolean isCodiceFiscaleDelegatoCollaudoAuthorized = ParamUtil.getBoolean(actionRequest, "codiceFiscaleDelegatoCollaudoEnabled"); - String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil - .getString(actionRequest, "codiceFiscaleDelegatoCollaudo") : ""; + String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil.getString( + actionRequest, "codiceFiscaleDelegatoCollaudo") : ""; // FIXME A che serve??? String codiceRuoloDelegato = ParamUtil.getString(actionRequest, "codiceRuoloDelegato"); - boolean inizioLavoriContestualeOpera = ParamUtil.getBoolean(actionRequest, - "inizioLavoriContestualeOpera"); + boolean inizioLavoriContestualeOpera = ParamUtil.getBoolean(actionRequest, "inizioLavoriContestualeOpera"); long pagamentoId = ParamUtil.getLong(actionRequest, "pagamentoId"); Date dataEffettuazione = ParamUtil.getDate(actionRequest, "dataEffettuazione", @@ -1228,40 +1173,33 @@ public class FascicoloFePortlet extends MVCPortlet { Double pagRilascioAttestazioni = ParamUtil.getDouble(actionRequest, "pagRilascioAttestazioni"); Double pagConsultazioniArchivio = ParamUtil.getDouble(actionRequest, "pagConsultazioniArchivio"); - /*boolean pagNuoveCostruzioni = ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni"); - int pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico"); - int pagMiglioramentoSismico = ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico"); - boolean pagRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, - "pagRiparazioneInterventoLocale"); - int pagNuovaCostruzione = ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione"); - boolean pagVarianti = ParamUtil.getBoolean(actionRequest, "pagVarianti"); - int pagAltro = ParamUtil.getInteger(actionRequest, "pagAltro"); - boolean pagMiglioramentoSismicoSicilia = ParamUtil.getBoolean(actionRequest, - "pagMiglioramentoSismicoSicilia"); - String pagCalcolatoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoAdeguamentoSismico"); - String pagCalcolatoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoMiglioramentoSismico"); - String pagCalcolatoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagCalcolatoRiparazioneInterventoLocale"); - String pagCalcolatoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagCalcolatoOperaNonQuantificabile"); - String pagEffettivoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoAdeguamentoSismico"); - String pagEffettivoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoMiglioramentoSismico"); - String pagEffettivoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagEffettivoRiparazioneInterventoLocale"); - String pagEffettivoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagEffettivoOperaNonQuantificabile"); - String pagNoteUtente = ParamUtil.getString(actionRequest, "pagNoteUtente");*/ + /* + * boolean pagNuoveCostruzioni = ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni"); int + * pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico"); int + * pagMiglioramentoSismico = ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico"); boolean + * pagRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, "pagRiparazioneInterventoLocale"); int + * pagNuovaCostruzione = ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione"); boolean pagVarianti = + * ParamUtil.getBoolean(actionRequest, "pagVarianti"); int pagAltro = ParamUtil.getInteger(actionRequest, + * "pagAltro"); boolean pagMiglioramentoSismicoSicilia = ParamUtil.getBoolean(actionRequest, + * "pagMiglioramentoSismicoSicilia"); String pagCalcolatoAdeguamentoSismico = ParamUtil.getString(actionRequest, + * "pagCalcolatoAdeguamentoSismico"); String pagCalcolatoMiglioramentoSismico = + * ParamUtil.getString(actionRequest, "pagCalcolatoMiglioramentoSismico"); String + * pagCalcolatoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, + * "pagCalcolatoRiparazioneInterventoLocale"); String pagCalcolatoOperaNonQuantificabile = + * ParamUtil.getString(actionRequest, "pagCalcolatoOperaNonQuantificabile"); String + * pagEffettivoAdeguamentoSismico = ParamUtil.getString(actionRequest, "pagEffettivoAdeguamentoSismico"); String + * pagEffettivoMiglioramentoSismico = ParamUtil.getString(actionRequest, "pagEffettivoMiglioramentoSismico"); + * String pagEffettivoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, + * "pagEffettivoRiparazioneInterventoLocale"); String pagEffettivoOperaNonQuantificabile = + * ParamUtil.getString(actionRequest, "pagEffettivoOperaNonQuantificabile"); String pagNoteUtente = + * ParamUtil.getString(actionRequest, "pagNoteUtente"); + */ // SEZIONE DETTAGLI PRINCIPALI String livelloDiTutela = ParamUtil.getString(actionRequest, "livelloDiTutela"); String paesaggioLocale = ParamUtil.getString(actionRequest, "paesaggioLocale"); String vincoli = ParamUtil.getString(actionRequest, "vincoli"); - String destinazioneAltroIntervento = ParamUtil - .getString(actionRequest, "destinazioneAltroIntervento"); + String destinazioneAltroIntervento = ParamUtil.getString(actionRequest, "destinazioneAltroIntervento"); boolean tcCostruzioniEsistenti = ParamUtil.getBoolean(actionRequest, "tcCostruzioniEsistenti"); boolean tcManutOrdStraord = ParamUtil.getBoolean(actionRequest, "tcManutOrdStraord"); boolean tcAltriInterventi = ParamUtil.getBoolean(actionRequest, "tcAltriInterventi"); @@ -1269,8 +1207,7 @@ public class FascicoloFePortlet extends MVCPortlet { boolean collaudoStatico = ParamUtil.getBoolean(actionRequest, "collaudoStatico"); boolean noCollaudo = ParamUtil.getBoolean(actionRequest, "noCollaudo"); - boolean lavoriInEconomiaCommittente = ParamUtil.getBoolean(actionRequest, - "lavoriInEconomiaCommittente"); + boolean lavoriInEconomiaCommittente = ParamUtil.getBoolean(actionRequest, "lavoriInEconomiaCommittente"); String destinazione = ParamUtil.getString(actionRequest, "destinazione"); // String tipologiaSistemaCostruttivo = // ParamUtil.getString(actionRequest, @@ -1287,28 +1224,22 @@ public class FascicoloFePortlet extends MVCPortlet { String numeroCivico = ParamUtil.getString(actionRequest, "numeroCivico"); String dcFoglio = ParamUtil.getString(actionRequest, "dcFoglio"); String dcAllegato = ParamUtil.getString(actionRequest, "dcAllegato"); - String particella1 = ParamUtil.getString(actionRequest, "particella1", "").replaceAll( - Pattern.quote("|"), " "); - String particella2 = ParamUtil.getString(actionRequest, "particella2", "").replaceAll( - Pattern.quote("|"), " "); - String particella3 = ParamUtil.getString(actionRequest, "particella3", "").replaceAll( - Pattern.quote("|"), " "); - String particella4 = ParamUtil.getString(actionRequest, "particella4", "").replaceAll( - Pattern.quote("|"), " "); + String particella1 = ParamUtil.getString(actionRequest, "particella1", "").replaceAll(Pattern.quote("|"), " "); + String particella2 = ParamUtil.getString(actionRequest, "particella2", "").replaceAll(Pattern.quote("|"), " "); + String particella3 = ParamUtil.getString(actionRequest, "particella3", "").replaceAll(Pattern.quote("|"), " "); + String particella4 = ParamUtil.getString(actionRequest, "particella4", "").replaceAll(Pattern.quote("|"), " "); String dcParticelle = particella1 + StringPool.PIPE + particella2 + StringPool.PIPE + particella3 + StringPool.PIPE + particella4; String latitudine = ParamUtil.getString(actionRequest, "lat", "").replaceAll(Pattern.quote("|"), " "); - String longitudine = ParamUtil.getString(actionRequest, "long", "").replaceAll(Pattern.quote("|"), - " "); + String longitudine = ParamUtil.getString(actionRequest, "long", "").replaceAll(Pattern.quote("|"), " "); String zoom = ParamUtil.getString(actionRequest, "zoom", "").replaceAll(Pattern.quote("|"), " "); String localizzazioneGeografica = latitudine + StringPool.PIPE + longitudine + StringPool.PIPE + zoom; boolean tcNuovaCostruzione = ParamUtil.getBoolean(actionRequest, "tcNuovaCostruzione"); boolean tcAdeguamentoSismico = ParamUtil.getBoolean(actionRequest, "tcAdeguamentoSismico"); boolean tcMiglioramentoSismico = ParamUtil.getBoolean(actionRequest, "tcMiglioramentoSismico"); - boolean tcRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, - "tcRiparazioneInterventoLocale"); + boolean tcRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, "tcRiparazioneInterventoLocale"); boolean tcInCA = ParamUtil.getBoolean(actionRequest, "tcInCA"); boolean tcInOpera = ParamUtil.getBoolean(actionRequest, "tcInOpera"); @@ -1323,10 +1254,8 @@ public class FascicoloFePortlet extends MVCPortlet { boolean tcAltro = ParamUtil.getBoolean(actionRequest, "tcAltro"); String tcAltroDescrizione = ParamUtil.getString(actionRequest, "tcAltroDescrizione"); boolean tcConDispositivi = ParamUtil.getBoolean(actionRequest, "tcConDispositivi"); - boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, - "tcNuovaCostruzionePertinenza"); - boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, - "tcInterventoOpereEscavazione"); + boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, "tcNuovaCostruzionePertinenza"); + boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, "tcInterventoOpereEscavazione"); boolean tcViarch = ParamUtil.getBoolean(actionRequest, "tcViarch"); boolean tcOperaA25 = ParamUtil.getBoolean(actionRequest, "tcOperaA25"); @@ -1355,34 +1284,28 @@ public class FascicoloFePortlet extends MVCPortlet { boolean deInfAltro = ParamUtil.getBoolean(actionRequest, "deInfAltro"); String deInfAltroDesc = ParamUtil.getString(actionRequest, "deInfAltroDesc"); String dccFondazioni = ParamUtil.getString(actionRequest, "dccFondazioni"); - boolean dccStruttureEleMuraturePietrame = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMuraturePietrame"); + boolean dccStruttureEleMuraturePietrame = ParamUtil + .getBoolean(actionRequest, "dccStruttureEleMuraturePietrame"); boolean dccStruttureEleMuratureLaterizio = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMuratureLaterizio"); - boolean dccStruttureEleMuratureMisto = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMuratureMisto"); - boolean dccStruttureEleMuratureStoriche = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMuratureStoriche"); + boolean dccStruttureEleMuratureMisto = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMuratureMisto"); + boolean dccStruttureEleMuratureStoriche = ParamUtil + .getBoolean(actionRequest, "dccStruttureEleMuratureStoriche"); String dccStruttureEleAcciaio = ParamUtil.getString(actionRequest, "dccStruttureEleAcciaio"); String dccStruttureEleCA = ParamUtil.getString(actionRequest, "dccStruttureEleCA"); String dccStruttureEleLegno = ParamUtil.getString(actionRequest, "dccStruttureEleLegno"); boolean dccStruttureEleMistoCA = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoCA"); - boolean dccStruttureEleMistoAcciaio = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMistoAcciaio"); - boolean dccStruttureEleMistoMuratura = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMistoMuratura"); + boolean dccStruttureEleMistoAcciaio = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoAcciaio"); + boolean dccStruttureEleMistoMuratura = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoMuratura"); boolean dccStruttureEleMistoLegno = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoLegno"); - boolean dccStruttureElePrefabbricato = ParamUtil.getBoolean(actionRequest, - "dccStruttureElePrefabbricato"); + boolean dccStruttureElePrefabbricato = ParamUtil.getBoolean(actionRequest, "dccStruttureElePrefabbricato"); boolean dccStruttureEleAltro = ParamUtil.getBoolean(actionRequest, "dccStruttureEleAltro"); - String dccStruttureEleAltroDescrizione = ParamUtil.getString(actionRequest, - "dccStruttureEleAltroDescrizione"); - boolean dccOrizzontamentiCAAcciaio = ParamUtil - .getBoolean(actionRequest, "dccOrizzontamentiCAAcciaio"); + String dccStruttureEleAltroDescrizione = ParamUtil.getString(actionRequest, "dccStruttureEleAltroDescrizione"); + boolean dccOrizzontamentiCAAcciaio = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiCAAcciaio"); boolean dccOrizzontamentiLegno = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiLegno"); boolean dccOrizzontamentiLegnoCA = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiLegnoCA"); - boolean dccOrizzontamentiLamieraGrecata = ParamUtil.getBoolean(actionRequest, - "dccOrizzontamentiLamieraGrecata"); + boolean dccOrizzontamentiLamieraGrecata = ParamUtil + .getBoolean(actionRequest, "dccOrizzontamentiLamieraGrecata"); boolean dccOrizzontamentiVolte = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiVolte"); boolean dccOrizzontamentiAltro = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiAltro"); String dccOrizzontamentiAltroDescrizione = ParamUtil.getString(actionRequest, @@ -1391,35 +1314,24 @@ public class FascicoloFePortlet extends MVCPortlet { boolean dccCoperturaCAAcciaio = ParamUtil.getBoolean(actionRequest, "dccCoperturaCAAcciaio"); boolean dccCoperturaLegno = ParamUtil.getBoolean(actionRequest, "dccCoperturaLegno"); boolean dccCoperturaLegnoCA = ParamUtil.getBoolean(actionRequest, "dccCoperturaLegnoCA"); - boolean dccCoperturaLamieraGrecata = ParamUtil - .getBoolean(actionRequest, "dccCoperturaLamieraGrecata"); + boolean dccCoperturaLamieraGrecata = ParamUtil.getBoolean(actionRequest, "dccCoperturaLamieraGrecata"); boolean dccCoperturaPannelli = ParamUtil.getBoolean(actionRequest, "dccCoperturaPannelli"); boolean dccCoperturaPVCTelonati = ParamUtil.getBoolean(actionRequest, "dccCoperturaPVCTelonati"); boolean dccCoperturaLeggere = ParamUtil.getBoolean(actionRequest, "dccCoperturaLeggere"); boolean dccCoperturaAltro = ParamUtil.getBoolean(actionRequest, "dccCoperturaAltro"); - String dccCoperturaAltroDesrizione = ParamUtil - .getString(actionRequest, "dccCoperturaAltroDesrizione"); + String dccCoperturaAltroDesrizione = ParamUtil.getString(actionRequest, "dccCoperturaAltroDesrizione"); boolean dccElemNonStrutLaterizio = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutLaterizio"); - boolean dccElemNonStrutCartongesso = ParamUtil - .getBoolean(actionRequest, "dccElemNonStrutCartongesso"); - boolean dccElemNonStrutCalcestruzzo = ParamUtil.getBoolean(actionRequest, - "dccElemNonStrutCalcestruzzo"); + boolean dccElemNonStrutCartongesso = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutCartongesso"); + boolean dccElemNonStrutCalcestruzzo = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutCalcestruzzo"); boolean dccElemNonStrutLegno = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutLegno"); boolean dccElemNonStrutAltro = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutAltro"); - String dccElemNonStrutAltroDescrizione = ParamUtil.getString(actionRequest, - "dccElemNonStrutAltroDescrizione"); - boolean dccOpereDiRinforzoInsCatene = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoInsCatene"); - boolean dccOpereDiRinforzoInsCordoli = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoInsCordoli"); - boolean dccOpereDiRinforzoIniArmate = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoIniArmate"); - boolean dccOpereDiRinforzoPlaccaggi = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoPlaccaggi"); - boolean dccOpereDiRinforzoIrrSolai = ParamUtil - .getBoolean(actionRequest, "dccOpereDiRinforzoIrrSolai"); - boolean dccOpereDiRinforzoRinforziFRP = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoRinforziFRP"); + String dccElemNonStrutAltroDescrizione = ParamUtil.getString(actionRequest, "dccElemNonStrutAltroDescrizione"); + boolean dccOpereDiRinforzoInsCatene = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoInsCatene"); + boolean dccOpereDiRinforzoInsCordoli = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoInsCordoli"); + boolean dccOpereDiRinforzoIniArmate = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoIniArmate"); + boolean dccOpereDiRinforzoPlaccaggi = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoPlaccaggi"); + boolean dccOpereDiRinforzoIrrSolai = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoIrrSolai"); + boolean dccOpereDiRinforzoRinforziFRP = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoRinforziFRP"); boolean dccOpereDiRinforzoTelaiECerchiature = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoTelaiECerchiature"); boolean dccOpereDiRinforzoInsRompitratta = ParamUtil.getBoolean(actionRequest, @@ -1467,8 +1379,7 @@ public class FascicoloFePortlet extends MVCPortlet { dettPratica.getGeoPresenzaPrescrizioni()); String geoNotePrescrizioni = getNotNullString(actionRequest, "geoNotePrescrizioni", dettPratica.getGeoNotePrescrizioni()); - String geoNoteIndagini = getNotNullString(actionRequest, "geoNoteIndagini", - dettPratica.getGeoNoteIndagini()); + String geoNoteIndagini = getNotNullString(actionRequest, "geoNoteIndagini", dettPratica.getGeoNoteIndagini()); String geoEvidenzeGeomorfiche = getNotNullString(actionRequest, "geoEvidenzeGeomorfiche", dettPratica.getGeoEvidenzeGeomorfiche()); String geoEvidenzeGeologiche = getNotNullString(actionRequest, "geoEvidenzeGeologiche", @@ -1510,94 +1421,84 @@ public class FascicoloFePortlet extends MVCPortlet { boolean sanatoriaEdilizia724 = ParamUtil.getBoolean(actionRequest, "sanatoriaEdilizia724"); boolean sanatoriaEdilizia326 = ParamUtil.getBoolean(actionRequest, "sanatoriaEdilizia326"); String interventoVoceP7 = ParamUtil.getString(actionRequest, "interventoVoceP7"); - - boolean normLavoriNoDirettore = ParamUtil.getBoolean(actionRequest, "normLavoriNoDirettore"); + + boolean normLavoriNoDirettore = ParamUtil.getBoolean(actionRequest, "normLavoriNoDirettore"); long userId = PortalUtil.getUserId(actionRequest); try { DettPraticaServiceUtil.updateDettPratica(userId, dettPratica.getDettPraticaId(), - dettPratica.getIntPraticaId(), integrazione, protocollo, tipoIntegrazione, completa, - gestita, codicePagamento, causalePagamento, mezzoPagamento, importoBolli, - importoSpeseIstruttoria, dataEffettuazione, statusTask, workflowForzato, - soggettoSostituitoId, oldDettPraticaId, destinazione, ag, descLongIntervento, via, - localita, estremiCatastali, estremiPratCom, variataDa, varianteNumero, + dettPratica.getIntPraticaId(), integrazione, protocollo, tipoIntegrazione, completa, gestita, + codicePagamento, causalePagamento, mezzoPagamento, importoBolli, importoSpeseIstruttoria, + dataEffettuazione, statusTask, workflowForzato, soggettoSostituitoId, destinazione, ag, + descLongIntervento, via, localita, estremiCatastali, estremiPratCom, variataDa, varianteNumero, varianteSostanziale, operaConforme, collaudoStatico, codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, codiceRuoloDelegato, lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, dataInizioLavoriOpera, - dataInizioEsecuzioneOpera, dataFineEsecuzioneOpera, metratura, lavoriPubblici, - pagamentoId, lavoriPubbliciPercentuale, numeroCivico, dcParticelle, dcFoglio, dcAllegato, - dePiani, deAltezza, deInterrati, deSuperficie, deCostruzione, deRistrutturazione, deUso, - dePubblica, dePrivata, deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, - deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, - deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, dccFondazioni, - dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, + dataInizioEsecuzioneOpera, dataFineEsecuzioneOpera, metratura, lavoriPubblici, pagamentoId, + lavoriPubbliciPercentuale, numeroCivico, dcParticelle, dcFoglio, dcAllegato, dePiani, deAltezza, + deInterrati, deSuperficie, deCostruzione, deRistrutturazione, deUso, dePubblica, dePrivata, + deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, deInfStradaleStrada, deInfStradaleAltro, + deInfIdraulicaLong, deInfIdraulicaTrasv, deInfIdraulicaAltro, deInfOperaAccStradale, + deInfOperaAccIdraulica, deInfOperaAccAltro, deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, + dccFondazioni, dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, - dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, - dccStruttureEleMistoAcciaio, dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, - dccStruttureElePrefabbricato, dccStruttureEleAltro, dccStruttureEleAltroDescrizione, - dccOrizzontamentiCAAcciaio, dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, - dccOrizzontamentiLamieraGrecata, dccOrizzontamentiVolte, dccOrizzontamentiAltro, - dccOrizzontamentiAltroDescrizione, dccCopertura, dccCoperturaCAAcciaio, - dccCoperturaLegno, dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, dccCoperturaPannelli, - dccCoperturaPVCTelonati, dccCoperturaLeggere, dccCoperturaAltro, + dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, + dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, dccStruttureElePrefabbricato, + dccStruttureEleAltro, dccStruttureEleAltroDescrizione, dccOrizzontamentiCAAcciaio, + dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, dccOrizzontamentiLamieraGrecata, + dccOrizzontamentiVolte, dccOrizzontamentiAltro, dccOrizzontamentiAltroDescrizione, dccCopertura, + dccCoperturaCAAcciaio, dccCoperturaLegno, dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, + dccCoperturaPannelli, dccCoperturaPVCTelonati, dccCoperturaLeggere, dccCoperturaAltro, dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, dccElemNonStrutLegno, dccElemNonStrutAltro, - dccElemNonStrutAltroDescrizione, dccOpereDiRinforzoInsCatene, - dccOpereDiRinforzoInsCordoli, dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, - dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - dccOpereDiRinforzoTelaiECerchiature, dccOpereDiRinforzoInsRompitratta, - dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, geoClasseIndagine, - geoCategoriaSottosuolo, geoCategoriaTopografica, geoConsolidamento, + dccElemNonStrutAltroDescrizione, dccOpereDiRinforzoInsCatene, dccOpereDiRinforzoInsCordoli, + dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, dccOpereDiRinforzoIrrSolai, + dccOpereDiRinforzoRinforziFRP, dccOpereDiRinforzoTelaiECerchiature, + dccOpereDiRinforzoInsRompitratta, dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, + geoClasseIndagine, geoCategoriaSottosuolo, geoCategoriaTopografica, geoConsolidamento, geoPericolositaGeologica, geoRischioGeomorfologicoPai, geoPericolositaIdraulicaPai, geoRischioIdraulicoPai, geoPericolositaSismica, geoPericolositaIdraulica, - geoPericolositaGeomorfica, geoFattibilitaGeologica, geoFattibilitaSismica, - geoFattibilitaIdraulica, geoOperaRilevante, geoOpereDiSostegno, geoOpereInSotterranea, - geoPresenzaPrescrizioni, geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, - geoEvidenzeGeologiche, geoDtRelazione, pagInterventiRestauroManufatti, - pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, - pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, - pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, + geoPericolositaGeomorfica, geoFattibilitaGeologica, geoFattibilitaSismica, geoFattibilitaIdraulica, + geoOperaRilevante, geoOpereDiSostegno, geoOpereInSotterranea, geoPresenzaPrescrizioni, + geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, geoEvidenzeGeologiche, + geoDtRelazione, pagInterventiRestauroManufatti, pagAltriCasiCulturali, pagLottizzazioni, + pagGrandiStrutture, pagCondotte, pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, + pagImmobiliPreesistenti, pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, note, noteUfficio, - localizzazioneGeografica, tcNuovaCostruzione, tcAdeguamentoSismico, - tcMiglioramentoSismico, tcRiparazioneInterventoLocale, tcInCA, tcInOpera, - tcPrefabbricato, tcInAcciaio, tcMista, tcInMuratura, tcInMuraturaOrdinaria, - tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, tcAltro, tcAltroDescrizione, - tcConDispositivi, normLavoriInProprio, normEsenteBollo, normEsenteSpese, normDpr01Dep, - normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, normDm2018, - normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, - normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, - intervFinPub, intervFinPubDesc, serviceContext, bozza, disabledSubmit, geoDisabledSubmit, - paesaggioLocale, livelloDiTutela, vincoli, destinazioneAltroIntervento, - tcCostruzioniEsistenti, tcManutOrdStraord, tcAltriInterventi, tcAltriInterventiDesc, - noCollaudo, tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, tcViarch, - tcOperaA25, sanatoriaEdilizia47, sanatoriaEdilizia724, sanatoriaEdilizia326, normLavoriNoDirettore, - pagSoggettiAdAutorizzazione, interventoVoceP7); + localizzazioneGeografica, tcNuovaCostruzione, tcAdeguamentoSismico, tcMiglioramentoSismico, + tcRiparazioneInterventoLocale, tcInCA, tcInOpera, tcPrefabbricato, tcInAcciaio, tcMista, + tcInMuratura, tcInMuraturaOrdinaria, tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, tcAltro, + tcAltroDescrizione, tcConDispositivi, normLavoriInProprio, normEsenteBollo, normEsenteSpese, + normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, normDm2018, + normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, normDm05, + normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, intervFinPub, + intervFinPubDesc, serviceContext, bozza, disabledSubmit, geoDisabledSubmit, paesaggioLocale, + livelloDiTutela, vincoli, destinazioneAltroIntervento, tcCostruzioniEsistenti, tcManutOrdStraord, + tcAltriInterventi, tcAltriInterventiDesc, noCollaudo, tcNuovaCostruzionePertinenza, + tcInterventoOpereEscavazione, tcViarch, tcOperaA25, sanatoriaEdilizia47, sanatoriaEdilizia724, + sanatoriaEdilizia326, normLavoriNoDirettore, pagSoggettiAdAutorizzazione, interventoVoceP7); String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { String successURL = ParamUtil.getString(actionRequest, "successURL"); if (Validator.isNotNull(successURL)) { - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl"); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "verifyArea"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl", String.valueOf(!bozza)); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl"); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "verifyArea"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl", + String.valueOf(!bozza)); String verifyArea = ParamUtil.getString(actionRequest, "verifyArea", StringPool.BLANK); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "verifyArea", String.valueOf(verifyArea)); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "verifyArea", + String.valueOf(verifyArea)); String fragmentURL = ParamUtil.getString(actionRequest, "current_tab"); if (Validator.isNotNull(fragmentURL)) { - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "current_tab"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "current_tab", fragmentURL); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "historyKey"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "historyKey", "_1_WAR_portosfeportlet_tab=" + fragmentURL); + successURL = HttpUtil + .removeParameter(successURL, actionResponse.getNamespace() + "current_tab"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "current_tab", + fragmentURL); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "historyKey"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "historyKey", + "_1_WAR_portosfeportlet_tab=" + fragmentURL); if (successURL.contains("#")) { successURL = successURL.substring(0, successURL.lastIndexOf("#")); @@ -1605,21 +1506,17 @@ public class FascicoloFePortlet extends MVCPortlet { successURL += "#_1_WAR_portosfeportlet_tab=" + fragmentURL; } // ADT BUG FE ID = 14 - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "saveAndVerify"); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "saveAndVerify"); if ("saveAndVerify".equalsIgnoreCase(cmd)) - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "saveAndVerify", true); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "saveAndVerify", + true); actionResponse.sendRedirect(successURL); } else { actionResponse.setRenderParameter("mvcPath", "/html/fascicolofe/edit_fascicolo.jsp"); - actionResponse.setRenderParameter("backURL", - ParamUtil.getString(actionRequest, "backURL")); - actionResponse.setRenderParameter("dettPraticaId", - String.valueOf(dettPratica.getDettPraticaId())); - actionResponse.setRenderParameter("intPraticaId", - String.valueOf(dettPratica.getIntPraticaId())); + actionResponse.setRenderParameter("backURL", ParamUtil.getString(actionRequest, "backURL")); + actionResponse.setRenderParameter("dettPraticaId", String.valueOf(dettPratica.getDettPraticaId())); + actionResponse.setRenderParameter("intPraticaId", String.valueOf(dettPratica.getIntPraticaId())); actionResponse.setRenderParameter("openVerifyUrl", String.valueOf(!bozza)); } } @@ -1643,16 +1540,14 @@ public class FascicoloFePortlet extends MVCPortlet { } private Date getNotNullDate(ActionRequest actionRequest, String param, Date currentValue) { - Date value = ParamUtil.getDate(actionRequest, param, - DateFormatFactoryUtil.getDate(actionRequest.getLocale())); + Date value = ParamUtil.getDate(actionRequest, param, DateFormatFactoryUtil.getDate(actionRequest.getLocale())); return Validator.isNull(value) ? currentValue : value; } - private void saveDatiTipoPratica(long dettPraticaId, ActionRequest actionRequest, - ActionResponse actionResponse) throws Exception { + private void saveDatiTipoPratica(long dettPraticaId, ActionRequest actionRequest, ActionResponse actionResponse) + throws Exception { - ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), - actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), actionRequest); // long dettPraticaId = ParamUtil.getLong(actionRequest, // "dettPraticaId"); @@ -1678,16 +1573,15 @@ public class FascicoloFePortlet extends MVCPortlet { boolean isCodiceFiscaleDelegatoFineLavoriAuthorized = ParamUtil.getBoolean(actionRequest, "codiceFiscaleDelegatoFineLavoriEnabled"); - String codiceFiscaleDelegatoFineLavori = isCodiceFiscaleDelegatoFineLavoriAuthorized ? ParamUtil - .getString(actionRequest, "codiceFiscaleDelegatoFineLavori") : ""; + String codiceFiscaleDelegatoFineLavori = isCodiceFiscaleDelegatoFineLavoriAuthorized ? ParamUtil.getString( + actionRequest, "codiceFiscaleDelegatoFineLavori") : ""; boolean isCodiceFiscaleDelegatoCollaudoAuthorized = ParamUtil.getBoolean(actionRequest, "codiceFiscaleDelegatoCollaudoEnabled"); - String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil - .getString(actionRequest, "codiceFiscaleDelegatoCollaudo") : ""; + String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil.getString( + actionRequest, "codiceFiscaleDelegatoCollaudo") : ""; - boolean inizioLavoriContestualeOpera = ParamUtil.getBoolean(actionRequest, - "inizioLavoriContestualeOpera"); + boolean inizioLavoriContestualeOpera = ParamUtil.getBoolean(actionRequest, "inizioLavoriContestualeOpera"); long pagamentoId = ParamUtil.getLong(actionRequest, "pagamentoId"); Date dataEffettuazione = ParamUtil.getDate(actionRequest, "dataEffettuazione", @@ -1727,33 +1621,27 @@ public class FascicoloFePortlet extends MVCPortlet { Double pagRilascioAttestazioni = ParamUtil.getDouble(actionRequest, "pagRilascioAttestazioni"); Double pagConsultazioniArchivio = ParamUtil.getDouble(actionRequest, "pagConsultazioniArchivio"); - /*boolean pagNuoveCostruzioni = ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni"); - int pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico"); - int pagMiglioramentoSismico = ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico"); - boolean pagRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, - "pagRiparazioneInterventoLocale"); - int pagNuovaCostruzione = ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione"); - boolean pagVarianti = ParamUtil.getBoolean(actionRequest, "pagVarianti"); - int pagAltro = ParamUtil.getInteger(actionRequest, "pagAltro"); - boolean pagMiglioramentoSismicoSicilia = ParamUtil.getBoolean(actionRequest, - "pagMiglioramentoSismicoSicilia"); - String pagCalcolatoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoAdeguamentoSismico"); - String pagCalcolatoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoMiglioramentoSismico"); - String pagCalcolatoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagCalcolatoRiparazioneInterventoLocale"); - String pagCalcolatoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagCalcolatoOperaNonQuantificabile"); - String pagEffettivoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoAdeguamentoSismico"); - String pagEffettivoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoMiglioramentoSismico"); - String pagEffettivoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagEffettivoRiparazioneInterventoLocale"); - String pagEffettivoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagEffettivoOperaNonQuantificabile"); - String pagNoteUtente = ParamUtil.getString(actionRequest, "pagNoteUtente");*/ + /* + * boolean pagNuoveCostruzioni = ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni"); int + * pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico"); int + * pagMiglioramentoSismico = ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico"); boolean + * pagRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, "pagRiparazioneInterventoLocale"); int + * pagNuovaCostruzione = ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione"); boolean pagVarianti = + * ParamUtil.getBoolean(actionRequest, "pagVarianti"); int pagAltro = ParamUtil.getInteger(actionRequest, + * "pagAltro"); boolean pagMiglioramentoSismicoSicilia = ParamUtil.getBoolean(actionRequest, + * "pagMiglioramentoSismicoSicilia"); String pagCalcolatoAdeguamentoSismico = ParamUtil.getString(actionRequest, + * "pagCalcolatoAdeguamentoSismico"); String pagCalcolatoMiglioramentoSismico = + * ParamUtil.getString(actionRequest, "pagCalcolatoMiglioramentoSismico"); String + * pagCalcolatoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, + * "pagCalcolatoRiparazioneInterventoLocale"); String pagCalcolatoOperaNonQuantificabile = + * ParamUtil.getString(actionRequest, "pagCalcolatoOperaNonQuantificabile"); String + * pagEffettivoAdeguamentoSismico = ParamUtil.getString(actionRequest, "pagEffettivoAdeguamentoSismico"); String + * pagEffettivoMiglioramentoSismico = ParamUtil.getString(actionRequest, "pagEffettivoMiglioramentoSismico"); + * String pagEffettivoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, + * "pagEffettivoRiparazioneInterventoLocale"); String pagEffettivoOperaNonQuantificabile = + * ParamUtil.getString(actionRequest, "pagEffettivoOperaNonQuantificabile"); String pagNoteUtente = + * ParamUtil.getString(actionRequest, "pagNoteUtente"); + */ // SEZIONE DETTAGLI PRINCIPALI DettPratica dettCheck = DettPraticaLocalServiceUtil.fetchDettPratica(dettPraticaId); @@ -1769,8 +1657,7 @@ public class FascicoloFePortlet extends MVCPortlet { boolean noCollaudo = ParamUtil.getBoolean(actionRequest, "noCollaudo"); - boolean lavoriInEconomiaCommittente = ParamUtil.getBoolean(actionRequest, - "lavoriInEconomiaCommittente"); + boolean lavoriInEconomiaCommittente = ParamUtil.getBoolean(actionRequest, "lavoriInEconomiaCommittente"); String destinazione = ParamUtil.getString(actionRequest, "destinazione"); // String tipologiaSistemaCostruttivo = // ParamUtil.getString(actionRequest, @@ -1786,22 +1673,17 @@ public class FascicoloFePortlet extends MVCPortlet { String numeroCivico = ParamUtil.getString(actionRequest, "numeroCivico"); String dcFoglio = ParamUtil.getString(actionRequest, "dcFoglio"); String dcAllegato = ParamUtil.getString(actionRequest, "dcAllegato"); - String particella1 = ParamUtil.getString(actionRequest, "particella1", "").replaceAll( - Pattern.quote("|"), " "); - String particella2 = ParamUtil.getString(actionRequest, "particella2", "").replaceAll( - Pattern.quote("|"), " "); - String particella3 = ParamUtil.getString(actionRequest, "particella3", "").replaceAll( - Pattern.quote("|"), " "); - String particella4 = ParamUtil.getString(actionRequest, "particella4", "").replaceAll( - Pattern.quote("|"), " "); + String particella1 = ParamUtil.getString(actionRequest, "particella1", "").replaceAll(Pattern.quote("|"), " "); + String particella2 = ParamUtil.getString(actionRequest, "particella2", "").replaceAll(Pattern.quote("|"), " "); + String particella3 = ParamUtil.getString(actionRequest, "particella3", "").replaceAll(Pattern.quote("|"), " "); + String particella4 = ParamUtil.getString(actionRequest, "particella4", "").replaceAll(Pattern.quote("|"), " "); String dcParticelle = particella1 + StringPool.PIPE + particella2 + StringPool.PIPE + particella3 + StringPool.PIPE + particella4; boolean tcNuovaCostruzione = ParamUtil.getBoolean(actionRequest, "tcNuovaCostruzione"); boolean tcAdeguamentoSismico = ParamUtil.getBoolean(actionRequest, "tcAdeguamentoSismico"); boolean tcMiglioramentoSismico = ParamUtil.getBoolean(actionRequest, "tcMiglioramentoSismico"); - boolean tcRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, - "tcRiparazioneInterventoLocale"); + boolean tcRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, "tcRiparazioneInterventoLocale"); boolean tcInCA = ParamUtil.getBoolean(actionRequest, "tcInCA"); boolean tcInOpera = ParamUtil.getBoolean(actionRequest, "tcInOpera"); @@ -1842,34 +1724,28 @@ public class FascicoloFePortlet extends MVCPortlet { boolean deInfAltro = ParamUtil.getBoolean(actionRequest, "deInfAltro"); String deInfAltroDesc = ParamUtil.getString(actionRequest, "deInfAltroDesc"); String dccFondazioni = ParamUtil.getString(actionRequest, "dccFondazioni"); - boolean dccStruttureEleMuraturePietrame = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMuraturePietrame"); + boolean dccStruttureEleMuraturePietrame = ParamUtil + .getBoolean(actionRequest, "dccStruttureEleMuraturePietrame"); boolean dccStruttureEleMuratureLaterizio = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMuratureLaterizio"); - boolean dccStruttureEleMuratureMisto = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMuratureMisto"); - boolean dccStruttureEleMuratureStoriche = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMuratureStoriche"); + boolean dccStruttureEleMuratureMisto = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMuratureMisto"); + boolean dccStruttureEleMuratureStoriche = ParamUtil + .getBoolean(actionRequest, "dccStruttureEleMuratureStoriche"); String dccStruttureEleAcciaio = ParamUtil.getString(actionRequest, "dccStruttureEleAcciaio"); String dccStruttureEleCA = ParamUtil.getString(actionRequest, "dccStruttureEleCA"); String dccStruttureEleLegno = ParamUtil.getString(actionRequest, "dccStruttureEleLegno"); boolean dccStruttureEleMistoCA = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoCA"); - boolean dccStruttureEleMistoAcciaio = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMistoAcciaio"); - boolean dccStruttureEleMistoMuratura = ParamUtil.getBoolean(actionRequest, - "dccStruttureEleMistoMuratura"); + boolean dccStruttureEleMistoAcciaio = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoAcciaio"); + boolean dccStruttureEleMistoMuratura = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoMuratura"); boolean dccStruttureEleMistoLegno = ParamUtil.getBoolean(actionRequest, "dccStruttureEleMistoLegno"); - boolean dccStruttureElePrefabbricato = ParamUtil.getBoolean(actionRequest, - "dccStruttureElePrefabbricato"); + boolean dccStruttureElePrefabbricato = ParamUtil.getBoolean(actionRequest, "dccStruttureElePrefabbricato"); boolean dccStruttureEleAltro = ParamUtil.getBoolean(actionRequest, "dccStruttureEleAltro"); - String dccStruttureEleAltroDescrizione = ParamUtil.getString(actionRequest, - "dccStruttureEleAltroDescrizione"); - boolean dccOrizzontamentiCAAcciaio = ParamUtil - .getBoolean(actionRequest, "dccOrizzontamentiCAAcciaio"); + String dccStruttureEleAltroDescrizione = ParamUtil.getString(actionRequest, "dccStruttureEleAltroDescrizione"); + boolean dccOrizzontamentiCAAcciaio = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiCAAcciaio"); boolean dccOrizzontamentiLegno = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiLegno"); boolean dccOrizzontamentiLegnoCA = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiLegnoCA"); - boolean dccOrizzontamentiLamieraGrecata = ParamUtil.getBoolean(actionRequest, - "dccOrizzontamentiLamieraGrecata"); + boolean dccOrizzontamentiLamieraGrecata = ParamUtil + .getBoolean(actionRequest, "dccOrizzontamentiLamieraGrecata"); boolean dccOrizzontamentiVolte = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiVolte"); boolean dccOrizzontamentiAltro = ParamUtil.getBoolean(actionRequest, "dccOrizzontamentiAltro"); String dccOrizzontamentiAltroDescrizione = ParamUtil.getString(actionRequest, @@ -1878,35 +1754,24 @@ public class FascicoloFePortlet extends MVCPortlet { boolean dccCoperturaCAAcciaio = ParamUtil.getBoolean(actionRequest, "dccCoperturaCAAcciaio"); boolean dccCoperturaLegno = ParamUtil.getBoolean(actionRequest, "dccCoperturaLegno"); boolean dccCoperturaLegnoCA = ParamUtil.getBoolean(actionRequest, "dccCoperturaLegnoCA"); - boolean dccCoperturaLamieraGrecata = ParamUtil - .getBoolean(actionRequest, "dccCoperturaLamieraGrecata"); + boolean dccCoperturaLamieraGrecata = ParamUtil.getBoolean(actionRequest, "dccCoperturaLamieraGrecata"); boolean dccCoperturaPannelli = ParamUtil.getBoolean(actionRequest, "dccCoperturaPannelli"); boolean dccCoperturaPVCTelonati = ParamUtil.getBoolean(actionRequest, "dccCoperturaPVCTelonati"); boolean dccCoperturaLeggere = ParamUtil.getBoolean(actionRequest, "dccCoperturaLeggere"); boolean dccCoperturaAltro = ParamUtil.getBoolean(actionRequest, "dccCoperturaAltro"); - String dccCoperturaAltroDesrizione = ParamUtil - .getString(actionRequest, "dccCoperturaAltroDesrizione"); + String dccCoperturaAltroDesrizione = ParamUtil.getString(actionRequest, "dccCoperturaAltroDesrizione"); boolean dccElemNonStrutLaterizio = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutLaterizio"); - boolean dccElemNonStrutCartongesso = ParamUtil - .getBoolean(actionRequest, "dccElemNonStrutCartongesso"); - boolean dccElemNonStrutCalcestruzzo = ParamUtil.getBoolean(actionRequest, - "dccElemNonStrutCalcestruzzo"); + boolean dccElemNonStrutCartongesso = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutCartongesso"); + boolean dccElemNonStrutCalcestruzzo = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutCalcestruzzo"); boolean dccElemNonStrutLegno = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutLegno"); boolean dccElemNonStrutAltro = ParamUtil.getBoolean(actionRequest, "dccElemNonStrutAltro"); - String dccElemNonStrutAltroDescrizione = ParamUtil.getString(actionRequest, - "dccElemNonStrutAltroDescrizione"); - boolean dccOpereDiRinforzoInsCatene = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoInsCatene"); - boolean dccOpereDiRinforzoInsCordoli = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoInsCordoli"); - boolean dccOpereDiRinforzoIniArmate = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoIniArmate"); - boolean dccOpereDiRinforzoPlaccaggi = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoPlaccaggi"); - boolean dccOpereDiRinforzoIrrSolai = ParamUtil - .getBoolean(actionRequest, "dccOpereDiRinforzoIrrSolai"); - boolean dccOpereDiRinforzoRinforziFRP = ParamUtil.getBoolean(actionRequest, - "dccOpereDiRinforzoRinforziFRP"); + String dccElemNonStrutAltroDescrizione = ParamUtil.getString(actionRequest, "dccElemNonStrutAltroDescrizione"); + boolean dccOpereDiRinforzoInsCatene = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoInsCatene"); + boolean dccOpereDiRinforzoInsCordoli = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoInsCordoli"); + boolean dccOpereDiRinforzoIniArmate = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoIniArmate"); + boolean dccOpereDiRinforzoPlaccaggi = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoPlaccaggi"); + boolean dccOpereDiRinforzoIrrSolai = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoIrrSolai"); + boolean dccOpereDiRinforzoRinforziFRP = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoRinforziFRP"); boolean dccOpereDiRinforzoTelaiECerchiature = ParamUtil.getBoolean(actionRequest, "dccOpereDiRinforzoTelaiECerchiature"); boolean dccOpereDiRinforzoInsRompitratta = ParamUtil.getBoolean(actionRequest, @@ -1954,8 +1819,7 @@ public class FascicoloFePortlet extends MVCPortlet { dettPratica.getGeoPresenzaPrescrizioni()); String geoNotePrescrizioni = getNotNullString(actionRequest, "geoNotePrescrizioni", dettPratica.getGeoNotePrescrizioni()); - String geoNoteIndagini = getNotNullString(actionRequest, "geoNoteIndagini", - dettPratica.getGeoNoteIndagini()); + String geoNoteIndagini = getNotNullString(actionRequest, "geoNoteIndagini", dettPratica.getGeoNoteIndagini()); String geoEvidenzeGeomorfiche = getNotNullString(actionRequest, "geoEvidenzeGeomorfiche", dettPratica.getGeoEvidenzeGeomorfiche()); String geoEvidenzeGeologiche = getNotNullString(actionRequest, "geoEvidenzeGeologiche", @@ -1999,16 +1863,13 @@ public class FascicoloFePortlet extends MVCPortlet { String livelloDiTutela = ParamUtil.getString(actionRequest, "livelloDiTutela"); String paesaggioLocale = ParamUtil.getString(actionRequest, "paesaggioLocale"); String vincoli = ParamUtil.getString(actionRequest, "vincoli"); - String destinazioneAltroIntervento = ParamUtil - .getString(actionRequest, "destinazioneAltroIntervento"); + String destinazioneAltroIntervento = ParamUtil.getString(actionRequest, "destinazioneAltroIntervento"); boolean tcCostruzioniEsistenti = ParamUtil.getBoolean(actionRequest, "tcCostruzioniEsistenti"); boolean tcManutOrdStraord = ParamUtil.getBoolean(actionRequest, "tcManutOrdStraord"); boolean tcAltriInterventi = ParamUtil.getBoolean(actionRequest, "tcAltriInterventi"); String tcAltriInterventiDesc = ParamUtil.getString(actionRequest, "tcAltriInterventiDesc"); - boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, - "tcNuovaCostruzionePertinenza"); - boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, - "tcInterventoOpereEscavazione"); + boolean tcNuovaCostruzionePertinenza = ParamUtil.getBoolean(actionRequest, "tcNuovaCostruzionePertinenza"); + boolean tcInterventoOpereEscavazione = ParamUtil.getBoolean(actionRequest, "tcInterventoOpereEscavazione"); boolean tcViarch = ParamUtil.getBoolean(actionRequest, "tcViarch"); boolean tcOperaA25 = ParamUtil.getBoolean(actionRequest, "tcOperaA25"); @@ -2016,97 +1877,87 @@ public class FascicoloFePortlet extends MVCPortlet { boolean sanatoriaEdilizia724 = ParamUtil.getBoolean(actionRequest, "sanatoriaEdilizia724"); boolean sanatoriaEdilizia326 = ParamUtil.getBoolean(actionRequest, "sanatoriaEdilizia326"); String interventoVoceP7 = ParamUtil.getString(actionRequest, "interventoVoceP7"); - + boolean normLavoriNoDirettore = ParamUtil.getBoolean(actionRequest, "normLavoriNoDirettore"); try { DettPraticaServiceUtil.updateDettPratica(userId, dettPratica.getDettPraticaId(), - dettPratica.getIntPraticaId(), dettPratica.getIntegrazione(), protocollo, - tipoIntegrazione, dettPratica.getCompleta(), dettPratica.getGestita(), codicePagamento, - causalePagamento, mezzoPagamento, importoBolli, importoSpeseIstruttoria, - dataEffettuazione, dettPratica.getStatusTask(), dettPratica.getWorkflowForzato(), - dettPratica.getSoggettoSostituitoId(), dettPratica.getOldDettPraticaId(), destinazione, - ag, descLongIntervento, dettPratica.getVia(), dettPratica.getLocalita(), - estremiCatastali, estremiPratCom, dettPratica.getVariataDa(), + dettPratica.getIntPraticaId(), dettPratica.getIntegrazione(), protocollo, tipoIntegrazione, + dettPratica.getCompleta(), dettPratica.getGestita(), codicePagamento, causalePagamento, + mezzoPagamento, importoBolli, importoSpeseIstruttoria, dataEffettuazione, + dettPratica.getStatusTask(), dettPratica.getWorkflowForzato(), + dettPratica.getSoggettoSostituitoId(), destinazione, ag, descLongIntervento, dettPratica.getVia(), + dettPratica.getLocalita(), estremiCatastali, estremiPratCom, dettPratica.getVariataDa(), dettPratica.getVarianteNumero(), varianteSostanziale, dettPratica.getOperaConforme(), collaudoStatico, codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, - codiceFiscaleDelegatoCollaudo, dettPratica.getCodiceRuoloDelegato(), - lavoriInEconomiaCommittente, inizioLavoriContestualeOpera, dataInizioLavoriOpera, - dataInizioEsecuzioneOpera, dataFineEsecuzioneOpera, metratura, lavoriPubblici, - pagamentoId, lavoriPubbliciPercentuale, numeroCivico, dcParticelle, dcFoglio, dcAllegato, - dePiani, deAltezza, deInterrati, deSuperficie, deCostruzione, deRistrutturazione, deUso, - dePubblica, dePrivata, deUtilizzazione, dePosizioneEdificio, deInfStradalePonte, - deInfStradaleStrada, deInfStradaleAltro, deInfIdraulicaLong, deInfIdraulicaTrasv, - deInfIdraulicaAltro, deInfOperaAccStradale, deInfOperaAccIdraulica, deInfOperaAccAltro, - deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, dccFondazioni, - dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, + codiceFiscaleDelegatoCollaudo, dettPratica.getCodiceRuoloDelegato(), lavoriInEconomiaCommittente, + inizioLavoriContestualeOpera, dataInizioLavoriOpera, dataInizioEsecuzioneOpera, + dataFineEsecuzioneOpera, metratura, lavoriPubblici, pagamentoId, lavoriPubbliciPercentuale, + numeroCivico, dcParticelle, dcFoglio, dcAllegato, dePiani, deAltezza, deInterrati, deSuperficie, + deCostruzione, deRistrutturazione, deUso, dePubblica, dePrivata, deUtilizzazione, + dePosizioneEdificio, deInfStradalePonte, deInfStradaleStrada, deInfStradaleAltro, + deInfIdraulicaLong, deInfIdraulicaTrasv, deInfIdraulicaAltro, deInfOperaAccStradale, + deInfOperaAccIdraulica, deInfOperaAccAltro, deInfAltraInfrastruttura, deInfAltro, deInfAltroDesc, + dccFondazioni, dccStruttureEleMuraturePietrame, dccStruttureEleMuratureLaterizio, dccStruttureEleMuratureMisto, dccStruttureEleMuratureStoriche, dccStruttureEleAcciaio, - dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, - dccStruttureEleMistoAcciaio, dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, - dccStruttureElePrefabbricato, dccStruttureEleAltro, dccStruttureEleAltroDescrizione, - dccOrizzontamentiCAAcciaio, dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, - dccOrizzontamentiLamieraGrecata, dccOrizzontamentiVolte, dccOrizzontamentiAltro, - dccOrizzontamentiAltroDescrizione, dccCopertura, dccCoperturaCAAcciaio, - dccCoperturaLegno, dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, dccCoperturaPannelli, - dccCoperturaPVCTelonati, dccCoperturaLeggere, dccCoperturaAltro, + dccStruttureEleCA, dccStruttureEleLegno, dccStruttureEleMistoCA, dccStruttureEleMistoAcciaio, + dccStruttureEleMistoMuratura, dccStruttureEleMistoLegno, dccStruttureElePrefabbricato, + dccStruttureEleAltro, dccStruttureEleAltroDescrizione, dccOrizzontamentiCAAcciaio, + dccOrizzontamentiLegno, dccOrizzontamentiLegnoCA, dccOrizzontamentiLamieraGrecata, + dccOrizzontamentiVolte, dccOrizzontamentiAltro, dccOrizzontamentiAltroDescrizione, dccCopertura, + dccCoperturaCAAcciaio, dccCoperturaLegno, dccCoperturaLegnoCA, dccCoperturaLamieraGrecata, + dccCoperturaPannelli, dccCoperturaPVCTelonati, dccCoperturaLeggere, dccCoperturaAltro, dccCoperturaAltroDesrizione, dccElemNonStrutLaterizio, dccElemNonStrutCartongesso, dccElemNonStrutCalcestruzzo, dccElemNonStrutLegno, dccElemNonStrutAltro, - dccElemNonStrutAltroDescrizione, dccOpereDiRinforzoInsCatene, - dccOpereDiRinforzoInsCordoli, dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, - dccOpereDiRinforzoIrrSolai, dccOpereDiRinforzoRinforziFRP, - dccOpereDiRinforzoTelaiECerchiature, dccOpereDiRinforzoInsRompitratta, - dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, geoClasseIndagine, - geoCategoriaSottosuolo, geoCategoriaTopografica, geoConsolidamento, + dccElemNonStrutAltroDescrizione, dccOpereDiRinforzoInsCatene, dccOpereDiRinforzoInsCordoli, + dccOpereDiRinforzoIniArmate, dccOpereDiRinforzoPlaccaggi, dccOpereDiRinforzoIrrSolai, + dccOpereDiRinforzoRinforziFRP, dccOpereDiRinforzoTelaiECerchiature, + dccOpereDiRinforzoInsRompitratta, dccOpereDiRinforzoAltro, dccOpereDiRinforzoAltroDescrizione, + geoClasseIndagine, geoCategoriaSottosuolo, geoCategoriaTopografica, geoConsolidamento, geoPericolositaGeologica, geoRischioGeomorfologicoPai, geoPericolositaIdraulicaPai, geoRischioIdraulicoPai, geoPericolositaSismica, geoPericolositaIdraulica, - geoPericolositaGeomorfica, geoFattibilitaGeologica, geoFattibilitaSismica, - geoFattibilitaIdraulica, geoOperaRilevante, geoOpereDiSostegno, geoOpereInSotterranea, - geoPresenzaPrescrizioni, geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, - geoEvidenzeGeologiche, geoDtRelazione, pagInterventiRestauroManufatti, - pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, - pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, - pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, + geoPericolositaGeomorfica, geoFattibilitaGeologica, geoFattibilitaSismica, geoFattibilitaIdraulica, + geoOperaRilevante, geoOpereDiSostegno, geoOpereInSotterranea, geoPresenzaPrescrizioni, + geoNotePrescrizioni, geoNoteIndagini, geoEvidenzeGeomorfiche, geoEvidenzeGeologiche, + geoDtRelazione, pagInterventiRestauroManufatti, pagAltriCasiCulturali, pagLottizzazioni, + pagGrandiStrutture, pagCondotte, pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, + pagImmobiliPreesistenti, pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, note, noteUfficio, dettPratica.getLocalizzazioneGeografica(), tcNuovaCostruzione, tcAdeguamentoSismico, - tcMiglioramentoSismico, tcRiparazioneInterventoLocale, tcInCA, tcInOpera, - tcPrefabbricato, tcInAcciaio, tcMista, tcInMuratura, tcInMuraturaOrdinaria, - tcInMuraturaArmata, tcInMuraturaMista, tcInLegno, tcAltro, tcAltroDescrizione, - tcConDispositivi, normLavoriInProprio, normEsenteBollo, normEsenteSpese, normDpr01Dep, - normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, normDm03, normDm2018, - normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, normDm04, - normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, + tcMiglioramentoSismico, tcRiparazioneInterventoLocale, tcInCA, tcInOpera, tcPrefabbricato, + tcInAcciaio, tcMista, tcInMuratura, tcInMuraturaOrdinaria, tcInMuraturaArmata, tcInMuraturaMista, + tcInLegno, tcAltro, tcAltroDescrizione, tcConDispositivi, normLavoriInProprio, normEsenteBollo, + normEsenteSpese, normDpr01Dep, normDpr02Dep, normDpr01Aut, normDpr02Aut, normDm01, normDm02, + normDm03, normDm2018, normDprg01, normDprg02, normAnr, normArt3com3, normArt3com4, normOrd01, + normDm04, normDm05, normCI01, normLTC01, suap, normSismaBonus, clRischioPreInt, clRischioPostInt, intervFinPub, intervFinPubDesc, serviceContext, bozza, disabledSubmit, geoDisabledSubmit, - paesaggioLocale, livelloDiTutela, vincoli, destinazioneAltroIntervento, - tcCostruzioniEsistenti, tcManutOrdStraord, tcAltriInterventi, tcAltriInterventiDesc, - noCollaudo, tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, tcViarch, - tcOperaA25, sanatoriaEdilizia47, sanatoriaEdilizia724, sanatoriaEdilizia326, - normLavoriNoDirettore, pagSoggettiAdAutorizzazione, interventoVoceP7); + paesaggioLocale, livelloDiTutela, vincoli, destinazioneAltroIntervento, tcCostruzioniEsistenti, + tcManutOrdStraord, tcAltriInterventi, tcAltriInterventiDesc, noCollaudo, + tcNuovaCostruzionePertinenza, tcInterventoOpereEscavazione, tcViarch, tcOperaA25, + sanatoriaEdilizia47, sanatoriaEdilizia724, sanatoriaEdilizia326, normLavoriNoDirettore, + pagSoggettiAdAutorizzazione, interventoVoceP7); String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { String successURL = ParamUtil.getString(actionRequest, "successURL"); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "isNewVariante"); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "isNewVariante"); if (Validator.isNotNull(successURL)) { - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl"); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "verifyArea"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl", String.valueOf(!bozza)); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl"); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "verifyArea"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl", + String.valueOf(!bozza)); String verifyArea = ParamUtil.getString(actionRequest, "verifyArea", StringPool.BLANK); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "verifyArea", String.valueOf(verifyArea)); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "verifyArea", + String.valueOf(verifyArea)); String fragmentURL = ParamUtil.getString(actionRequest, "current_tab"); if (Validator.isNotNull(fragmentURL)) { - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "current_tab"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "current_tab", fragmentURL); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "historyKey"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "historyKey", "_1_WAR_portosfeportlet_tab=" + fragmentURL); + successURL = HttpUtil + .removeParameter(successURL, actionResponse.getNamespace() + "current_tab"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "current_tab", + fragmentURL); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "historyKey"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "historyKey", + "_1_WAR_portosfeportlet_tab=" + fragmentURL); if (successURL.contains("#")) { successURL = successURL.substring(0, successURL.lastIndexOf("#")); @@ -2116,12 +1967,9 @@ public class FascicoloFePortlet extends MVCPortlet { actionResponse.sendRedirect(successURL); } else { actionResponse.setRenderParameter("mvcPath", "/html/fascicolofe/edit_fascicolo.jsp"); - actionResponse.setRenderParameter("backURL", - ParamUtil.getString(actionRequest, "backURL")); - actionResponse.setRenderParameter("dettPraticaId", - String.valueOf(dettPratica.getDettPraticaId())); - actionResponse.setRenderParameter("intPraticaId", - String.valueOf(dettPratica.getIntPraticaId())); + actionResponse.setRenderParameter("backURL", ParamUtil.getString(actionRequest, "backURL")); + actionResponse.setRenderParameter("dettPraticaId", String.valueOf(dettPratica.getDettPraticaId())); + actionResponse.setRenderParameter("intPraticaId", String.valueOf(dettPratica.getIntPraticaId())); actionResponse.setRenderParameter("openVerifyUrl", String.valueOf(!bozza)); } } @@ -2139,11 +1987,10 @@ public class FascicoloFePortlet extends MVCPortlet { } } - private void saveVariazioneSoggetti(long dettPraticaId, ActionRequest actionRequest, - ActionResponse actionResponse) throws Exception { + private void saveVariazioneSoggetti(long dettPraticaId, ActionRequest actionRequest, ActionResponse actionResponse) + throws Exception { - ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), - actionRequest); + ServiceContext serviceContext = ServiceContextFactory.getInstance(DettPratica.class.getName(), actionRequest); boolean bozza = ParamUtil.getBoolean(actionRequest, "bozza", true); @@ -2152,13 +1999,13 @@ public class FascicoloFePortlet extends MVCPortlet { boolean isCodiceFiscaleDelegatoFineLavoriAuthorized = ParamUtil.getBoolean(actionRequest, "codiceFiscaleDelegatoFineLavoriEnabled"); - String codiceFiscaleDelegatoFineLavori = isCodiceFiscaleDelegatoFineLavoriAuthorized ? ParamUtil - .getString(actionRequest, "codiceFiscaleDelegatoFineLavori") : ""; + String codiceFiscaleDelegatoFineLavori = isCodiceFiscaleDelegatoFineLavoriAuthorized ? ParamUtil.getString( + actionRequest, "codiceFiscaleDelegatoFineLavori") : ""; boolean isCodiceFiscaleDelegatoCollaudoAuthorized = ParamUtil.getBoolean(actionRequest, "codiceFiscaleDelegatoCollaudoEnabled"); - String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil - .getString(actionRequest, "codiceFiscaleDelegatoCollaudo") : ""; + String codiceFiscaleDelegatoCollaudo = isCodiceFiscaleDelegatoCollaudoAuthorized ? ParamUtil.getString( + actionRequest, "codiceFiscaleDelegatoCollaudo") : ""; long userId = PortalUtil.getUserId(actionRequest); @@ -2166,22 +2013,20 @@ public class FascicoloFePortlet extends MVCPortlet { DettPratica dettPratica = DettPraticaServiceUtil.getDettPratica(dettPraticaId); DettPraticaServiceUtil.updateDettPraticaSoggetti(userId, dettPratica.getDettPraticaId(), - dettPratica.getIntPraticaId(), codiceFiscaleDelegatoCommittente, - codiceFiscaleDelegatoFineLavori, codiceFiscaleDelegatoCollaudo, serviceContext); + dettPratica.getIntPraticaId(), codiceFiscaleDelegatoCommittente, codiceFiscaleDelegatoFineLavori, + codiceFiscaleDelegatoCollaudo, serviceContext); String redirect = ParamUtil.getString(actionRequest, "redirect"); if (Validator.isNull(redirect)) { String successURL = ParamUtil.getString(actionRequest, "successURL"); if (Validator.isNotNull(successURL)) { - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl"); - successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() - + "verifyArea"); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "openVerifyUrl", String.valueOf(!bozza)); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl"); + successURL = HttpUtil.removeParameter(successURL, actionResponse.getNamespace() + "verifyArea"); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "openVerifyUrl", + String.valueOf(!bozza)); String verifyArea = ParamUtil.getString(actionRequest, "verifyArea", StringPool.BLANK); - successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() - + "verifyArea", String.valueOf(verifyArea)); + successURL = HttpUtil.addParameter(successURL, actionResponse.getNamespace() + "verifyArea", + String.valueOf(verifyArea)); String fragmentURL = "_1_WAR_portosfeportlet_page_soggetti"; if (successURL.contains("#")) { @@ -2192,12 +2037,9 @@ public class FascicoloFePortlet extends MVCPortlet { actionResponse.sendRedirect(successURL); } else { actionResponse.setRenderParameter("mvcPath", "/html/fascicolofe/edit_fascicolo.jsp"); - actionResponse.setRenderParameter("backURL", - ParamUtil.getString(actionRequest, "backURL")); - actionResponse.setRenderParameter("dettPraticaId", - String.valueOf(dettPratica.getDettPraticaId())); - actionResponse.setRenderParameter("intPraticaId", - String.valueOf(dettPratica.getIntPraticaId())); + actionResponse.setRenderParameter("backURL", ParamUtil.getString(actionRequest, "backURL")); + actionResponse.setRenderParameter("dettPraticaId", String.valueOf(dettPratica.getDettPraticaId())); + actionResponse.setRenderParameter("intPraticaId", String.valueOf(dettPratica.getIntPraticaId())); actionResponse.setRenderParameter("openVerifyUrl", String.valueOf(!bozza)); } @@ -2289,8 +2131,7 @@ public class FascicoloFePortlet extends MVCPortlet { } // lunghezza fissata a 200 if (sourceFileName.length() > 200) { - SessionErrors - .add(actionRequest, "error.geniocivilefe.annullamento.allegato.length.valid"); + SessionErrors.add(actionRequest, "error.geniocivilefe.annullamento.allegato.length.valid"); } } else { SessionErrors.add(actionRequest, "error.geniocivilefe.annullamento.allegato.is.request"); @@ -2387,13 +2228,11 @@ public class FascicoloFePortlet extends MVCPortlet { // validazione: solo alcune estensioni String ext = FileUtil.getExtension(sourceFileName); if (!ext.equalsIgnoreCase("p7m") && !ext.equalsIgnoreCase("pdf")) { - SessionErrors.add(actionRequest, - "error.geniocivilefe.asseverazione.allegato.ext.valid"); + SessionErrors.add(actionRequest, "error.geniocivilefe.asseverazione.allegato.ext.valid"); } // lunghezza fissata a 200 if (sourceFileName.length() > 200) { - SessionErrors.add(actionRequest, - "error.geniocivilefe.asseverazione.allegato.length.valid"); + SessionErrors.add(actionRequest, "error.geniocivilefe.asseverazione.allegato.length.valid"); } } else { SessionErrors.add(actionRequest, "error.geniocivilefe.asseverazione.allegato.is.request"); @@ -2408,30 +2247,28 @@ public class FascicoloFePortlet extends MVCPortlet { if (SessionErrors.isEmpty(actionRequest)) { byte[] content = FileUtil.getBytes(file); - boolean isSignedByTitolare = ValidazionePraticaUtil.isAsseverazioneSignedByOwner( - sourceFileName, content, serviceContext.getCompanyId(), - asseverazione.getCodiceFiscale(), StringPool.BLANK); + boolean isSignedByTitolare = ValidazionePraticaUtil.isAsseverazioneSignedByOwner(sourceFileName, + content, serviceContext.getCompanyId(), asseverazione.getCodiceFiscale(), StringPool.BLANK); if (isSignedByTitolare) { - AsseverazioneServiceUtil.allegaFileAsseverazione(asseverazioneId, content, - sourceFileName, serviceContext); + AsseverazioneServiceUtil.allegaFileAsseverazione(asseverazioneId, content, sourceFileName, + serviceContext); } else { - SessionErrors - .add(actionRequest, "error.geniocivilefe.asseverazione.allegato.firma.valid"); + SessionErrors.add(actionRequest, "error.geniocivilefe.asseverazione.allegato.firma.valid"); // Impostazione parametri di rendering per messaggio di // errore. List firmatari = ValidazionePraticaUtil.gatherSignatures(sourceFileName, content, serviceContext.getCompanyId(), ""); String firme = StringUtils.join(firmatari, ", ").toLowerCase(); - dettagliFirme = "
Firma richiesta [" + asseverazione.getCodiceFiscale() - + "]
Firme trovate [" + firme + "]"; + dettagliFirme = "
Firma richiesta [" + asseverazione.getCodiceFiscale() + "]
Firme trovate [" + + firme + "]"; } } if (!SessionErrors.isEmpty(actionRequest)) { String redirectURL = ParamUtil.getString(actionRequest, "errorUrl"); - redirectURL = HttpUtil.addParameter(redirectURL, actionResponse.getNamespace() - + "dettPraticaId", String.valueOf(asseverazione.getDettPraticaId())); + redirectURL = HttpUtil.addParameter(redirectURL, actionResponse.getNamespace() + "dettPraticaId", + String.valueOf(asseverazione.getDettPraticaId())); actionResponse.sendRedirect(redirectURL); } } catch (Exception e) { @@ -2452,22 +2289,21 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void confermaAsseverazione(ActionRequest actionRequest, ActionResponse actionResponse) - throws IOException, PortalException, SystemException { + public void confermaAsseverazione(ActionRequest actionRequest, ActionResponse actionResponse) throws IOException, + PortalException, SystemException { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); long asseverazioneId = ParamUtil.getLong(actionRequest, "asseverazioneId"); if (AsseverazioniUtil.hasCambioStatoAsseverazione(serviceContext.getUserId(), asseverazioneId)) { - AsseverazioneServiceUtil.cambioStatoAsseverazioni(asseverazioneId, - AsseverazioniUtil.STATO_ESEGUITA); + AsseverazioneServiceUtil.cambioStatoAsseverazioni(asseverazioneId, AsseverazioniUtil.STATO_ESEGUITA); } else { SessionErrors.add(actionRequest, "asseverazioni-non-richiedibili"); } } - public void annullaAsseverazioni(ActionRequest actionRequest, ActionResponse actionResponse) - throws IOException, PortalException, SystemException { + public void annullaAsseverazioni(ActionRequest actionRequest, ActionResponse actionResponse) throws IOException, + PortalException, SystemException { ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); @@ -2478,8 +2314,8 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void updateFormPagamento(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + public void updateFormPagamento(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, + SystemException { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); boolean normEsenteBollo = ParamUtil.getBoolean(actionRequest, "normEsenteBollo"); @@ -2509,36 +2345,32 @@ public class FascicoloFePortlet extends MVCPortlet { // && dettPratica.getUserId() == serviceContext.getUserId()) { && DelegheUtil.canDoPayment(serviceContext.getUserId(), dettPraticaId)) { - /*int pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico"); - int pagAltro = ParamUtil.getInteger(actionRequest, "pagAltro"); - int pagMiglioramentoSismico = ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico"); - int pagNuovaCostruzione = ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione"); - boolean pagNuoveCostruzioni = ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni"); - boolean pagRiparazioneInterventoLocale = ParamUtil.getBoolean(actionRequest, - "pagRiparazioneInterventoLocale"); - boolean pagMiglioramentoSismicoSicilia = ParamUtil.getBoolean(actionRequest, - "pagMiglioramentoSismicoSicilia"); - String pagCalcolatoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoAdeguamentoSismico"); - String pagCalcolatoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagCalcolatoMiglioramentoSismico"); - String pagCalcolatoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagCalcolatoRiparazioneInterventoLocale"); - String pagCalcolatoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagCalcolatoOperaNonQuantificabile"); - String pagEffettivoAdeguamentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoAdeguamentoSismico"); - String pagEffettivoMiglioramentoSismico = ParamUtil.getString(actionRequest, - "pagEffettivoMiglioramentoSismico"); - String pagEffettivoRiparazioneInterventoLocale = ParamUtil.getString(actionRequest, - "pagEffettivoRiparazioneInterventoLocale"); - String pagEffettivoOperaNonQuantificabile = ParamUtil.getString(actionRequest, - "pagEffettivoOperaNonQuantificabile"); - String pagNoteUtente = ParamUtil.getString(actionRequest, "pagNoteUtente"); - boolean pagVarianti = ParamUtil.getBoolean(actionRequest, "pagVarianti"); - */ + /* + * int pagAdeguamentoSismico = ParamUtil.getInteger(actionRequest, "pagAdeguamentoSismico"); int + * pagAltro = ParamUtil.getInteger(actionRequest, "pagAltro"); int pagMiglioramentoSismico = + * ParamUtil.getInteger(actionRequest, "pagMiglioramentoSismico"); int pagNuovaCostruzione = + * ParamUtil.getInteger(actionRequest, "pagNuovaCostruzione"); boolean pagNuoveCostruzioni = + * ParamUtil.getBoolean(actionRequest, "pagNuoveCostruzioni"); boolean pagRiparazioneInterventoLocale = + * ParamUtil.getBoolean(actionRequest, "pagRiparazioneInterventoLocale"); boolean + * pagMiglioramentoSismicoSicilia = ParamUtil.getBoolean(actionRequest, + * "pagMiglioramentoSismicoSicilia"); String pagCalcolatoAdeguamentoSismico = + * ParamUtil.getString(actionRequest, "pagCalcolatoAdeguamentoSismico"); String + * pagCalcolatoMiglioramentoSismico = ParamUtil.getString(actionRequest, + * "pagCalcolatoMiglioramentoSismico"); String pagCalcolatoRiparazioneInterventoLocale = + * ParamUtil.getString(actionRequest, "pagCalcolatoRiparazioneInterventoLocale"); String + * pagCalcolatoOperaNonQuantificabile = ParamUtil.getString(actionRequest, + * "pagCalcolatoOperaNonQuantificabile"); String pagEffettivoAdeguamentoSismico = + * ParamUtil.getString(actionRequest, "pagEffettivoAdeguamentoSismico"); String + * pagEffettivoMiglioramentoSismico = ParamUtil.getString(actionRequest, + * "pagEffettivoMiglioramentoSismico"); String pagEffettivoRiparazioneInterventoLocale = + * ParamUtil.getString(actionRequest, "pagEffettivoRiparazioneInterventoLocale"); String + * pagEffettivoOperaNonQuantificabile = ParamUtil.getString(actionRequest, + * "pagEffettivoOperaNonQuantificabile"); String pagNoteUtente = ParamUtil.getString(actionRequest, + * "pagNoteUtente"); boolean pagVarianti = ParamUtil.getBoolean(actionRequest, "pagVarianti"); + */ Double pagSoggettiAdAutorizzazione = ParamUtil.getDouble(actionRequest, "pagSoggettiAdAutorizzazione"); - Double pagInterventiRestauroManufatti = ParamUtil.getDouble(actionRequest, "pagInterventiRestauroManufatti"); + Double pagInterventiRestauroManufatti = ParamUtil.getDouble(actionRequest, + "pagInterventiRestauroManufatti"); Double pagAltriCasiCulturali = ParamUtil.getDouble(actionRequest, "pagAltriCasiCulturali"); Double pagLottizzazioni = ParamUtil.getDouble(actionRequest, "pagLottizzazioni"); Double pagGrandiStrutture = ParamUtil.getDouble(actionRequest, "pagGrandiStrutture"); @@ -2562,21 +2394,21 @@ public class FascicoloFePortlet extends MVCPortlet { if (esenteSpeseIstruttoria) { DettPraticaServiceUtil.pagaInvia(dettPraticaId, pagInterventiRestauroManufatti, - pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, - pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, + pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, pagPalificazioni, + pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, - importoSpeseIstruttoria, codiceFiscaleCommittente, - pagSoggettiAdAutorizzazione, url, serviceContext); + importoSpeseIstruttoria, codiceFiscaleCommittente, pagSoggettiAdAutorizzazione, url, + serviceContext); } else if (importoSpeseIstruttoria != "0,00") { DettPraticaServiceUtil.pagaInvia(dettPraticaId, pagInterventiRestauroManufatti, - pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, - pagPalificazioni, pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, + pagAltriCasiCulturali, pagLottizzazioni, pagGrandiStrutture, pagCondotte, pagPalificazioni, + pagImpiantiEolici, pagNuoveRealizzazioni, pagImmobiliPreesistenti, pagManifestiPubblicitari, pagPareriDiMassima, pagAltriCasiPaesaggistici, pagVariantiPareriResi, pagRilascioAttestazioni, pagConsultazioniArchivio, - importoSpeseIstruttoria, codiceFiscaleCommittente, - pagSoggettiAdAutorizzazione, url, serviceContext); + importoSpeseIstruttoria, codiceFiscaleCommittente, pagSoggettiAdAutorizzazione, url, + serviceContext); } else { _log.error("pagaInvia - Riscontrato errore di congruenza pagamenti per dettPraticaId = " @@ -2608,8 +2440,7 @@ public class FascicoloFePortlet extends MVCPortlet { ) { CollaudoServiceUtil.pagaInvia(collaudoId, codiceFiscaleCommittente, url, serviceContext); } else { - throw new PortalException("You have not permission to create the payment for Collaudo " - + collaudoId); + throw new PortalException("You have not permission to create the payment for Collaudo " + collaudoId); } } else { @@ -2651,8 +2482,8 @@ public class FascicoloFePortlet extends MVCPortlet { // + " with id " + pagamento.getClassPk()); // } - PagamentoServiceUtil.sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, - serviceContext); + PagamentoServiceUtil + .sostituisciPagamento(pagamentoId, codiceFiscaleCommittente, mezzo, url, serviceContext); } catch (Exception e) { PortalUtil.copyRequestParameters(actionRequest, actionResponse); @@ -2661,8 +2492,8 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void invioMailDelega(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + public void invioMailDelega(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, + SystemException { // long intPraticaId = 0l; @@ -2677,8 +2508,7 @@ public class FascicoloFePortlet extends MVCPortlet { String roles = StringPool.BLANK; for (Soggetto role : soggetti) { - roles += LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-" + role.getTipologiaSoggetto()) - + " "; + roles += LanguageUtil.get(LocaleUtil.ITALIAN, "gc-soggetto-" + role.getTipologiaSoggetto()) + " "; } IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(delega.getIntPraticaId()); @@ -2699,8 +2529,7 @@ public class FascicoloFePortlet extends MVCPortlet { templateVariablesExtra.put("link", url); MailUtil.invioMailNotifica(delega.getIntPraticaId(), delega.getDettPraticaId(), delegaId, - Delega.class.getName(), to, cc, ccn, "INVIO-DELEGA", templateVariablesExtra, null, - serviceContext); + Delega.class.getName(), to, cc, ccn, "INVIO-DELEGA", templateVariablesExtra, null, serviceContext); } catch (Exception e) { _log.error(e, e); @@ -2708,20 +2537,19 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void salvaStampaPratica(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException { + public void salvaStampaPratica(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, + SystemException { long intPraticaId = ParamUtil.getLong(actionRequest, "intPraticaId"); IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId); ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); - long fileEntryId = IntPraticaLocalServiceUtil.generateReportPratica(intPratica, - serviceContext.getUserId()); + long fileEntryId = IntPraticaLocalServiceUtil.generateReportPratica(intPratica, serviceContext.getUserId()); FileEntry fileEntry = DLAppLocalServiceUtil.getFileEntry(fileEntryId); try { - actionResponse.sendRedirect(DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), - themeDisplay, "&download=true")); + actionResponse.sendRedirect(DLUtil.getPreviewURL(fileEntry, fileEntry.getFileVersion(), themeDisplay, + "&download=true")); } catch (IOException e) { SessionErrors.add(actionRequest, "error-download-pdf-domanda"); PortalUtil.copyRequestParameters(actionRequest, actionResponse); @@ -2779,8 +2607,8 @@ public class FascicoloFePortlet extends MVCPortlet { // } MailUtil.invioMailNotifica(asseverazione.getIntPraticaId(), asseverazione.getDettPraticaId(), - asseverazioneId, Asseverazione.class.getName(), to, cc, ccn, - "INVIO-RICHIESTA-ASSEVERAZIONE", templateVariablesExtra, allegati, serviceContext); + asseverazioneId, Asseverazione.class.getName(), to, cc, ccn, "INVIO-RICHIESTA-ASSEVERAZIONE", + templateVariablesExtra, allegati, serviceContext); } catch (Exception e) { _log.error("Error", e); @@ -2820,7 +2648,8 @@ public class FascicoloFePortlet extends MVCPortlet { // pagamento.getDettPraticaId(), // content, // sourceFileName, serviceContext); - PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName, serviceContext); + PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName, + serviceContext); } } catch (Exception e) { @@ -2830,8 +2659,8 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void completeDomandaEsente(ActionRequest actionRequest, ActionResponse actionResponse) - throws IOException, PortalException, SystemException { + public void completeDomandaEsente(ActionRequest actionRequest, ActionResponse actionResponse) throws IOException, + PortalException, SystemException { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); long fineLavoriId = ParamUtil.getLong(actionRequest, "fineLavoriId"); @@ -2848,8 +2677,8 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void completeIntegrazione(ActionRequest actionRequest, ActionResponse actionResponse) - throws IOException, PortalException, SystemException { + public void completeIntegrazione(ActionRequest actionRequest, ActionResponse actionResponse) throws IOException, + PortalException, SystemException { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); @@ -2860,8 +2689,8 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void completeCambioSoggetti(ActionRequest actionRequest, ActionResponse actionResponse) - throws IOException, PortalException, SystemException { + public void completeCambioSoggetti(ActionRequest actionRequest, ActionResponse actionResponse) throws IOException, + PortalException, SystemException { long dettPraticaId = ParamUtil.getLong(actionRequest, "dettPraticaId"); @@ -2909,8 +2738,8 @@ public class FascicoloFePortlet extends MVCPortlet { } } - public void rigeneraPagamento(ActionRequest actionRequest, ActionResponse actionResponse) - throws PortalException, SystemException, InterruptedException { + public void rigeneraPagamento(ActionRequest actionRequest, ActionResponse actionResponse) throws PortalException, + SystemException, InterruptedException { _log.info("Entro"); ThemeDisplay themeDisplay = (ThemeDisplay) actionRequest.getAttribute(WebKeys.THEME_DISPLAY); ServiceContext serviceContext = ServiceContextFactory.getInstance(actionRequest); @@ -2928,8 +2757,8 @@ public class FascicoloFePortlet extends MVCPortlet { Pagamento pagamento = PagamentoLocalServiceUtil.fetchPagamento(pagamentoId); if (Validator.isNotNull(pagamento)) { - PagamentoLocalServiceUtil.sostituisciPagamento(pagamentoId, - pagamento.getCodiceFiscaleCommittente(), pagamento.getMezzo(), url, serviceContext); + PagamentoLocalServiceUtil.sostituisciPagamento(pagamentoId, pagamento.getCodiceFiscaleCommittente(), + pagamento.getMezzo(), url, serviceContext); } } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp index 06a06e86..371d9541 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/allegatipratica/allegati_action.jsp @@ -1,5 +1,4 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> - <%@page import="it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil"%> <%@page import="it.tref.liferay.portos.bo.model.IntPratica"%> @@ -19,289 +18,248 @@ <%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> <%@page import="com.liferay.portal.service.permission.PortletPermissionUtil"%> <%@include file="/html/allegatipratica/init.jsp"%> - <% - - String redirect = ParamUtil.getString(request, "backUrl"); - String comingFrom = ParamUtil.getString(request, "comingFrom"); - long classPk = ParamUtil.getLong(request, "classPk"); - String className = ParamUtil.getString(request, "className"); - - String refresh="Liferay.fire('allegati-"+comingFrom+"-open');Liferay.Portlet.refresh('#p_p_id_"+PortletKeys.ALLEGATI+"_INSTANCE_page_allegati_');Liferay.Portlet.refresh('#p_p_id_"+PortletKeys.ALLEGATI+"_INSTANCE_page_geologica_');"; - - long docPraticaId = ParamUtil.getLong(request, "docPraticaId"); - DocPratica docPratica = DocPraticaServiceUtil.getDocPratica(docPraticaId); - FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); - - boolean disabledInput = ParamUtil.getBoolean(request,"disabledInput", false); - - boolean hasDelegaFirma = DelegheUtil.hasDelegaFirma(user.getUserId(), docPraticaId, "page_geologica".equalsIgnoreCase(comingFrom)); - boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDelegaFirma; +String redirect = ParamUtil.getString(request, "backUrl"); +String comingFrom = ParamUtil.getString(request, "comingFrom"); +long classPk = ParamUtil.getLong(request, "classPk"); +String className = ParamUtil.getString(request, "className"); +String refresh = "Liferay.fire('allegati-" + comingFrom + "-open'); Liferay.Portlet.refresh('#p_p_id_" + + PortletKeys.ALLEGATI + "_INSTANCE_page_allegati_'); Liferay.Portlet.refresh('#p_p_id_" + PortletKeys.ALLEGATI + + "_INSTANCE_page_geologica_');"; +long docPraticaId = ParamUtil.getLong(request, "docPraticaId"); +DocPratica docPratica = DocPraticaServiceUtil.getDocPratica(docPraticaId); +FirmeBean firme = FirmeUtil.deserialize(docPratica.getJsonFirmatari()); +boolean disabledInput = ParamUtil.getBoolean(request, "disabledInput", false); +boolean hasDelegaFirma = DelegheUtil.hasDelegaFirma(user.getUserId(), docPraticaId, + "page_geologica".equalsIgnoreCase(comingFrom)); +boolean canSignGeoDocs = "page_geologica".equalsIgnoreCase(comingFrom) && hasDelegaFirma; %> - - - - + + <% - if(firme.firmaIsPresent(user.getScreenName())){ - if(firme.firmaIsAnnullabile(user.getScreenName())){ - %> - - - - - -
- -
- - - A.one('<%="#"+renderResponse.getNamespace()+"remove_"+docPraticaId %>').on( - 'click', - function(event) { - event.preventDefault(); - Loading.start(); - A.io.request( - '<%=rimuoviFirmaURL%>', - { - on: { - failure: function() { - alert('impossibile rimuovere la firma!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); - if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> - }else{ - Liferay.fire('allegati-"+comingFrom+"-open'); - Liferay.Portlet.refresh("#p_p_id"); - } - }, - complete : function(){ - Loading.end(); - } - - } - } - ); + if (firme.firmaIsPresent(user.getScreenName())) { + if (firme.firmaIsAnnullabile(user.getScreenName())) { + %> + + + + +
+ +
+ + A.one('<%= "#" + renderResponse.getNamespace() + "remove_" + docPraticaId %>').on('click', function(event) { + event.preventDefault(); + Loading.start(); + A.io.request('<%= rimuoviFirmaURL %>', { + on: { + failure: function() { + alert('impossibile rimuovere la firma!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati-<%= comingFrom %>-open'); + if ("<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica") { + <%= refresh %> + } else { + Liferay.fire('allegati-" + comingFrom + "-open'); + Liferay.Portlet.refresh("#p_p_id"); + } + }, + complete : function() { + Loading.end(); } - ); - - - <% - } - }else{ - %> + } + }); + }); +
+ <% + } + } else { + %> - - + +
- +
- - A.one('<%="#"+renderResponse.getNamespace()+"add_"+docPraticaId %>').on( - 'click', - function(event) { - event.preventDefault(); - Loading.start(); - A.io.request( - '<%=aggiungiFirmaURL%>', - { - on: { - failure: function() { - alert('impossibile rimuovere la firma!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); - if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> - }else{ - Liferay.fire('allegati-"+comingFrom+"-open'); - Liferay.Portlet.refresh("#p_p_id"); - } - }, - complete : function(){ - Loading.end(); - } - } - } - ); + A.one('<%= "#" + renderResponse.getNamespace() + "add_" + docPraticaId %>').on('click', function(event) { + event.preventDefault(); + Loading.start(); + A.io.request('<%= aggiungiFirmaURL %>', { + on: { + failure: function() { + alert('impossibile rimuovere la firma!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati-<%= comingFrom %>-open'); + if ("<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica") { + <%= refresh %> + } else { + Liferay.fire('allegati-" + comingFrom + "-open'); + Liferay.Portlet.refresh("#p_p_id"); + } + }, + complete: function() { + Loading.end(); } - ); - - - <% + } + }); + }); + + <% } - %> + %>
-
- +
- +
- - - + - - + + - <% - long oldDettPratica = 0l; - if(DettPratica.class.getName().equals(className) ){ - DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(docPratica.getClassPk()); - oldDettPratica = dettPratica.getOldDettPraticaId(); - } + if (DettPratica.class.getName().equals(className)) { + DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(docPratica.getClassPk()); + } %> - -
- -
- - - - A.one('<%="#"+renderResponse.getNamespace()+"delete_"+docPratica.getDocPraticaId() %>').on( - 'click', - function(event) { - event.preventDefault(); - if(confirm("Confermi di voler eliminare il documento?")==true){ - Loading.start(); - A.io.request( - '<%=deleteDocURL%>', - { - on: { - failure: function() { - alert('impossibile rimuovere il documento!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); - if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> - }else{ - Liferay.fire('allegati-"+comingFrom+"-open'); - Liferay.Portlet.refresh("#p_p_id"); - } - }, - complete : function(){ - Loading.end(); - } - } +
+ +
+ + A.one('<%= "#" + renderResponse.getNamespace() + "delete_" + docPratica.getDocPraticaId() %>').on( + 'click', + function(event) { + event.preventDefault(); + if (confirm("Confermi di voler eliminare il documento?")) { + Loading.start(); + A.io.request('<%= deleteDocURL %>', { + on: { + failure: function() { + alert('impossibile rimuovere il documento!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati-<%= comingFrom %>-open'); + if( "<%= comingFrom %>" == "page_allegati" + || "<%= comingFrom %>" == "page_geologica") { + <%= refresh %> + } else { + Liferay.fire('allegati-"+comingFrom+"-open'); + Liferay.Portlet.refresh("#p_p_id"); } - ); + }, + complete: function() { + Loading.end(); + } } - } - ); - - -
+ }); + } + } + ); +
- - - - + + + + -
- +
- - - - A.one('<%="#"+renderResponse.getNamespace()+"invalid_"+docPratica.getDocPraticaId() %>').on( - 'click', - function(event) { - event.preventDefault(); - if(confirm("Confermi di voler invalidare il documento?")==true){ - Loading.start(); - A.io.request( - '<%=invalidaAllegatoURL%>', - { - on: { - failure: function() { - alert('impossibile invalidare il documento!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); - if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> - }else{ - Liferay.fire('allegati-"+comingFrom+"-open'); - Liferay.Portlet.refresh("#p_p_id"); - } - }, - complete : function(){ - Loading.end(); - } + + A.one('<%= "#" + renderResponse.getNamespace() + "invalid_" + docPratica.getDocPraticaId() %>').on( + 'click', + function(event) { + event.preventDefault(); + if (confirm("Confermi di voler invalidare il documento?")) { + Loading.start(); + A.io.request('<%= invalidaAllegatoURL %>', { + on: { + failure: function() { + alert('impossibile invalidare il documento!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati-<%= comingFrom %>-open'); + if ("<%= comingFrom %>" == "page_allegati" + || "<%= comingFrom %>" == "page_geologica") { + <%= refresh %> + } else { + Liferay.fire('allegati-" + comingFrom + "-open'); + Liferay.Portlet.refresh("#p_p_id"); } + }, + complete: function() { + Loading.end(); } - ); - } + } + }); } - ); - + } + );
- - + + -
- +
- - - - A.one('<%="#"+renderResponse.getNamespace()+"valid_"+docPratica.getDocPraticaId() %>').on( - 'click', - function(event) { - event.preventDefault(); - if(confirm("Confermi di voler invalidare il documento?")==true){ - Loading.start(); - A.io.request( - '<%=validaAllegatoURL%>', - { - on: { - failure: function() { - alert('impossibile invalidare il documento!'); - }, - success: function(event, id, obj) { - window.parent.Liferay.fire('allegati-<%=comingFrom%>-open'); - if( "<%= comingFrom %>" == "page_allegati" || "<%= comingFrom %>" == "page_geologica"){ - <%=refresh%> - }else{ - Liferay.fire('allegati-"+comingFrom+"-open'); - Liferay.Portlet.refresh("#p_p_id"); - } - }, - complete : function(){ - Loading.end(); - } + + A.one('<%= "#" + renderResponse.getNamespace() + "valid_" + docPratica.getDocPraticaId() %>').on( + 'click', + function(event) { + event.preventDefault(); + if (confirm("Confermi di voler invalidare il documento?")) { + Loading.start(); + A.io.request('<%= validaAllegatoURL %>', { + on: { + failure: function() { + alert('impossibile invalidare il documento!'); + }, + success: function(event, id, obj) { + window.parent.Liferay.fire('allegati-<%= comingFrom %>-open'); + if ("<%= comingFrom %>" == "page_allegati" + || "<%= comingFrom %>" == "page_geologica") { + <%= refresh %> + } else { + Liferay.fire('allegati-"+comingFrom+"-open'); + Liferay.Portlet.refresh("#p_p_id"); } + }, + complete: function() { + Loading.end(); } - ); - } + } + }); } - ); - + } + );
-
+
\ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/commons-logging.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index 8758a96b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/log4j.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/log4j.jar deleted file mode 100644 index 068867eb..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/log4j.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/util-bridges.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/util-bridges.jar deleted file mode 100644 index 7d7435fe..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/util-bridges.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/util-taglib.jar b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/util-taglib.jar deleted file mode 100644 index fbba5f0a..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/lib/util-taglib.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/scheduler/SchedulerKaleoController.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/scheduler/SchedulerKaleoController.java index 724e54c1..ab4b79cd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/scheduler/SchedulerKaleoController.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/scheduler/SchedulerKaleoController.java @@ -3,6 +3,14 @@ package it.tref.liferay.portos.kaleo.controller.scheduler; import it.tref.liferay.portos.bo.model.ControlloPratica; import it.tref.liferay.portos.bo.service.ControlloPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.kaleo.controller.model.KaleoInstance; +import it.tref.liferay.portos.kaleo.controller.model.KaleoInstanceToken; +import it.tref.liferay.portos.kaleo.controller.model.KaleoTaskAssignmentInstance; +import it.tref.liferay.portos.kaleo.controller.model.KaleoTaskInstanceToken; +import it.tref.liferay.portos.kaleo.controller.service.KaleoInstanceLocalServiceUtil; +import it.tref.liferay.portos.kaleo.controller.service.KaleoInstanceTokenLocalServiceUtil; +import it.tref.liferay.portos.kaleo.controller.service.KaleoTaskAssignmentInstanceLocalServiceUtil; +import it.tref.liferay.portos.kaleo.controller.service.KaleoTaskInstanceTokenLocalServiceUtil; import java.io.Serializable; import java.util.ArrayList; @@ -61,7 +69,6 @@ public class SchedulerKaleoController implements MessageListener { _log.info("RIPARA_WORKFLOW inizio lavorazione -- controllopraticaid=" + controllopraticaid + " statusbyuserid=" + statusbyuserid + " kaleoinstancetokenid=" + kaleoinstancetokenid + " --kaleotaskinstancetokenid=" + kaleotaskinstancetokenid); - if (controllopraticaid == 0) { _log.info("RIPARA_WORKFLOW KO controllopraticaid non valorizzato =" + controllopraticaid); continue; @@ -73,11 +80,9 @@ public class SchedulerKaleoController implements MessageListener { queryKIT.add(RestrictionsFactoryUtil.eq("classPK", controllopraticaid)); Order defaultOrderDettPrtatica = OrderFactoryUtil.asc("createDate"); queryKIT.addOrder(defaultOrderDettPrtatica); - List listas = KaleoTaskInstanceTokenLocalServiceUtil.dynamicQuery(queryKIT); if (listas != null && !listas.isEmpty()) { KaleoTaskInstanceToken ktit = null; - for (KaleoTaskInstanceToken k : listas) { if (k.getKaleoTaskName().equalsIgnoreCase("Assegnazione")) { ktit = k; @@ -96,18 +101,13 @@ public class SchedulerKaleoController implements MessageListener { + controllopraticaid); _log.info("RIPARA_WORKFLOW KaleoTaskInstanceTokenId=" + ktit.getKaleoTaskInstanceTokenId() + " --controllopraticaid=" + controllopraticaid); - DynamicQuery queryKAT = DynamicQueryFactoryUtil.forClass(KaleoTaskAssignmentInstance.class); queryKAT.add(RestrictionsFactoryUtil.eq("kaleoTaskInstanceTokenId", ktit.getKaleoTaskInstanceTokenId())); - List listass = KaleoTaskAssignmentInstanceLocalServiceUtil .dynamicQuery(queryKAT); _log.info("size lista KaleoTaskAssignmentInstance per kaleoTaskInstanceTokenId=" + ktit.getKaleoTaskInstanceTokenId() + " :" + listass.size()); - // for (KaleoTaskAssignmentInstance x:listass){ - // _log.info("KaleoTaskAssignmentInstanceId="+x.getKaleoTaskAssignmentInstanceId()+" -- KaleoTaskName:"+x.getKaleoTaskName()); - // } if (listass != null && !listass.isEmpty()) { // creazione record assente sulla tabella KaleoTaskAssignmentInstance KaleoTaskAssignmentInstance assignmentInstanceApp = listass.get(0); @@ -115,7 +115,6 @@ public class SchedulerKaleoController implements MessageListener { .increment("com.liferay.counter.model.Counter"); KaleoTaskAssignmentInstance assignmentInstance = KaleoTaskAssignmentInstanceLocalServiceUtil .createKaleoTaskAssignmentInstance(kaleoTaskAssignementInstanceId); - assignmentInstance.setCreateDate(assignmentInstanceApp.getCreateDate()); assignmentInstance.setModifiedDate(assignmentInstanceApp.getModifiedDate()); assignmentInstance.setModifiedDate(assignmentInstanceApp.getModifiedDate()); @@ -132,27 +131,20 @@ public class SchedulerKaleoController implements MessageListener { assignmentInstance.setAssigneeClassName(User.class.getName()); assignmentInstance.setAssigneeClassPK(statusbyuserid); assignmentInstance.setCompleted(false); - KaleoTaskAssignmentInstanceLocalServiceUtil .updateKaleoTaskAssignmentInstance(assignmentInstance); - // patch per tener contro anche delle varianti create da applicativo portos2: forzo lo stato // del WF a ESITO long kaleoInstanceId = assignmentInstanceApp.getKaleoInstanceId(); KaleoInstance kaleoInstance = KaleoInstanceLocalServiceUtil .getKaleoInstance(kaleoInstanceId); - long rootKaleoInstanceTokenId = kaleoInstance.getRootKaleoInstanceTokenId(); - KaleoInstanceToken rootKaleoInstanceToken = KaleoInstanceTokenLocalServiceUtil .getKaleoInstanceToken(rootKaleoInstanceTokenId); - _log.info("rootKaleoInstanceToken=" + rootKaleoInstanceToken.getCurrentKaleoNodeName()); rootKaleoInstanceToken.setCurrentKaleoNodeId(21639); rootKaleoInstanceToken.setCurrentKaleoNodeName("Esito"); KaleoInstanceTokenLocalServiceUtil.updateKaleoInstanceToken(rootKaleoInstanceToken); - // ////////////////// - // task di assegnazione viene inserito a completato: if (!assignmentInstanceApp.isCompleted()) { assignmentInstanceApp.setCompleted(true); @@ -164,7 +156,6 @@ public class SchedulerKaleoController implements MessageListener { if (isVariante) { _log.info("cancellazione task di assegnazione per controllopraticaid=" + controllopraticaid); - KaleoTaskInstanceTokenLocalServiceUtil.deleteKaleoTaskInstanceToken(ktit); KaleoTaskAssignmentInstanceLocalServiceUtil .deleteKaleoTaskAssignmentInstance(assignmentInstanceApp); @@ -173,8 +164,6 @@ public class SchedulerKaleoController implements MessageListener { ktit.setCompletionDate(new Date()); KaleoTaskInstanceTokenLocalServiceUtil.updateKaleoTaskInstanceToken(ktit); } - // //////////////////////////////////////////////////////////////////////////////// - if (controlloPratica != null) { _log.info("RIPARA_WORKFLOW - Pulisco Workflow ed indicizzo per intPraticaId=" + controlloPratica.getIntPraticaId()); @@ -182,7 +171,6 @@ public class SchedulerKaleoController implements MessageListener { IntPraticaLocalServiceUtil.reIndexFasciolo(controlloPratica.getIntPraticaId(), controlloPratica.getCompanyId()); } - } _log.info("RIPARA_WORKFLOW fine lavorazione OK -- controllopraticaid=" + controllopraticaid + " statusbyuserid=" + statusbyuserid + " kaleoinstancetokenid=" + kaleoinstancetokenid @@ -197,16 +185,13 @@ public class SchedulerKaleoController implements MessageListener { listaKO.add(objs); } } - } catch (Exception e) { _log.error("Errore RIPARA_WORKFLOW -- controllopraticaid=" + controllopraticaid + " statusbyuserid=" + statusbyuserid + " kaleoinstancetokenid=" + kaleoinstancetokenid + " --kaleotaskinstancetokenid=" + kaleotaskinstancetokenid, e); } } - patchTaskEsitiForWF(listaKO); - } private void patchTaskEsitiForWF(List lista) { @@ -220,12 +205,10 @@ public class SchedulerKaleoController implements MessageListener { if (controllopraticaid == 0) { continue; } - ControlloPratica controlloPratica = ControlloPraticaLocalServiceUtil .fetchControlloPratica(controllopraticaid); if (controlloPratica == null) continue; - // KaleoTaskInstanceToken ordinati per dati di creazione decresente DynamicQuery queryKIT = DynamicQueryFactoryUtil.forClass(KaleoTaskInstanceToken.class); queryKIT.add(RestrictionsFactoryUtil.eq("classPK", controllopraticaid)); @@ -234,10 +217,8 @@ public class SchedulerKaleoController implements MessageListener { Order defaultOrderDettPrtatica = OrderFactoryUtil.desc("createDate"); queryKIT.addOrder(defaultOrderDettPrtatica); List listas = KaleoTaskInstanceTokenLocalServiceUtil.dynamicQuery(queryKIT); - if (listas != null && !listas.isEmpty()) { KaleoTaskInstanceToken ktit = null; - for (KaleoTaskInstanceToken k : listas) { if (k.getKaleoTaskName().equalsIgnoreCase("Esito")) { ktit = k; @@ -249,15 +230,10 @@ public class SchedulerKaleoController implements MessageListener { } } if (ktit != null) { - // WorkflowInstance - // wfInstance=WorkflowInstanceManagerUtil.getWorkflowInstance(controlloPratica.getCompanyId(), - // ktit.getKaleoInstanceId()); - long kaleoTaskAssignementInstanceId = CounterLocalServiceUtil .increment("com.liferay.counter.model.Counter"); KaleoTaskAssignmentInstance assignmentInstance = KaleoTaskAssignmentInstanceLocalServiceUtil .createKaleoTaskAssignmentInstance(kaleoTaskAssignementInstanceId); - assignmentInstance.setCreateDate(ktit.getCreateDate()); assignmentInstance.setModifiedDate(ktit.getModifiedDate()); assignmentInstance.setModifiedDate(ktit.getModifiedDate()); @@ -274,16 +250,13 @@ public class SchedulerKaleoController implements MessageListener { assignmentInstance.setAssigneeClassName(User.class.getName()); assignmentInstance.setAssigneeClassPK(statusbyuserid); assignmentInstance.setCompleted(false); - KaleoTaskAssignmentInstanceLocalServiceUtil .updateKaleoTaskAssignmentInstance(assignmentInstance); - if (controlloPratica != null) { CacheRegistryUtil.clear(); IntPraticaLocalServiceUtil.reIndexFasciolo(controlloPratica.getIntPraticaId(), controlloPratica.getCompanyId()); } - _log.info("patchTaskEsitiForWF fine lavorazione OK -- controllopraticaid=" + controllopraticaid + " statusbyuserid=" + statusbyuserid + " kaleoinstancetokenid=" + kaleoinstancetokenid + " --kaleotaskinstancetokenid=" + kaleotaskinstancetokenid); @@ -294,10 +267,8 @@ public class SchedulerKaleoController implements MessageListener { + statusbyuserid + " kaleoinstancetokenid=" + kaleoinstancetokenid + " --kaleotaskinstancetokenid=" + kaleotaskinstancetokenid); - } } - } catch (Exception e) { _log.error("Errore patchTaskEsitiForWF -- controllopraticaid=" + controllopraticaid + " statusbyuserid=" + statusbyuserid + " kaleoinstancetokenid=" + kaleoinstancetokenid @@ -306,5 +277,4 @@ public class SchedulerKaleoController implements MessageListener { } } - } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties index 7dc4c86d..88e5d447 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_kaleo_controller - build.number=8 - build.date=1616412878684 + build.number=9 + build.date=1616601473769 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath index 0e46395b..5bbbbb94 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.classpath @@ -1,11 +1,6 @@ - - - - - @@ -19,5 +14,6 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f42de363..00000000 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component index e8f246da..39a7eafb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/.settings/org.eclipse.wst.common.component @@ -5,9 +5,6 @@ uses - - uses - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-codec.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-codec.jar deleted file mode 100644 index 1d7417c4..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-codec.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-collections4.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-collections4.jar deleted file mode 100644 index 43a9413b..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/commons-collections4.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/poi-3.10.1-20140818.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/poi-3.10.1-20140818.jar deleted file mode 100644 index dd1ab4a7..00000000 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/poi-3.10.1-20140818.jar and /dev/null differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-java.jar b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-java.jar new file mode 100644 index 00000000..6b5d95f8 Binary files /dev/null and b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/lib/util-java.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/liferay-plugin-package.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/liferay-plugin-package.properties index 7d8dd8de..1371471f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/liferay-plugin-package.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/liferay-plugin-package.properties @@ -10,10 +10,12 @@ author=Liferay, Inc. licenses=LGPL liferay-versions=6.2.0+ portal-dependency-jars=\ + commons-codec.jar,\ + commons-collections4.jar,\ + poi.jar,\ spring-context.jar,\ spring-beans.jar,\ spring-core.jar,\ - spring-asm.jar,\ - poi.jar + spring-asm.jar required-deployment-contexts=\ portos-bo-portlet diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties index 751f2711..8645c3ee 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_report - build.number=16 - build.date=1598351799323 + build.number=19 + build.date=1616600927102 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml index ae8230d9..41823064 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml @@ -14,5 +14,7 @@ + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 index 55984db3..4bf212dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/ivy.xml.MD5 @@ -1 +1 @@ -551602522f53b8485351d5fe990bed91 +5c7079f092c74ee1765720cef73ee501 diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java index 20621384..99437de1 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/FascicoloURLUtil.java @@ -3,73 +3,58 @@ package it.tref.liferay.portos.bo.shared.util; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.util.HttpUtil; +import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.model.Company; import com.liferay.portal.service.CompanyLocalServiceUtil; public class FascicoloURLUtil { - @Deprecated - public static String getFascicoloViewURL(long companyId, long intPraticaId) throws PortalException, SystemException { - - // Company company = CompanyLocalServiceUtil.getCompany(companyId); - // - // String urlToBack = - // GetterUtil.getString(company.getExpandoBridge().getAttribute("url-bo-gestione-pratica-firma", - // false)); - // - // urlToBack = urlToBack + "&_" + PortletKeys.FASCICOLO + "_intPraticaId=" + intPraticaId; - - return getFascicoloBOViewURL(companyId, intPraticaId); - } - - public static String getFascicoloFEViewURL(long companyId, long intPraticaId, String mvcPath, String queryString) - throws PortalException, SystemException { - - Company company = CompanyLocalServiceUtil.getCompany(companyId); - - String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_FE, false); - - urlToBack = HttpUtil.addParameter(urlToBack, "_" + PortletKeys.FASCICOLOFE + "_intPraticaId", intPraticaId); - if (Validator.isNotNull(mvcPath)) { - urlToBack = HttpUtil.addParameter(urlToBack, "_" + PortletKeys.FASCICOLOFE + "_mvcPath", mvcPath); - } - - if (Validator.isNotNull(queryString)) { - - if (queryString.startsWith("?")) { - queryString = queryString.substring(1); - } - if (queryString.startsWith("&")) { - queryString = queryString.substring(1); - } - - urlToBack = urlToBack + "&" + queryString; - } - - return urlToBack; - } - - public static String getFascicoloBOViewURL(long companyId, long intPraticaId) throws PortalException, SystemException { - - Company company = CompanyLocalServiceUtil.getCompany(companyId); - - String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_BO, false); - - urlToBack = urlToBack + "&_" + PortletKeys.FASCICOLO + "_intPraticaId=" + intPraticaId; - - return urlToBack; - } - - public static String getFascicoloBOViewURLNoHost(long companyId, long intPraticaId) throws PortalException, SystemException { - - Company company = CompanyLocalServiceUtil.getCompany(companyId); - - String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_BO, false); - urlToBack = urlToBack.replaceAll("^http[s]{0,1}://[^/]+", ""); - urlToBack = urlToBack + "&_" + PortletKeys.FASCICOLO + "_intPraticaId=" + intPraticaId; - - return urlToBack; - } - + @Deprecated + public static String getFascicoloViewURL(long companyId, long intPraticaId) throws PortalException, SystemException { + + return getFascicoloBOViewURL(companyId, intPraticaId); + } + + public static String getFascicoloFEViewURL(long companyId, long intPraticaId, String mvcPath, String queryString) + throws PortalException, SystemException { + + Company company = CompanyLocalServiceUtil.getCompany(companyId); + String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_FE, false); + urlToBack = HttpUtil.addParameter(urlToBack, StringPool.UNDERLINE + PortletKeys.FASCICOLOFE + "_intPraticaId", + intPraticaId); + if (Validator.isNotNull(mvcPath)) { + urlToBack = HttpUtil.addParameter(urlToBack, StringPool.UNDERLINE + PortletKeys.FASCICOLOFE + "_mvcPath", + mvcPath); + } + if (Validator.isNotNull(queryString)) { + if (queryString.startsWith(StringPool.QUESTION)) { + queryString = queryString.substring(1); + } + if (queryString.startsWith(StringPool.AMPERSAND)) { + queryString = queryString.substring(1); + } + urlToBack = urlToBack + StringPool.AMPERSAND + queryString; + } + return urlToBack; + } + + public static String getFascicoloBOViewURL(long companyId, long intPraticaId) throws PortalException, + SystemException { + + Company company = CompanyLocalServiceUtil.getCompany(companyId); + String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_BO, false); + urlToBack = urlToBack + "&_" + PortletKeys.FASCICOLO + "_intPraticaId=" + intPraticaId; + return urlToBack; + } + + public static String getFascicoloBOViewURLNoHost(long companyId, long intPraticaId) throws PortalException, + SystemException { + + Company company = CompanyLocalServiceUtil.getCompany(companyId); + String urlToBack = (String) company.getExpandoBridge().getAttribute(Constants.GESTIONE_PRATICA_URL_BO, false); + urlToBack = urlToBack.replaceAll("^http[s]{0,1}://[^/]+", ""); + urlToBack = urlToBack + "&_" + PortletKeys.FASCICOLO + "_intPraticaId=" + intPraticaId; + return urlToBack; + } } diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ParamUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ParamUtil.java index 3235773c..7fcb44f4 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ParamUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/ParamUtil.java @@ -1,14 +1,14 @@ package it.tref.liferay.portos.bo.shared.util; -import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.util.PortalUtil; - import java.util.Calendar; import java.util.Date; import javax.portlet.PortletRequest; import javax.servlet.http.HttpServletRequest; +import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.util.PortalUtil; + public class ParamUtil extends com.liferay.portal.kernel.util.ParamUtil { public static Date getDate(PortletRequest request, String param) throws PortalException { @@ -16,16 +16,12 @@ public class ParamUtil extends com.liferay.portal.kernel.util.ParamUtil { int day = ParamUtil.getInteger(request, param + "Day"); int month = ParamUtil.getInteger(request, param + "Month"); int year = ParamUtil.getInteger(request, param + "Year"); - int hour = ParamUtil.getInteger(request, param + "Hour"); int minute = ParamUtil.getInteger(request, param + "Minute"); - int amPm = ParamUtil.getInteger(request, param + "AmPM"); - if (amPm == Calendar.PM) { hour += 12; } - return PortalUtil.getDate(month, day, year, hour, minute, null); } @@ -34,17 +30,12 @@ public class ParamUtil extends com.liferay.portal.kernel.util.ParamUtil { int day = ParamUtil.getInteger(request, param + "Day"); int month = ParamUtil.getInteger(request, param + "Month"); int year = ParamUtil.getInteger(request, param + "Year"); - int hour = ParamUtil.getInteger(request, param + "Hour"); int minute = ParamUtil.getInteger(request, param + "Minute"); - int amPm = ParamUtil.getInteger(request, param + "AmPM"); - if (amPm == Calendar.PM) { hour += 12; } - return PortalUtil.getDate(month, day, year, hour, minute, null); } - } diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SistemiCostruttiviUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SistemiCostruttiviUtil.java index 3c7fd442..42dd86a1 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SistemiCostruttiviUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/SistemiCostruttiviUtil.java @@ -4,55 +4,51 @@ import java.util.LinkedHashMap; import java.util.Map; public class SistemiCostruttiviUtil { - - public static final String IN_CEMENTO_ARMATO = "100"; - public static final String IN_OPERA = "101"; - public static final String PREFABBRICATO ="102"; - - public static final String IN_ACCIAIO = "200"; - public static final String MISTA_CEMENTO_ARMATO_E_ACCIAIO = "201"; - - public static final String IN_MURATURA = "300"; - public static final String ORDINARIA = "301"; - public static final String ARMATA = "302"; - public static final String MISTA = "303"; - - public static final String IN_LEGNO = "400"; - - public static final String ALTRO = "500"; - - public static final String CON_DISPOSITIVI_DI_ISOLAMENTO_SISMICO_O_DISSIPAZIONE= "600"; - - /* - * Tipologia - */ - public static final String TIPOLOGIA_INTERVENTO_NUOVA_COSTRUZIONE = "000"; - public static final String TIPOLOGIA_INTERVENTO_EDIFICI_ESISTENTI_ADEGUAMENTO_SISMICO = "001"; - public static final String TIPOLOGIA_INTERVENTO_EDIFICI_ESISTENTI_MIGLIORAMENTO_SISMICO = "010"; - public static final String TIPOLOGIA_INTERVENTO_EDIFICI_ESISTENTI_RIPARAZIONE = "100"; - - - private static Map sistemaCostruttivoLabelsMap; - - static { - sistemaCostruttivoLabelsMap = new LinkedHashMap(); - sistemaCostruttivoLabelsMap.put(IN_CEMENTO_ARMATO, "gc-in-ca"); - sistemaCostruttivoLabelsMap.put(IN_OPERA, "gc-in-opera"); - sistemaCostruttivoLabelsMap.put(PREFABBRICATO, "gc-prefabbricato"); - sistemaCostruttivoLabelsMap.put(IN_ACCIAIO, "gc-in-acciaio"); - sistemaCostruttivoLabelsMap.put(MISTA_CEMENTO_ARMATO_E_ACCIAIO, "gc-mista-ca-acciaio"); - sistemaCostruttivoLabelsMap.put(IN_MURATURA, "gc-in-muratura"); - sistemaCostruttivoLabelsMap.put(ORDINARIA, "gc-ordinaria"); - sistemaCostruttivoLabelsMap.put(ARMATA, "gc-armata"); - sistemaCostruttivoLabelsMap.put(MISTA, "gc-mista"); - sistemaCostruttivoLabelsMap.put(IN_LEGNO, "gc-in-legno"); - sistemaCostruttivoLabelsMap.put(ALTRO, "gc-altro"); - sistemaCostruttivoLabelsMap.put(CON_DISPOSITIVI_DI_ISOLAMENTO_SISMICO_O_DISSIPAZIONE, "gc-con-dispositivi-isolamento"); - } - - public static String getLabel(String key) { - return sistemaCostruttivoLabelsMap.get(key); - } - + public static final String IN_CEMENTO_ARMATO = "100"; + public static final String IN_OPERA = "101"; + public static final String PREFABBRICATO = "102"; + + public static final String IN_ACCIAIO = "200"; + public static final String MISTA_CEMENTO_ARMATO_E_ACCIAIO = "201"; + + public static final String IN_MURATURA = "300"; + public static final String ORDINARIA = "301"; + public static final String ARMATA = "302"; + public static final String MISTA = "303"; + + public static final String IN_LEGNO = "400"; + + public static final String ALTRO = "500"; + + public static final String CON_DISPOSITIVI_DI_ISOLAMENTO_SISMICO_O_DISSIPAZIONE = "600"; + + /* + * Tipologia + */ + public static final String TIPOLOGIA_INTERVENTO_NUOVA_COSTRUZIONE = "000"; + public static final String TIPOLOGIA_INTERVENTO_EDIFICI_ESISTENTI_ADEGUAMENTO_SISMICO = "001"; + public static final String TIPOLOGIA_INTERVENTO_EDIFICI_ESISTENTI_MIGLIORAMENTO_SISMICO = "010"; + public static final String TIPOLOGIA_INTERVENTO_EDIFICI_ESISTENTI_RIPARAZIONE = "100"; + + private static final Map sistemaCostruttivoLabelsMap = new LinkedHashMap() { + { + put(IN_CEMENTO_ARMATO, "gc-in-ca"); + put(IN_OPERA, "gc-in-opera"); + put(PREFABBRICATO, "gc-prefabbricato"); + put(IN_ACCIAIO, "gc-in-acciaio"); + put(MISTA_CEMENTO_ARMATO_E_ACCIAIO, "gc-mista-ca-acciaio"); + put(IN_MURATURA, "gc-in-muratura"); + put(ORDINARIA, "gc-ordinaria"); + put(ARMATA, "gc-armata"); + put(MISTA, "gc-mista"); + put(IN_LEGNO, "gc-in-legno"); + put(ALTRO, "gc-altro"); + put(CON_DISPOSITIVI_DI_ISOLAMENTO_SISMICO_O_DISSIPAZIONE, "gc-con-dispositivi-isolamento"); + } + }; + + public static String getLabel(String key) { + return sistemaCostruttivoLabelsMap.get(key); + } } diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java index 73884d8a..db7edc73 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/TipoSoggettoUtil.java @@ -1,9 +1,11 @@ package it.tref.liferay.portos.bo.shared.util; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; +import com.liferay.portal.kernel.util.StringPool; + public class TipoSoggettoUtil { public static final String TITOLARE_DIGITALE = "00"; @@ -19,40 +21,42 @@ public class TipoSoggettoUtil { public static final String JSON_CODICE_FISCALE = "codiceFiscale"; public static final String JSON_CODICE_RUOLO = "codiceRuolo"; + @SuppressWarnings("serial") + private static final List allSubjects = new ArrayList() { + { + add(TipoSoggettoUtil.COMMITTENTE); + add(TipoSoggettoUtil.DITTA); + add(TipoSoggettoUtil.PROGETTISTA); + add(TipoSoggettoUtil.DIRETTORE_LAVORI); + add(TipoSoggettoUtil.GEOLOGO); + add(TipoSoggettoUtil.COLLAUDATORE); + } + }; + public static List getAllSubjects() { - return Arrays.asList(TipoSoggettoUtil.COMMITTENTE, TipoSoggettoUtil.DITTA, - TipoSoggettoUtil.PROGETTISTA, TipoSoggettoUtil.DIRETTORE_LAVORI, TipoSoggettoUtil.GEOLOGO, - TipoSoggettoUtil.COLLAUDATORE); + return allSubjects; } public static boolean validaCodiceFiscale(String codiceFiscale, boolean ultimoCarattere) { // conversione della stringa in caratteri maiuscoli try { - String cf = codiceFiscale.toUpperCase().replaceAll(" ", ""); - /* - * verifica della lunghezza del codice fiscale - */ + String cf = codiceFiscale.toUpperCase().replaceAll(StringPool.SPACE, StringPool.BLANK); + // verifica della lunghezza del codice fiscale if (cf.length() == 16) { String cfMask = "^[a-zA-Z]{6}[0-9lmnpqrstuvLMNPQRSTUV]{2}[abcdehlmprstABCDEHLMPRST]{1}[0-9lmnpqrstuvLMNPQRSTUV]{2}([a-zA-Z]{1}[0-9lmnpqrstuvLMNPQRSTUV]{3})[a-zA-Z]{1}$"; if (!Pattern.matches(cfMask, codiceFiscale)) return false; - /* - * creazione della matrice con i caratteri dell'alfabeto - */ - char[] Carattere = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', - 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', - '5', '6', '7', '8', '9' }; - /* - * creazione della matrice con i valori attribuiti ai caratteri - * dispari, corrispondenti alla matrice di caratteri - */ - int[] ValoriDispari = { 1, 0, 5, 7, 9, 13, 15, 17, 19, 21, 2, 4, 18, 20, 11, 3, 6, 8, 12, 14, - 16, 10, 22, 25, 24, 23, 1, 0, 5, 7, 9, 13, 15, 17, 19, 21 }; - /* - * creazione della matrice con i valori attribuiti ai caratteri - * pari, corrispondenti alla matrice di caratteri - */ + // creazione della matrice con i caratteri dell'alfabeto + char[] Carattere = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', + 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '0', '1', '2', '3', '4', '5', '6', '7', '8', + '9' }; + // creazione della matrice con i valori attribuiti ai caratteri dispari, corrispondenti alla matrice di + // caratteri + int[] ValoriDispari = { 1, 0, 5, 7, 9, 13, 15, 17, 19, 21, 2, 4, 18, 20, 11, 3, 6, 8, 12, 14, 16, 10, + 22, 25, 24, 23, 1, 0, 5, 7, 9, 13, 15, 17, 19, 21 }; + // creazione della matrice con i valori attribuiti ai caratteri pari, corrispondenti alla matrice di + // caratteri int[] ValoriPari = new int[36]; for (int i = 0; i < 26; i++) { ValoriPari[i] = i; @@ -60,16 +64,12 @@ public class TipoSoggettoUtil { for (int i = 26; i < 36; i++) { ValoriPari[i] = i - 26; } - // conversione della stringa da esaminare ad una matrice di - // caratteri + // conversione della stringa da esaminare ad una matrice di caratteri char[] caratteriCF = cf.toCharArray(); int valore = 0; for (int i = 0; i < caratteriCF.length - 1; i++) { - /* - * somma delle posizioni pari in base ai valori - * corrispondenti contenuti nell'array ValoriPari (tranne - * l'ultimo carattere che è quello di controllo) - */ + // somma delle posizioni pari in base ai valori corrispondenti contenuti nell'array ValoriPari + // (tranne l'ultimo carattere che è quello di controllo) if ((i + 1) % 2 == 0) { for (int j = 0; j < Carattere.length; j++) { @@ -77,10 +77,8 @@ public class TipoSoggettoUtil { valore += ValoriPari[j]; } } - /* - * somma delle posizioni dispari in base ai valori - * corrispondenti contenuti nell'array ValoriDispari - */ + // somma delle posizioni dispari in base ai valori corrispondenti contenuti nell'array + // ValoriDispari } else { for (int j = 0; j < Carattere.length; j++) { if (caratteriCF[i] == Carattere[j]) { @@ -89,17 +87,12 @@ public class TipoSoggettoUtil { } } } - /* - * ottenimento del resto della divisione per 26 e valutazione - * del carattere di controllo (ultimo carattere) - */ + // ottenimento del resto della divisione per 26 e valutazione del carattere di controllo (ultimo + // carattere) valore %= 26; for (int i = 0; i < 26; i++) { - /* - * verifica che il valore dell'ultimo carattere corrisponda - * al valore ottenuto attraverso l'algoritmo di somma - * precedente - */ + // verifica che il valore dell'ultimo carattere corrisponda al valore ottenuto attraverso + // l'algoritmo di somma precedente if (ultimoCarattere) { if (caratteriCF[caratteriCF.length - 1] == Carattere[i]) { if (valore == i) { diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties index 03bd9d29..d6d4318e 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=Kaleo - build.number=32 - build.date=1616424088204 + build.number=33 + build.date=1616602612754 build.auto.upgrade=true ##