Merge branch 'master' into develop

ems-engine/src/main/java/it/integry/ems/system/controller/SystemController.java

@@ -202,7 +202,7 @@ public class SystemController {
 
         String query =
                 "SELECT log.activity_id, " +
-                        "' - ' + log.attivita  + '( https://task.studioml.it/ViewTicket/' + log.activity_id + ' )'as activity_description "
+                        "activity_description "
                         + " FROM dbo.integry_changeLog( " + UtilityDB.valueToString(partIva) + ", " +
                         UtilityDB.valueDateToString(dataInizio, CommonConstants.DATE_FORMAT_YMD) + ", " +
                         UtilityDB.valueDateToString(dataFine, CommonConstants.DATE_FORMAT_YMD) + ") log "
@@ -217,7 +217,6 @@ public class SystemController {
         stbActivitiesToUpdate.forEach
                 (x -> {
                     x.setActivityResultId(activityResultId);
-                    x.setActivityDescription(null);
                     x.setOperation(OperationType.UPDATE);
                 });
 
@@ -306,7 +305,7 @@ public class SystemController {
 
             List<String> elencoAttivita =
                     stbActivitiesToUpdate.stream()
-                            .map(x -> x.getActivityDescription()).collect(Collectors.toList());
+                            .map(x -> " - " + x.getActivityDescription() + " ( https://task.studioml.it/ViewTicket/" + x.getActivityId() + " )").collect(Collectors.toList());
 
             String emailMessage =
                     String.format("Sono stati installati i seguenti aggiornamenti sull'azienda %s: <br>%s. <br>Verificare le attività con il cliente.",