|
@@ -718,7 +718,7 @@ public class TimingTask {
|
|
|
Duration between = Duration.between(LocalTime.parse(String.valueOf(item.get("clockInTime")), time), LocalTime.parse(String.valueOf(item.get("afterWorkTime")), time));
|
|
|
BigDecimal bigDecimal=new BigDecimal(between.toHours());
|
|
|
bigDecimal=bigDecimal.subtract(new BigDecimal(1.5));
|
|
|
- userFvTime.setWorkHours(bigDecimal.floatValue());
|
|
|
+ userFvTime.setWorkHours((bigDecimal.floatValue()<=0||bigDecimal.floatValue()>8)?8:bigDecimal.floatValue());
|
|
|
Optional<UserFvTime> first = allList.stream().filter(al -> al.getUserId().equals(user.get().getId()) && al.getWorkDate().equals(LocalDate.parse(String.valueOf(item.get("signDate")), date))).findFirst();
|
|
|
if(!first.isPresent()){
|
|
|
userFvTimeList.add(userFvTime);
|