1

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

@@ -428,10 +428,9 @@ public class UserWithBeisenController {
                     leaveSheet.setStatus(jsonObject.getString("ApproveStatus").equals("通过")?0:jsonObject.getString("Reason").equals("审批中")?1:2);
                     leaveSheet.setProcinstId(jsonObject.getString("VacationId"));
                     LeaveSheet one = leaveSheetService.getOne(new LambdaQueryWrapper<LeaveSheet>().eq(LeaveSheet::getProcinstId,leaveSheet.getProcinstId()).eq(LeaveSheet::getOwnerId, first.get().getId()).eq(LeaveSheet::getStartDate, leaveSheet.getStartDate()).eq(LeaveSheet::getEndDate, endDate));
-                    if(one!=null){
-                        leaveSheet.setId(one.getId());
+                    if(one==null){
+                        leaveSheetList.add(leaveSheet);
                     }
-                    leaveSheetList.add(leaveSheet);
                 }
             }
         }

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

@@ -2189,15 +2189,15 @@ public class TimingTask {
                                     //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                                     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.minusHours(1);
+//                                        }
+//                                        //如果结束时间大于18:00
+//                                        if(max.get().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));
@@ -2210,17 +2210,17 @@ public class TimingTask {
                                     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.minusHours(1);
+//                                    }
+//                                    //如果结束时间大于18:00
+//                                    if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                        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));
@@ -2235,15 +2235,15 @@ public class TimingTask {
                                     //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                                     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.minusHours(1);
+//                                        }
+//                                        //如果结束时间大于18:00
+//                                        if(max.get().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));
@@ -2256,18 +2256,18 @@ public class TimingTask {
                                     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.minusHours(1);
+//                                    }
+//                                    //如果结束时间大于18:00
+//                                    if(stop.toLocalTime().isAfter(LocalTime.parse("18:00:00",df4))){
+//                                        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));
@@ -2376,10 +2376,9 @@ public class TimingTask {
                     leaveSheet.setStatus(jsonObject.getString("ApproveStatus").equals("通过")?0:jsonObject.getString("Reason").equals("审批中")?1:2);
                     leaveSheet.setProcinstId(jsonObject.getString("VacationId"));
                     LeaveSheet one = leaveSheetService.getOne(new LambdaQueryWrapper<LeaveSheet>().eq(LeaveSheet::getOwnerId, first.get().getId()).eq(LeaveSheet::getStartDate, leaveSheet.getStartDate()).eq(LeaveSheet::getProcinstId,leaveSheet.getProcinstId()).eq(LeaveSheet::getEndDate, endDate));
-                    if(one!=null){
-                        leaveSheet.setId(one.getId());
+                    if(one==null){
+                        leaveSheetList.add(leaveSheet);
                     }
-                    leaveSheetList.add(leaveSheet);
                 }
             }
         }