From e626f1e1c22144b6e8af3fde1c70b5645bb2a75d Mon Sep 17 00:00:00 2001 From: MinaR Date: Tue, 11 Jun 2024 16:12:04 +0200 Subject: [PATCH] aggiunto a Canone a Pagamento --- .../integry/ems/activity/dto/ActivityDTO.java | 24 +++++++++++++++++++ .../ems/activity/service/ActivityService.java | 9 +++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java b/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java index 5b695a037a..eb0036c3f5 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java @@ -148,6 +148,12 @@ public class ActivityDTO { @SqlField(value = "flag_risolto") private String flagRisolto; + @SqlField(value = "da_pagare") + private Boolean daPagare; + + @SqlField(value = "a_canone") + private Boolean aCanone; + private String emailRichiedente; @@ -616,6 +622,24 @@ public class ActivityDTO { return this; } + public Boolean getDaPagare() { + return daPagare; + } + + public ActivityDTO setDaPagare(Boolean daPagare) { + this.daPagare = daPagare; + return this; + } + + public Boolean getaCanone() { + return aCanone; + } + + public ActivityDTO setaCanone(Boolean aCanone) { + this.aCanone = aCanone; + return this; + } + public String getEmailRichiedente() { return emailRichiedente; } diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java index eb935dc1be..673446577d 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java @@ -958,9 +958,14 @@ public class ActivityService { " WHEN sottoattivita.activity_description <> processi.activity_description\n" + " THEN sottoattivita.activity_description\n" + " ELSE\n" + - " '' END AS 'descrizione_sottoattivita'\n" + + " '' END AS 'descrizione_sottoattivita',\n" + + " task.daPagare as da_pagare,\n" + + " task.aCanone as a_canone " + "FROM processi\n" + - " LEFT OUTER JOIN sottoattivita ON processi.activity_id = sottoattivita.parent_activity_id\n"; + " LEFT OUTER JOIN sottoattivita ON processi.activity_id = sottoattivita.parent_activity_id\n"+ + " OUTER APPLY ( SELECT CAST(MAX(CASE WHEN task.cod_jfas <> 'C01' THEN 0 ELSE 1 END) AS BIT) AS daPagare,\n" + + " CAST(MAX(CASE WHEN task.cod_jfas = 'C01' THEN 0 ELSE 1 END) AS BIT) AS aCanone \n" + + " FROM stb_activity task ON processi.activity_id = task.parent_activity_id) task "; if (!isTable) { sql += " WHERE processi.effective_endtime IS NULL " +