Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Fabio Narracci
2024-06-11 17:45:08 +02:00
parent 7ebf5af9f9 e626f1e1c2
commit e67ca853b8
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ems-engine/src/main/java/it/integry/ems/activity/dto/ActivityDTO.java
View File

@@ -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;
}

9
ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
View File

@@ -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 " +