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 d23801ab..486d9c48 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 @@ -1009,7 +1009,6 @@ - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java index 1850d1de..af136c8a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaClp.java @@ -102,7 +102,6 @@ public class IntPraticaClp extends BaseModelImpl attributes.put("oldIntPraticaId", getOldIntPraticaId()); attributes.put("sospesa", getSospesa()); attributes.put("dtSospensione", getDtSospensione()); - attributes.put("dtViarch", getDtViarch()); attributes.put("codiceFiscaleDelegatoFineLavori", getCodiceFiscaleDelegatoFineLavori()); attributes.put("codiceFiscaleDelegatoCollaudo", @@ -275,12 +274,6 @@ public class IntPraticaClp extends BaseModelImpl setDtSospensione(dtSospensione); } - Date dtViarch = (Date)attributes.get("dtViarch"); - - if (dtViarch != null) { - setDtViarch(dtViarch); - } - String codiceFiscaleDelegatoFineLavori = (String)attributes.get( "codiceFiscaleDelegatoFineLavori"); @@ -959,29 +952,6 @@ public class IntPraticaClp extends BaseModelImpl } } - @Override - public Date getDtViarch() { - return _dtViarch; - } - - @Override - public void setDtViarch(Date dtViarch) { - _dtViarch = dtViarch; - - if (_intPraticaRemoteModel != null) { - try { - Class clazz = _intPraticaRemoteModel.getClass(); - - Method method = clazz.getMethod("setDtViarch", Date.class); - - method.invoke(_intPraticaRemoteModel, dtViarch); - } - catch (Exception e) { - throw new UnsupportedOperationException(e); - } - } - } - @Override public String getCodiceFiscaleDelegatoFineLavori() { return _codiceFiscaleDelegatoFineLavori; @@ -1358,7 +1328,6 @@ public class IntPraticaClp extends BaseModelImpl clone.setOldIntPraticaId(getOldIntPraticaId()); clone.setSospesa(getSospesa()); clone.setDtSospensione(getDtSospensione()); - clone.setDtViarch(getDtViarch()); clone.setCodiceFiscaleDelegatoFineLavori(getCodiceFiscaleDelegatoFineLavori()); clone.setCodiceFiscaleDelegatoCollaudo(getCodiceFiscaleDelegatoCollaudo()); clone.setFineLavoriParziale(getFineLavoriParziale()); @@ -1418,7 +1387,7 @@ public class IntPraticaClp extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(69); + StringBundler sb = new StringBundler(67); sb.append("{uuid="); sb.append(getUuid()); @@ -1472,8 +1441,6 @@ public class IntPraticaClp extends BaseModelImpl sb.append(getSospesa()); sb.append(", dtSospensione="); sb.append(getDtSospensione()); - sb.append(", dtViarch="); - sb.append(getDtViarch()); sb.append(", codiceFiscaleDelegatoFineLavori="); sb.append(getCodiceFiscaleDelegatoFineLavori()); sb.append(", codiceFiscaleDelegatoCollaudo="); @@ -1495,7 +1462,7 @@ public class IntPraticaClp extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(106); + StringBundler sb = new StringBundler(103); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.IntPratica"); @@ -1605,10 +1572,6 @@ public class IntPraticaClp extends BaseModelImpl "dtSospensione"); - sb.append( - "dtViarch"); sb.append( "codiceFiscaleDelegatoFineLavori private long _oldIntPraticaId; private boolean _sospesa; private Date _dtSospensione; - private Date _dtViarch; private String _codiceFiscaleDelegatoFineLavori; private String _codiceFiscaleDelegatoCollaudo; private boolean _fineLavoriParziale; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java index 101d08ed..d1a7f3e5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaModel.java @@ -492,20 +492,6 @@ public interface IntPraticaModel extends BaseModel, */ public void setDtSospensione(Date dtSospensione); - /** - * Returns the dt viarch of this int pratica. - * - * @return the dt viarch of this int pratica - */ - public Date getDtViarch(); - - /** - * Sets the dt viarch of this int pratica. - * - * @param dtViarch the dt viarch of this int pratica - */ - public void setDtViarch(Date dtViarch); - /** * Returns the codice fiscale delegato fine lavori of this int pratica. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java index a9ce95a4..c7d3ad3a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaSoap.java @@ -57,7 +57,6 @@ public class IntPraticaSoap implements Serializable { soapModel.setOldIntPraticaId(model.getOldIntPraticaId()); soapModel.setSospesa(model.getSospesa()); soapModel.setDtSospensione(model.getDtSospensione()); - soapModel.setDtViarch(model.getDtViarch()); soapModel.setCodiceFiscaleDelegatoFineLavori(model.getCodiceFiscaleDelegatoFineLavori()); soapModel.setCodiceFiscaleDelegatoCollaudo(model.getCodiceFiscaleDelegatoCollaudo()); soapModel.setFineLavoriParziale(model.getFineLavoriParziale()); @@ -333,14 +332,6 @@ public class IntPraticaSoap implements Serializable { _dtSospensione = dtSospensione; } - public Date getDtViarch() { - return _dtViarch; - } - - public void setDtViarch(Date dtViarch) { - _dtViarch = dtViarch; - } - public String getCodiceFiscaleDelegatoFineLavori() { return _codiceFiscaleDelegatoFineLavori; } @@ -445,7 +436,6 @@ public class IntPraticaSoap implements Serializable { private long _oldIntPraticaId; private boolean _sospesa; private Date _dtSospensione; - private Date _dtViarch; private String _codiceFiscaleDelegatoFineLavori; private String _codiceFiscaleDelegatoCollaudo; private boolean _fineLavoriParziale; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java index fb44e359..29f414b4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/IntPraticaWrapper.java @@ -76,7 +76,6 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { attributes.put("oldIntPraticaId", getOldIntPraticaId()); attributes.put("sospesa", getSospesa()); attributes.put("dtSospensione", getDtSospensione()); - attributes.put("dtViarch", getDtViarch()); attributes.put("codiceFiscaleDelegatoFineLavori", getCodiceFiscaleDelegatoFineLavori()); attributes.put("codiceFiscaleDelegatoCollaudo", @@ -249,12 +248,6 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { setDtSospensione(dtSospensione); } - Date dtViarch = (Date)attributes.get("dtViarch"); - - if (dtViarch != null) { - setDtViarch(dtViarch); - } - String codiceFiscaleDelegatoFineLavori = (String)attributes.get( "codiceFiscaleDelegatoFineLavori"); @@ -906,26 +899,6 @@ public class IntPraticaWrapper implements IntPratica, ModelWrapper { _intPratica.setDtSospensione(dtSospensione); } - /** - * Returns the dt viarch of this int pratica. - * - * @return the dt viarch of this int pratica - */ - @Override - public java.util.Date getDtViarch() { - return _intPratica.getDtViarch(); - } - - /** - * Sets the dt viarch of this int pratica. - * - * @param dtViarch the dt viarch of this int pratica - */ - @Override - public void setDtViarch(java.util.Date dtViarch) { - _intPratica.setDtViarch(dtViarch); - } - /** * Returns the codice fiscale delegato fine lavori of this int pratica. * 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 569696eb..1c2ac072 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 @@ -615,7 +615,6 @@ create table portos_bo_IntPratica ( oldIntPraticaId LONG, sospesa BOOLEAN, dtSospensione DATE null, - dtViarch DATE null, codiceFiscaleDelegatoFineLavori VARCHAR(75) null, codiceFiscaleDelegatoCollaudo VARCHAR(75) null, fineLavoriParziale BOOLEAN, 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 5bf04d1f..6770b874 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 @@ -662,7 +662,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 d3f5967e..589abeb5 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 @@ -709,7 +709,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 e92a68d4..34eb8b02 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 @@ -844,9 +844,6 @@ TIMESTAMP - - TIMESTAMP - 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 947f4904..daa06d41 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 @@ -20,6 +20,7 @@ import it.tref.liferay.portos.bo.service.CollaudoLocalServiceUtil; import it.tref.liferay.portos.bo.service.DettPraticaLocalServiceUtil; import it.tref.liferay.portos.bo.service.FineLavoriLocalServiceUtil; import it.tref.liferay.portos.bo.service.IntPraticaLocalServiceUtil; +import it.tref.liferay.portos.bo.shared.util.Constants; import it.tref.liferay.portos.bo.shared.util.StatoPraticaConstants; import it.tref.liferay.portos.bo.shared.util.TipoIntegrazioneUtil; import it.tref.liferay.portos.bo.util.AvvisoUtil; @@ -28,6 +29,8 @@ import it.tref.liferay.portos.bo.util.PraticaUtil; import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.language.LanguageUtil; +import com.liferay.portal.kernel.log.Log; +import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.Validator; @@ -52,6 +55,8 @@ public class AvvisoImpl extends AvvisoBaseImpl { */ private static final long serialVersionUID = -2350602144741897095L; + private static final Log _log = LogFactoryUtil.getLog(AvvisoImpl.class); + /* * 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. @@ -63,18 +68,24 @@ public class AvvisoImpl extends AvvisoBaseImpl { @Override public String getFullDescription() throws PortalException, SystemException { - String fullDescription; - if (Validator.isNull(this.getDescLong())) { - String tipoDocumento = AvvisoUtil.getAllTipoDocumento().containsKey(this.getTipoDocumento()) ? AvvisoUtil - .getAllTipoDocumento().get(this.getTipoDocumento()) - : "label.admingeniocivile.avviso.tipoDocumento.avvisomanuale"; - fullDescription = LanguageUtil.get(LocaleUtil.ITALIAN, tipoDocumento); - } else { - fullDescription = this.getDescLong(); - } + String tipoDocumento = AvvisoUtil.getAllTipoDocumento().containsKey(this.getTipoDocumento()) ? AvvisoUtil + .getAllTipoDocumento().get(this.getTipoDocumento()) + : "label.admingeniocivile.avviso.tipoDocumento.avvisomanuale"; + String fullDescription = LanguageUtil.get(LocaleUtil.ITALIAN, tipoDocumento); + IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(this.getIntPraticaId()); + switch (intPratica.getTipoProcedura()) { + case Constants.PROCEDURA_P3: + switch (this.getTipoDocumento()) { + case StatoPraticaConstants.AUTORIZZATA: + case StatoPraticaConstants.CONFORME: + return "Conclusione VIArch"; + case StatoPraticaConstants.INTEGRAZIONE: + return "Attivazione VIArch"; + } + break; + } if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.VIDIMATA)) { - if (this.getClassName().equals(DettPratica.class.getName())) { DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(this.getClassPk()); if (TipoIntegrazioneUtil.VARIAZIONE_SOGGETTO.equalsIgnoreCase(dettPratica.getTipoIntegrazione())) { @@ -100,23 +111,13 @@ public class AvvisoImpl extends AvvisoBaseImpl { + LanguageUtil.get(LocaleUtil.ITALIAN, "label-integrazione-" + (collaudo.getParziale() ? "10" : "08")) + " n° " + collaudo.getNumero() + ""; } - - } else if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.CONFORME)) { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(this.getIntPraticaId()); - + } else if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.CONFORME) + || this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.NON_CONFORME)) { return LanguageUtil.get( LocaleUtil.ITALIAN, AvvisoUtil.getAllTipoDocumento().get( - PraticaUtil.getStatoPraticaCode(StatoPraticaConstants.CONFORME, intPratica))); - - } else if (this.getTipoDocumento().equalsIgnoreCase(StatoPraticaConstants.NON_CONFORME)) { - IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(this.getIntPraticaId()); - return LanguageUtil.get( - LocaleUtil.ITALIAN, - AvvisoUtil.getAllTipoDocumento().get( - PraticaUtil.getStatoPraticaCode(StatoPraticaConstants.NON_CONFORME, intPratica))); + PraticaUtil.getStatoPraticaCode(this.getTipoDocumento(), intPratica))); } - return fullDescription; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java index 04bbac93..63263971 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaCacheModel.java @@ -38,7 +38,7 @@ public class IntPraticaCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(69); + StringBundler sb = new StringBundler(67); sb.append("{uuid="); sb.append(uuid); @@ -92,8 +92,6 @@ public class IntPraticaCacheModel implements CacheModel, sb.append(sospesa); sb.append(", dtSospensione="); sb.append(dtSospensione); - sb.append(", dtViarch="); - sb.append(dtViarch); sb.append(", codiceFiscaleDelegatoFineLavori="); sb.append(codiceFiscaleDelegatoFineLavori); sb.append(", codiceFiscaleDelegatoCollaudo="); @@ -228,13 +226,6 @@ public class IntPraticaCacheModel implements CacheModel, intPraticaImpl.setDtSospensione(new Date(dtSospensione)); } - if (dtViarch == Long.MIN_VALUE) { - intPraticaImpl.setDtViarch(null); - } - else { - intPraticaImpl.setDtViarch(new Date(dtViarch)); - } - if (codiceFiscaleDelegatoFineLavori == null) { intPraticaImpl.setCodiceFiscaleDelegatoFineLavori(StringPool.BLANK); } @@ -288,7 +279,6 @@ public class IntPraticaCacheModel implements CacheModel, oldIntPraticaId = objectInput.readLong(); sospesa = objectInput.readBoolean(); dtSospensione = objectInput.readLong(); - dtViarch = objectInput.readLong(); codiceFiscaleDelegatoFineLavori = objectInput.readUTF(); codiceFiscaleDelegatoCollaudo = objectInput.readUTF(); fineLavoriParziale = objectInput.readBoolean(); @@ -367,7 +357,6 @@ public class IntPraticaCacheModel implements CacheModel, objectOutput.writeLong(oldIntPraticaId); objectOutput.writeBoolean(sospesa); objectOutput.writeLong(dtSospensione); - objectOutput.writeLong(dtViarch); if (codiceFiscaleDelegatoFineLavori == null) { objectOutput.writeUTF(StringPool.BLANK); @@ -416,7 +405,6 @@ public class IntPraticaCacheModel implements CacheModel, public long oldIntPraticaId; public boolean sospesa; public long dtSospensione; - public long dtViarch; public String codiceFiscaleDelegatoFineLavori; public String codiceFiscaleDelegatoCollaudo; public boolean fineLavoriParziale; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java index 29b09266..290ba389 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/IntPraticaModelImpl.java @@ -93,7 +93,6 @@ public class IntPraticaModelImpl extends BaseModelImpl { "oldIntPraticaId", Types.BIGINT }, { "sospesa", Types.BOOLEAN }, { "dtSospensione", Types.TIMESTAMP }, - { "dtViarch", Types.TIMESTAMP }, { "codiceFiscaleDelegatoFineLavori", Types.VARCHAR }, { "codiceFiscaleDelegatoCollaudo", Types.VARCHAR }, { "fineLavoriParziale", Types.BOOLEAN }, @@ -102,7 +101,7 @@ public class IntPraticaModelImpl extends BaseModelImpl { "collaudoTotale", Types.BOOLEAN }, { "controlloObbligatorio", Types.BOOLEAN } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_IntPratica (uuid_ VARCHAR(75) null,intPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,tipoPratica VARCHAR(75) null,territorioId LONG,tipoProcedura VARCHAR(75) null,dtAnnullamento DATE null,docPraticaAnnullamentoId LONG,unitaOperativa INTEGER,dtSorteggio DATE null,statoPratica VARCHAR(10) null,numeroProgetto VARCHAR(75) null,validata BOOLEAN,status INTEGER,statusByUserId LONG,statusDate DATE null,esitoControllo INTEGER,dtPratica DATE null,oldIntPraticaId LONG,sospesa BOOLEAN,dtSospensione DATE null,dtViarch DATE null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,fineLavoriParziale BOOLEAN,fineLavoriTotale BOOLEAN,collaudoParziale BOOLEAN,collaudoTotale BOOLEAN,controlloObbligatorio BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_IntPratica (uuid_ VARCHAR(75) null,intPraticaId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,tipoPratica VARCHAR(75) null,territorioId LONG,tipoProcedura VARCHAR(75) null,dtAnnullamento DATE null,docPraticaAnnullamentoId LONG,unitaOperativa INTEGER,dtSorteggio DATE null,statoPratica VARCHAR(10) null,numeroProgetto VARCHAR(75) null,validata BOOLEAN,status INTEGER,statusByUserId LONG,statusDate DATE null,esitoControllo INTEGER,dtPratica DATE null,oldIntPraticaId LONG,sospesa BOOLEAN,dtSospensione DATE null,codiceFiscaleDelegatoFineLavori VARCHAR(75) null,codiceFiscaleDelegatoCollaudo VARCHAR(75) null,fineLavoriParziale BOOLEAN,fineLavoriTotale BOOLEAN,collaudoParziale BOOLEAN,collaudoTotale BOOLEAN,controlloObbligatorio BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_IntPratica"; public static final String ORDER_BY_JPQL = " ORDER BY intPratica.intPraticaId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_IntPratica.intPraticaId ASC"; @@ -167,7 +166,6 @@ public class IntPraticaModelImpl extends BaseModelImpl model.setOldIntPraticaId(soapModel.getOldIntPraticaId()); model.setSospesa(soapModel.getSospesa()); model.setDtSospensione(soapModel.getDtSospensione()); - model.setDtViarch(soapModel.getDtViarch()); model.setCodiceFiscaleDelegatoFineLavori(soapModel.getCodiceFiscaleDelegatoFineLavori()); model.setCodiceFiscaleDelegatoCollaudo(soapModel.getCodiceFiscaleDelegatoCollaudo()); model.setFineLavoriParziale(soapModel.getFineLavoriParziale()); @@ -265,7 +263,6 @@ public class IntPraticaModelImpl extends BaseModelImpl attributes.put("oldIntPraticaId", getOldIntPraticaId()); attributes.put("sospesa", getSospesa()); attributes.put("dtSospensione", getDtSospensione()); - attributes.put("dtViarch", getDtViarch()); attributes.put("codiceFiscaleDelegatoFineLavori", getCodiceFiscaleDelegatoFineLavori()); attributes.put("codiceFiscaleDelegatoCollaudo", @@ -438,12 +435,6 @@ public class IntPraticaModelImpl extends BaseModelImpl setDtSospensione(dtSospensione); } - Date dtViarch = (Date)attributes.get("dtViarch"); - - if (dtViarch != null) { - setDtViarch(dtViarch); - } - String codiceFiscaleDelegatoFineLavori = (String)attributes.get( "codiceFiscaleDelegatoFineLavori"); @@ -928,17 +919,6 @@ public class IntPraticaModelImpl extends BaseModelImpl _dtSospensione = dtSospensione; } - @JSON - @Override - public Date getDtViarch() { - return _dtViarch; - } - - @Override - public void setDtViarch(Date dtViarch) { - _dtViarch = dtViarch; - } - @JSON @Override public String getCodiceFiscaleDelegatoFineLavori() { @@ -1116,7 +1096,6 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaImpl.setOldIntPraticaId(getOldIntPraticaId()); intPraticaImpl.setSospesa(getSospesa()); intPraticaImpl.setDtSospensione(getDtSospensione()); - intPraticaImpl.setDtViarch(getDtViarch()); intPraticaImpl.setCodiceFiscaleDelegatoFineLavori(getCodiceFiscaleDelegatoFineLavori()); intPraticaImpl.setCodiceFiscaleDelegatoCollaudo(getCodiceFiscaleDelegatoCollaudo()); intPraticaImpl.setFineLavoriParziale(getFineLavoriParziale()); @@ -1348,15 +1327,6 @@ public class IntPraticaModelImpl extends BaseModelImpl intPraticaCacheModel.dtSospensione = Long.MIN_VALUE; } - Date dtViarch = getDtViarch(); - - if (dtViarch != null) { - intPraticaCacheModel.dtViarch = dtViarch.getTime(); - } - else { - intPraticaCacheModel.dtViarch = Long.MIN_VALUE; - } - intPraticaCacheModel.codiceFiscaleDelegatoFineLavori = getCodiceFiscaleDelegatoFineLavori(); String codiceFiscaleDelegatoFineLavori = intPraticaCacheModel.codiceFiscaleDelegatoFineLavori; @@ -1390,7 +1360,7 @@ public class IntPraticaModelImpl extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(69); + StringBundler sb = new StringBundler(67); sb.append("{uuid="); sb.append(getUuid()); @@ -1444,8 +1414,6 @@ public class IntPraticaModelImpl extends BaseModelImpl sb.append(getSospesa()); sb.append(", dtSospensione="); sb.append(getDtSospensione()); - sb.append(", dtViarch="); - sb.append(getDtViarch()); sb.append(", codiceFiscaleDelegatoFineLavori="); sb.append(getCodiceFiscaleDelegatoFineLavori()); sb.append(", codiceFiscaleDelegatoCollaudo="); @@ -1467,7 +1435,7 @@ public class IntPraticaModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(106); + StringBundler sb = new StringBundler(103); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.IntPratica"); @@ -1577,10 +1545,6 @@ public class IntPraticaModelImpl extends BaseModelImpl "dtSospensione"); - sb.append( - "dtViarch"); sb.append( "codiceFiscaleDelegatoFineLavori private boolean _setOriginalOldIntPraticaId; private boolean _sospesa; private Date _dtSospensione; - private Date _dtViarch; private String _codiceFiscaleDelegatoFineLavori; private String _codiceFiscaleDelegatoCollaudo; private boolean _fineLavoriParziale; 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 6f52913c..d70daed9 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 @@ -555,19 +555,14 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi } switch (intPratica.getTipoProcedura()) { case Constants.PROCEDURA_P3: - if (Validator.isNull(intPratica.getDtViarch())) { - return jsonViarchStart; - } else { - return jsonViarchEnd; - } + return jsonViarch; } return jsonAutorizzazione; } private static final String jsonDeposito = StringPool.BLANK; private static final String jsonAutorizzazione = getJsonAutorizzazione(); - private static final String jsonViarchStart = getJsonViarchStart(); - private static final String jsonViarchEnd = getJsonViarchStart(); + private static final String jsonViarch = getJsonViarch(); private static String getJsonAutorizzazione() { JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); @@ -601,7 +596,7 @@ public class ControlloPraticaLocalServiceImpl extends ControlloPraticaLocalServi return jsonObject.toString(); } - private static String getJsonViarchStart() { + private static String getJsonViarch() { JSONObject jsonObject = JSONFactoryUtil.createJSONObject(); JSONArray jsonArray = JSONFactoryUtil.createJSONArray(); jsonObject.put("esito", jsonArray); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java index ccb3a4f2..a902c64f 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/IntPraticaPersistenceImpl.java @@ -4668,7 +4668,6 @@ public class IntPraticaPersistenceImpl extends BasePersistenceImpl intPraticaImpl.setOldIntPraticaId(intPratica.getOldIntPraticaId()); intPraticaImpl.setSospesa(intPratica.isSospesa()); intPraticaImpl.setDtSospensione(intPratica.getDtSospensione()); - intPraticaImpl.setDtViarch(intPratica.getDtViarch()); intPraticaImpl.setCodiceFiscaleDelegatoFineLavori(intPratica.getCodiceFiscaleDelegatoFineLavori()); intPraticaImpl.setCodiceFiscaleDelegatoCollaudo(intPratica.getCodiceFiscaleDelegatoCollaudo()); intPraticaImpl.setFineLavoriParziale(intPratica.isFineLavoriParziale()); 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 b7a88994..147634ea 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=2932 - build.date=1616496884713 + build.number=2936 + build.date=1616499614230 build.auto.upgrade=true ##