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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-04-11 17:04:18 +02:00
parent d863468175 8a48701cbf
commit 69309bf40b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ems-core/src/main/java/it/integry/ems_model/utility/UtilityLocalDate.java
View File

@@ -58,6 +58,11 @@ public class UtilityLocalDate {
.toLocalDateTime();
}
public static LocalDateTime localDateTimeFromLocalDate(LocalDate dateToConvert) {
return dateToConvert
.atStartOfDay();
}
public static LocalDate timeToLocalDate(long time, @Nullable String timezone) {
return Instant.ofEpochSecond(time)
.atZone(timezone == null ? currentZone : ZoneId.of(timezone))

2
ems-engine/src/main/java/it/integry/ems/logistic/service/SmartLogisticService.java
View File

@@ -602,7 +602,7 @@ public class SmartLogisticService {
dataVers = sdf.format(collo.getDataVers());
String keyCol = "<GESTIONE>" + collo.getGestione() + "</GESTIONE>" +
"<DATA_COLLO>" + CommonConstants.DATETIME_YMD_DASHED_FORMATTER.format(collo.getDataCollo()) + "</DATA_COLLO>" +
"<DATA_COLLO>" + CommonConstants.DATETIME_YMD_DASHED_FORMATTER.format(UtilityLocalDate.localDateTimeFromLocalDate(collo.getDataCollo())) + "</DATA_COLLO>" +
"<NUM_COLLO>" + collo.getNumCollo() + "</NUM_COLLO>" +
"<SER_COLLO>" + collo.getSerCollo() + "</SER_COLLO>" +
"<DATA_ORD>" + dataOrd + "</DATA_ORD>" +