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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Marco Elefante
2025-10-13 09:27:30 +02:00
parent 7e9c36ab77 5c784a3f90
commit 2529660f3b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -952,14 +952,14 @@ public class ActivityService {
" ELSE 5 /*completata*/ END AS stato_attivita,\n" +
" CAST(ISNULL(integry_tag.is_bug, 0) AS BIT) AS is_bug,\n" +
" integry_tag.tags,\n" +
" DENSE_RANK() OVER (ORDER BY parent.project_description, parent.activity_description) AS 'id_processo',\n" +
" DENSE_RANK() OVER (ORDER BY parent.project_description, parent.activity_description) AS id_processo,\n" +
" gtb_anag.rag_soc,\n " +
" task.dapagare AS da_pagare,\n " +
" task.acanone AS a_canone\n ";
if (daInstallare) {
sql += ", lastUpdt.data AS 'ultimo_aggiornamento'\n";
sql += ", lastUpdt.data AS ultimo_aggiornamento\n";
} else {
sql += ", null AS 'ultimo_aggiornamento'\n";
sql += ", CAST(NULL AS DATETIME) AS ultimo_aggiornamento\n";
}
sql += " FROM stb_activity\n" +
" INNER JOIN stb_user ON stb_activity.user_name = stb_user.user_name\n" +
@@ -967,12 +967,12 @@ public class ActivityService {
" LEFT OUTER JOIN pvw_clienti_prospect gtb_anag on stb_activity.cod_anag = gtb_anag.cod_ppro and stb_activity.tipo_anag = gtb_anag.tipologia\n" +
" AND gtb_anag.flag_stato = 'A'\n" +
" LEFT OUTER JOIN mtb_aart ON stb_activity.cod_mart = mtb_aart.cod_mart\n" +
" LEFT OUTER JOIN (SELECT parent.activity_description AS 'project_description',\n" +
" stb_activity.activity_description AS 'activity_description',\n" +
" LEFT OUTER JOIN (SELECT parent.activity_description AS project_description,\n" +
" stb_activity.activity_description AS activity_description,\n" +
" stb_activity.activity_id,\n" +
" stb_activity.user_name,\n" +
" stb_activity.activity_type_id,\n" +
" stb_activity.persona_rif AS 'responabile_progetto'\n" +
" stb_activity.persona_rif AS responabile_progetto\n" +
" FROM stb_activity\n" +
" LEFT OUTER JOIN stb_activity parent\n" +
" ON stb_activity.parent_activity_id = parent.activity_id\n" +
@@ -2095,6 +2095,7 @@ public class ActivityService {
" FROM stb_activity p\n" +
" INNER JOIN jtb_comt ON jtb_comt.cod_jcom = p.cod_jcom\n" +
" WHERE stato_commessa IN ('IN CORSO', 'POST VENDITA', 'TRATTATIVA')\n" +
" AND jtb_comt.cod_jcom NOT LIKE 'integry%'\n" +
" AND activity_type_id = 'ticket'\n" +
"),\n" +
"figlie AS (\n" +