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:
Mina Ruggiero
2025-03-24 08:40:38 +01:00
parent c96cb31f8c 6b691a635e
commit cf64606f18
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ public class SystemController {
String query = String query =
"SELECT log.activity_id, " + "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) + ", " + + " FROM dbo.integry_changeLog( " + UtilityDB.valueToString(partIva) + ", " +
UtilityDB.valueDateToString(dataInizio, CommonConstants.DATE_FORMAT_YMD) + ", " + UtilityDB.valueDateToString(dataInizio, CommonConstants.DATE_FORMAT_YMD) + ", " +
UtilityDB.valueDateToString(dataFine, CommonConstants.DATE_FORMAT_YMD) + ") log " UtilityDB.valueDateToString(dataFine, CommonConstants.DATE_FORMAT_YMD) + ") log "
@@ -217,7 +217,6 @@ public class SystemController {
stbActivitiesToUpdate.forEach stbActivitiesToUpdate.forEach
(x -> { (x -> {
x.setActivityResultId(activityResultId); x.setActivityResultId(activityResultId);
x.setActivityDescription(null);
x.setOperation(OperationType.UPDATE); x.setOperation(OperationType.UPDATE);
}); });
@@ -306,7 +305,7 @@ public class SystemController {
List<String> elencoAttivita = List<String> elencoAttivita =
stbActivitiesToUpdate.stream() 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 emailMessage =
String.format("Sono stati installati i seguenti aggiornamenti sull'azienda %s: <br>%s. <br>Verificare le attività con il cliente.", String.format("Sono stati installati i seguenti aggiornamenti sull'azienda %s: <br>%s. <br>Verificare le attività con il cliente.",