补充提交

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

@@ -239,14 +239,14 @@ public class UserWithBeisenController {
                                     if(max.get().isAfter(LocalTime.parse("19:00:00",df4))){
                                         //判断打卡时间是不是大于19:00 大于才算加班 通过打卡计算加班时长 与加班单作比较 取小
                                         Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
-                                        //如果结束时间大于13:00
-                                        if(max.get().isAfter(LocalTime.parse("13:00:00",df4))){
-                                            timeDurantion.minusHours(1);
-                                        }
-                                        //如果结束时间大于18:00
-                                        if(max.get().isAfter(LocalTime.parse("18:00:00",df4))){
-                                            timeDurantion.minusMinutes(30);
-                                        }
+//                                        //如果结束时间大于13:00
+//                                        if(max.get().isAfter(LocalTime.parse("13:00:00",df4))){
+//                                            timeDurantion=timeDurantion.minusHours(1);
+//                                        }
+//                                        //如果结束时间大于18:00
+//                                        if(max.get().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                            timeDurantion=timeDurantion.minusMinutes(30);
+//                                        }
                                         long l = timeDurantion.toMinutes() / 60;
                                         if(l<o.getDouble("OverTimeDuration")){
                                             overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l));
@@ -259,13 +259,13 @@ public class UserWithBeisenController {
                                     LocalDateTime start = LocalDateTime.parse(o.getString("StartDate"), df1);
                                     LocalDateTime stop = start.toLocalDate().atTime(LocalTime.MAX);
                                     Duration duration = Duration.between(start, stop);
-                                    if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
-                                        duration.minusHours(1);
-                                    }
-                                    //如果结束时间大于18:00
-                                    if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
-                                        duration.minusMinutes(30);
-                                    }
+//                                    if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
+//                                        duration=duration.minusHours(1);
+//                                    }
+//                                    //如果结束时间大于18:00
+//                                    if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                        duration=duration.minusMinutes(30);
+//                                    }
                                     long l = duration.toMinutes() / 60;
                                     if(max.get().isAfter(LocalTime.parse("19:00:00",df4))){
                                         //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
@@ -285,14 +285,14 @@ public class UserWithBeisenController {
                                     if(max.get().isAfter(LocalTime.parse("19:00:00",df4))){
                                         //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
                                         Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
-                                        //如果结束时间大于13:00
-                                        if(max.get().isAfter(LocalTime.parse("13:00:00",df4))){
-                                            timeDurantion.minusHours(1);
-                                        }
-                                        //如果结束时间大于18:00
-                                        if(max.get().isAfter(LocalTime.parse("18:00:00",df4))){
-                                            timeDurantion.minusMinutes(30);
-                                        }
+//                                        //如果结束时间大于13:00
+//                                        if(max.get().isAfter(LocalTime.parse("13:00:00",df4))){
+//                                            timeDurantion=timeDurantion.minusHours(1);
+//                                        }
+//                                        //如果结束时间大于18:00
+//                                        if(max.get().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                            timeDurantion=timeDurantion.minusMinutes(30);
+//                                        }
                                         long l = timeDurantion.toMinutes() / 60;
                                         if(l<o.getDouble("OverTimeDuration")){
                                             overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l));
@@ -305,14 +305,14 @@ public class UserWithBeisenController {
                                     LocalDateTime stop = LocalDateTime.parse(o.getString("StopDate"), df1);
                                     LocalDateTime start = stop.toLocalDate().atTime(LocalTime.MIN);
                                     Duration duration = Duration.between(start, stop);
-                                    //如果结束时间大于13:00
-                                    if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
-                                        duration.minusHours(1);
-                                    }
-                                    //如果结束时间大于18:00
-                                    if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
-                                        duration.minusMinutes(30);
-                                    }
+//                                    //如果结束时间大于13:00
+//                                    if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
+//                                        duration=duration.minusHours(1);
+//                                    }
+//                                    //如果结束时间大于18:00
+//                                    if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                        duration=duration.minusMinutes(30);
+//                                    }
                                     long l = duration.toMinutes() / 60;
                                     if(max.get().isAfter(LocalTime.parse("19:00:00",df4))){
                                         //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
@@ -522,14 +522,14 @@ public class UserWithBeisenController {
                             if(max.isAfter(LocalTime.parse("19:00:00",df4))){
                                 //判断打卡时间是不是大于19:00 大于才算加班 通过打卡计算加班时长 与加班单作比较 取小
                                 Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
-                                //如果结束时间大于13:00
+//                                //如果结束时间大于13:00
 //                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
-//                                    timeDurantion.minusHours(1);
+//                                    timeDurantion=timeDurantion.minusHours(1);
+//                                }
+//                                //如果结束时间大于18:00
+//                                if(max.isAfter(LocalTime.parse("18:00:00",df4))){
+//                                    timeDurantion=timeDurantion.minusMinutes(30);
 //                                }
-                                //如果结束时间大于18:00
-                                if(max.isAfter(LocalTime.parse("18:00:00",df4))){
-                                    timeDurantion.minusMinutes(30);
-                                }
                                 long l = timeDurantion.toMinutes() / 60;
                                 if(l<o.getDouble("OverTimeDuration")){
                                     overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l));
@@ -542,13 +542,13 @@ public class UserWithBeisenController {
                             LocalDateTime start = LocalDateTime.parse(o.getString("StartDate"), df1);
                             LocalDateTime stop = start.toLocalDate().atTime(LocalTime.MAX);
                             Duration duration = Duration.between(start, stop);
-                            if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
-                                duration.minusHours(1);
-                            }
-                            //如果结束时间大于18:00
-                            if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
-                                duration.minusMinutes(30);
-                            }
+//                            if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
+//                                duration=duration.minusHours(1);
+//                            }
+//                            //如果结束时间大于18:00
+//                            if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                duration=duration.minusMinutes(30);
+//                            }
                             long l = duration.toMinutes() / 60;
                             if(max.isAfter(LocalTime.parse("19:00:00",df4))){
                                 //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
@@ -568,14 +568,14 @@ public class UserWithBeisenController {
                             if(max.isAfter(LocalTime.parse("19:00:00",df4))){
                                 //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
                                 Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
-                                //如果结束时间大于13:00
+//                                //如果结束时间大于13:00
 //                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
-//                                    timeDurantion.minusHours(1);
+//                                    timeDurantion=timeDurantion.minusHours(1);
+//                                }
+//                                //如果结束时间大于18:00
+//                                if(max.isAfter(LocalTime.parse("18:00:00",df4))){
+//                                    timeDurantion=timeDurantion.minusMinutes(30);
 //                                }
-                                //如果结束时间大于18:00
-                                if(max.isAfter(LocalTime.parse("18:00:00",df4))){
-                                    timeDurantion.minusMinutes(30);
-                                }
                                 long l = timeDurantion.toMinutes() / 60;
                                 if(l<o.getDouble("OverTimeDuration")){
                                     overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l));
@@ -588,14 +588,14 @@ public class UserWithBeisenController {
                             LocalDateTime stop = LocalDateTime.parse(o.getString("StopDate"), df1);
                             LocalDateTime start = stop.toLocalDate().atTime(LocalTime.MIN);
                             Duration duration = Duration.between(start, stop);
-                            //如果结束时间大于13:00
-                            if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
-                                duration.minusHours(1);
-                            }
-                            //如果结束时间大于18:00
-                            if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
-                                duration.minusMinutes(30);
-                            }
+//                            //如果结束时间大于13:00
+//                            if(stop.toLocalTime().isAfter(LocalTime.parse("13:00:00",df4))){
+//                                duration=duration.minusHours(1);
+//                            }
+//                            //如果结束时间大于18:00
+//                            if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                duration=duration.minusMinutes(30);
+//                            }
                             long l = duration.toMinutes() / 60;
                             if(max.isAfter(LocalTime.parse("19:00:00",df4))){
                                 //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小