Merge branch 'master' into develop

This commit is contained in:
2024-03-12 18:42:02 +01:00

View File

@@ -36,6 +36,7 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -892,6 +893,7 @@ public class SqlFieldHolder {
if (date.equals(EmsRestConstants.DATE_NULL)) {
dato = null;
} else {
date.setTime((date.getTime() / 1000) * 1000);
dato = date;
}
}
@@ -908,7 +910,8 @@ public class SqlFieldHolder {
if (localTime.equals(LocalTime.MIN)) {
dato = null;
} else {
dato = localTime;
dato = localTime
.truncatedTo(ChronoUnit.SECONDS);
}
}
else if (obj instanceof LocalDateTime) {
@@ -916,7 +919,8 @@ public class SqlFieldHolder {
if (localDateTime.equals(LocalDateTime.MIN)) {
dato = null;
} else {
dato = localDateTime;
dato = localDateTime
.truncatedTo(ChronoUnit.SECONDS);
}
}
else if (obj instanceof Integer) {