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

This commit is contained in:
jenkins
2025-02-05 13:27:44 +01:00

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);
@@ -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);