From 68b4803e46c333dc0e684ce863e5c4015ba8b1da Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Thu, 20 May 2021 12:19:26 +0200 Subject: [PATCH] Integrazioni scadute --- .../src/it/mwg/sismica/bo/util/SismicaUtil.java | 17 +++-------------- .../docroot/WEB-INF/src/service.properties | 4 ++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index f895fd03..00db89d9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -84,7 +84,6 @@ import com.liferay.portal.kernel.workflow.WorkflowInstance; import com.liferay.portal.kernel.workflow.WorkflowInstanceManagerUtil; import com.liferay.portal.kernel.workflow.WorkflowTask; import com.liferay.portal.kernel.workflow.WorkflowTaskManagerUtil; -import com.liferay.portal.model.Group; import com.liferay.portal.model.Organization; import com.liferay.portal.model.ResourceAction; import com.liferay.portal.model.ResourceConstants; @@ -96,7 +95,6 @@ import com.liferay.portal.model.WorkflowInstanceLink; import com.liferay.portal.security.permission.ActionKeys; import com.liferay.portal.security.permission.PermissionChecker; import com.liferay.portal.security.permission.PermissionCheckerFactoryUtil; -import com.liferay.portal.service.GroupLocalServiceUtil; import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.ResourceActionLocalServiceUtil; import com.liferay.portal.service.ResourcePermissionLocalServiceUtil; @@ -181,7 +179,7 @@ public class SismicaUtil { List esito = new ArrayList<>(); esitoLog(esito, "Controllo integrazioni/preavvisi scaduti"); - final int giorniIntegrazione = 40; + final int giorniIntegrazione = 30; final long taskId = 21642; final String taskName = "Esito"; final long nodeId = 21639; @@ -194,7 +192,6 @@ public class SismicaUtil { calendar.set(Calendar.SECOND, 0); calendar.add(Calendar.DAY_OF_YEAR, -giorniIntegrazione); Date inizio = calendar.getTime(); - int scadute = 0; DynamicQuery query = IntPraticaLocalServiceUtil.dynamicQuery(); query.add(RestrictionsFactoryUtil.eq("statoPratica", StatoPraticaConstants.INTEGRAZIONE)); @SuppressWarnings("unchecked") @@ -212,16 +209,8 @@ public class SismicaUtil { } } if (Validator.isNotNull(dtUltimoAvviso) && dtUltimoAvviso.before(inizio)) { - scadute++; - User user = UserLocalServiceUtil.getUser(pratica.getStatusByUserId()); - Territorio territorio = TerritorioLocalServiceUtil.getTerritorio(pratica.getTerritorioId()); - Group group = GroupLocalServiceUtil.getGroup(territorio.getGroupId()); - Organization organization = OrganizationLocalServiceUtil.getOrganization(group.getOrganizationId()); - esitoLog(esito, - "Pratica " + pratica.getNumeroProgetto() + " integrazione " + dfmt.format(dtUltimoAvviso) + " " - + organization.getName() + " tecnico " + user.getFullName()); - // esito.addAll(riassegnaAlTecnico(pratica, commento, validCurrentNodeName, taskId, taskName, nodeId, - // nodeName)); + esito.addAll(riassegnaAlTecnico(pratica, commento, validCurrentNodeName, taskId, taskName, nodeId, + nodeName)); } } return esito; 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 56cf29e8..2679d9ec 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=2623 - build.date=1621434976060 + build.number=2624 + build.date=1621504827459 build.auto.upgrade=true ##