Jelajahi Sumber

泓浒,出差不校验异常工时

QuYueTing 1 hari lalu
induk
melakukan
4d8b64b5bc

+ 4 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -11857,6 +11857,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         } else if (timeType.getSyncFanwei() == 1) {
             for (UserFvTime fvTime : userFvTimeList) {
                 boolean isMatch = true;
+                //出差自动生成的考勤记录,不需要匹配
+                if (fvTime.getProcinstId() != null && fvTime.getProcinstId().startsWith("bustrip_")) {
+                    continue;
+                }
                 double reportTime = 0;
                 Optional<User> first = manageUserList.stream().filter(u -> u.getId().equals(fvTime.getUserId())).findFirst();
                 if (first.isPresent()) {
@@ -11880,9 +11884,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         map.put("createDate", dateTimeFormatter.format(fvTime.getWorkDate()));
                         map.put("workHours", fvTime.getWorkHours());
                         map.put("reportTime", reportTime);
-                        if (fvTime.getProcinstId() != null && fvTime.getProcinstId().startsWith("bustrip")) {
-                            map.put("isBusTrip", true);
-                        }
                         resultList.add(map);
                     }
                 }