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

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

Browse Source
This commit is contained in:
jenkins
2025-02-05 13:27:44 +01:00
parent 40f8c5295b 9060f4c893
commit a63fb05e9c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,9 @@ public class SystemController {
List<StbActivity> stbActivitiesToUpdate = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), query, StbActivity.class);
stbActivitiesToUpdate.stream().forEach
if (stbActivitiesToUpdate == null) stbActivitiesToUpdate = new ArrayList<>();
stbActivitiesToUpdate.forEach
(x -> {
StbActivity stbActivity = new StbActivity()
.setActivityResultId(activityResultId);
@@ -235,7 +237,7 @@ public class SystemController {
String codAnag = UtilityHashMap.getValueIfExists(result, "cod_anag");
String codJcom = UtilityHashMap.getValueIfExists(result, "cod_jcom");
String respComm = UtilityHashMap.getValueIfExists(result, "cod_jflav_tec");
String respComm = UtilityHashMap.getValueIfExists(result, "cod_jflav_tec");
if (codJcom == null) {
throw new Exception("Codice commessa non trovata per il cliente " + partIva);
@@ -284,7 +286,7 @@ public class SystemController {
.setEffectiveTime(startDate)
.setEffectiveEndtime(endDate)
.setActivityResultId("COMPLETATA")
.setOreRapportino(new BigDecimal(0.25));
.setOreRapportino(BigDecimal.valueOf(0.25));
activityInstallazione.setOperation(OperationType.INSERT);
stbActivitiesToUpdate.add(activityInstallazione);
@@ -297,20 +299,20 @@ public class SystemController {
if (!UtilityString.isNullOrEmpty(respComm) && !stbActivitiesToUpdate.isEmpty()) {
sql =
Query.format(
"SELECT stb_user.e_mail\n" +
" FROM stb_user inner join jrl_flav_users on stb_user.user_name = jrl_flav_users.user_name\n" +
" WHERE jrl_flav_users.cod_jflav = %s AND " +
"jrl_flav_users.flag_jflav_default = 'S'", respComm);
"SELECT stb_user.e_mail\n" +
" FROM stb_user inner join jrl_flav_users on stb_user.user_name = jrl_flav_users.user_name\n" +
" WHERE jrl_flav_users.cod_jflav = %s AND " +
"jrl_flav_users.flag_jflav_default = 'S'", respComm);
String emailTo = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(multiDBTransactionManager.getPrimaryConnection(), sql);
List<String> elencoAttivita =
stbActivitiesToUpdate.stream()
.map(x->x.getActivityDescription()).collect(Collectors.toList());
.map(x -> x.getActivityDescription()).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.",
codJcom,
StringUtils.join(elencoAttivita,"<br>"));
StringUtils.join(elencoAttivita, "<br>"));
mailService.sendMailPrimary(multiDBTransactionManager, "noreply@integry.it", "Integry Ticketing", emailTo, null, null,
String.format("Installazione aggiornamenti %s", codJcom),