修改北森考勤同步

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

@@ -238,7 +238,7 @@ 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());
+                                        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);
@@ -269,7 +269,7 @@ public class UserWithBeisenController {
                                     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,7 +284,7 @@ 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());
+                                        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);
@@ -316,7 +316,7 @@ public class UserWithBeisenController {
                                     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,11 +521,11 @@ 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);
+                                Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
                                 //如果结束时间大于13:00
-                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
-                                    timeDurantion.minusHours(1);
-                                }
+//                                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);
@@ -552,7 +552,7 @@ public class UserWithBeisenController {
                             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,11 +567,11 @@ 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);
+                                Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max);
                                 //如果结束时间大于13:00
-                                if(max.isAfter(LocalTime.parse("13:00:00",df4))){
-                                    timeDurantion.minusHours(1);
-                                }
+//                                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);
@@ -599,7 +599,7 @@ public class UserWithBeisenController {
                             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));