Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -238,15 +238,15 @@ public class UserWithBeisenController {
                                     //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                                     if(max.get().isAfter(LocalTime.parse("19:00:00",df4))){
                                         //判断打卡时间是不是大于19:00 大于才算加班 通过打卡计算加班时长 与加班单作比较 取小
-                                        Duration timeDurantion = Duration.between(LocalTime.parse("19: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);
-                                        }
+                                        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=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,17 +259,17 @@ 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 通过打卡计算加班时长 与加班单作比较 取小
-                                        Duration timeDurantion = Duration.between(LocalTime.parse("19:00:00", df4), max.get());
+                                        Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
                                         long l1 = timeDurantion.toMinutes() / 60;
                                         if(l1<l){
                                             overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l1));
@@ -284,15 +284,15 @@ public class UserWithBeisenController {
                                     //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                                     if(max.get().isAfter(LocalTime.parse("19:00:00",df4))){
                                         //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
-                                        Duration timeDurantion = Duration.between(LocalTime.parse("19: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);
-                                        }
+                                        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=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,18 +305,18 @@ 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 通过打卡计算加班时长 与加班单作比较 取小
-                                        Duration timeDurantion = Duration.between(LocalTime.parse("19:00:00", df4), max.get());
+                                        Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
                                         long l1 = timeDurantion.toMinutes() / 60;
                                         if(l1<l){
                                             overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l1));
@@ -521,15 +521,15 @@ public class UserWithBeisenController {
                             //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                             if(max.isAfter(LocalTime.parse("19:00:00",df4))){
                                 //判断打卡时间是不是大于19:00 大于才算加班 通过打卡计算加班时长 与加班单作比较 取小
-                                Duration timeDurantion = Duration.between(LocalTime.parse("19:00:00", df4), max);
-                                //如果结束时间大于13:00
-                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
-                                    timeDurantion.minusHours(1);
-                                }
-                                //如果结束时间大于18:00
-                                if(max.isAfter(LocalTime.parse("18:00:00",df4))){
-                                    timeDurantion.minusMinutes(30);
-                                }
+                                Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
+//                                //如果结束时间大于13:00
+//                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
+//                                    timeDurantion=timeDurantion.minusHours(1);
+//                                }
+//                                //如果结束时间大于18:00
+//                                if(max.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));
@@ -542,17 +542,17 @@ 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 通过打卡计算加班时长 与加班单作比较 取小
-                                Duration timeDurantion = Duration.between(LocalTime.parse("19:00:00", df4), max);
+                                Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
                                 long l1 = timeDurantion.toMinutes() / 60;
                                 if(l1<l){
                                     overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l1));
@@ -567,15 +567,15 @@ public class UserWithBeisenController {
                             //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                             if(max.isAfter(LocalTime.parse("19:00:00",df4))){
                                 //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
-                                Duration timeDurantion = Duration.between(LocalTime.parse("19:00:00", df4), max);
-                                //如果结束时间大于13:00
-                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
-                                    timeDurantion.minusHours(1);
-                                }
-                                //如果结束时间大于18:00
-                                if(max.isAfter(LocalTime.parse("18:00:00",df4))){
-                                    timeDurantion.minusMinutes(30);
-                                }
+                                Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
+//                                //如果结束时间大于13:00
+//                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
+//                                    timeDurantion=timeDurantion.minusHours(1);
+//                                }
+//                                //如果结束时间大于18:00
+//                                if(max.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));
@@ -588,18 +588,18 @@ 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 通过打卡计算加班时长 与加班单作比较 取小
-                                Duration timeDurantion = Duration.between(LocalTime.parse("19:00:00", df4), max);
+                                Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
                                 long l1 = timeDurantion.toMinutes() / 60;
                                 if(l1<l){
                                     overTimeBigDecimal=overTimeBigDecimal.add(new BigDecimal(l1));