1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -250,13 +250,14 @@ public class UserWithBeisenController {
                             BigDecimal decimal = new BigDecimal(vacationDuration);
                             decimal=decimal.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
                             //考勤打卡区间大于8小时 但是存在休假数据
-                            if(between.toHours()>8){
-                                if(decimal.doubleValue()>8){
-                                    workTime= workTime-8;
-                                }else {
-                                    workTime= workTime-decimal.doubleValue();
-                                }
-                            }
+//                            if(between.toHours()>8){
+//                                if(decimal.doubleValue()>8){
+//                                    workTime= workTime-8;
+//                                }else {
+//                                    workTime= workTime-decimal.doubleValue();
+//                                }
+//                            }
+                            workTime= workTime-decimal.doubleValue();
                         }
                     }
                     UserFvTime userFvTime=new UserFvTime();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -2197,14 +2197,15 @@ public class TimingTask {
                             double vacationDuration = vacationList.stream().mapToDouble(i -> i.getDouble("VacationDuration")).sum();
                             BigDecimal decimal = new BigDecimal(vacationDuration);
                             decimal=decimal.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
-                            //考勤打卡区间大于8小时 但是存在休假数据
-                            if(between.toHours()>8){
-                                if(decimal.doubleValue()>8){
-                                    workTime= workTime-8;
-                                }else {
-                                    workTime= workTime-decimal.doubleValue();
-                                }
-                            }
+//                            //考勤打卡区间大于8小时 但是存在休假数据
+//                            if(between.toHours()>8){
+//                                if(decimal.doubleValue()>8){
+//                                    workTime= workTime-8;
+//                                }else {
+//                                    workTime= workTime-decimal.doubleValue();
+//                                }
+//                            }
+                            workTime= workTime-decimal.doubleValue();
                         }
                     }
                     UserFvTime userFvTime=new UserFvTime();