Min 1 年之前
父节点
当前提交
1afe8a5129

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserFvTimeController.java

@@ -367,7 +367,8 @@ public class UserFvTimeController {
                 if(bigDecimal.intValue()>0){
                     bigDecimal=bigDecimal.subtract(new BigDecimal(1.5));
                 }
-                userFvTime.setWorkHours(bigDecimal.floatValue());
+                //存在打卡记录 超过8小时或者小于0小时按照8小时算
+                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);