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

Aggiunti campi ragione sociale e data ultimo aggiornamento in getActivity

Browse Source
This commit is contained in:
Marco Elefante
2024-01-18 15:38:41 +01:00
parent 1fe5fa5b1a
commit 3a5a1d1aad
2 changed files with 55 additions and 7 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

@@ -136,6 +136,12 @@ public class ActivityDTO {
@SqlField(value = "ultima_modifica")
private Date ultimaModifica;
@SqlField(value = "rag_soc")
private String ragSoc;
@SqlField(value = "ultimo_aggiornamento")
private Date ultimoAggiornamento;
public StbActivity getStbActivity() {
return stbActivity;
@@ -566,6 +572,24 @@ public class ActivityDTO {
return this;
}
public String getRagSoc() {
return ragSoc;
}
public ActivityDTO setRagSoc(String ragSoc) {
this.ragSoc = ragSoc;
return this;
}
public Date getUltimoAggiornamento() {
return ultimoAggiornamento;
}
public ActivityDTO setUltimoAggiornamento(Date ultimoAggiornamento) {
this.ultimoAggiornamento = ultimoAggiornamento;
return this;
}
public static class WorkedHours {
@SqlField("parent_activity_id")
private String parentActivityId;

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

@@ -784,8 +784,16 @@ public class ActivityService {
" LEFT OUTER JOIN jtb_rlavr ON stb_activity.activity_id = jtb_rlavr.activity_id\n" +
(isTable?"":" AND stb_activity.user_name = '" + username + "'") +
" GROUP BY stb_activity.parent_activity_id),\n" +
"\n" +
" processi AS (SELECT stb_activity.cod_jcom,\n" +
"\n";
if (daInstallare){
sql += "lastUpdt AS (SELECT cod_anag, MAX(effective_date) AS data\n" +
" FROM stb_activity\n" +
" WHERE activity_type_id = 'aggiornamenti software'\n" +
" GROUP BY cod_anag), \n";
}
sql += " processi AS (SELECT stb_activity.cod_jcom,\n" +
" stb_activity.user_name,\n" +
" stb_activity.activity_id,\n" +
" stb_activity.parent_activity_id,\n" +
@@ -825,14 +833,23 @@ 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" +
" FROM stb_activity\n" +
" DENSE_RANK() OVER (ORDER BY parent.project_description, parent.activity_description) AS 'id_processo',\n" +
" gtb_anag.rag_soc";
if (daInstallare){
sql += ", lastUpdt.data \n";
} else {
sql += ", null AS 'data' \n";
}
sql += " FROM stb_activity\n" +
" INNER JOIN stb_user ON stb_activity.user_name = stb_user.user_name\n" +
" INNER JOIN (SELECT *\n" +
" FROM jtb_comt\n" +
" WHERE stato_commessa IN ('IN CORSO', 'POST VENDITA', 'TRATTATIVA')) jtb_comt\n" +
" ON stb_activity.cod_jcom = jtb_comt.cod_jcom\n" +
" INNER JOIN stb_user creator ON stb_activity.user_creator = creator.user_name\n" +
" INNER JOIN gtb_anag on stb_activity.cod_anag = gtb_anag.cod_anag\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" +
@@ -846,8 +863,13 @@ public class ActivityService {
" ON stb_activity.parent_activity_id = parent.activity_id\n" +
" LEFT OUTER JOIN stb_activity_result\n" +
" ON stb_activity.activity_result_id = stb_activity_result.activity_result_id\n" +
" LEFT OUTER JOIN integry_tag ON stb_activity.activity_id = integry_tag.activity_id\n" +
" WHERE stb_activity.flag_tipologia = 'P'\n" +
" LEFT OUTER JOIN integry_tag ON stb_activity.activity_id = integry_tag.activity_id\n";
if (daInstallare){
sql += " LEFT OUTER JOIN lastUpdt ON stb_activity.cod_anag = lastUpdt.cod_anag\n";
}
sql += " WHERE stb_activity.flag_tipologia = 'P'\n" +
" AND stb_activity.user_name <> 'F0000'\n" +
// " AND EXISTS(SELECT *\n" +
// " FROM srl_user\n" +
@@ -911,7 +933,9 @@ public class ActivityService {
" processi.note,\n" +
" sottoattivita.last_activity_date AS 'data_ult_attivita',\n" +
" ISNULL(sottoattivita.ore, 0) AS 'Ore_tot',\n" +
" sottoattivita.next_activity_date AS 'data_prossima_attivita'\n" +
" sottoattivita.next_activity_date AS 'data_prossima_attivita',\n" +
" processi.rag_soc,\n" +
" processi.data AS 'ultimo_aggiornamento'\n" +
"FROM processi\n" +
" LEFT OUTER JOIN sottoattivita ON processi.activity_id = sottoattivita.parent_activity_id\n";