异常工时修改

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

@@ -1769,14 +1769,14 @@ public class ReportController {
                             msg.setError("人员未设置薪资类型,请联系管理人员");
                             return msg;
                         }
-                        if(invoke.equals("有加班费")){
+                        if(invoke==null||invoke.equals("有加班费")){
                             if(!(Double.valueOf(String.valueOf(workingTime)).equals(Double.valueOf(first.get().getWorkHours())))){
                                 if(warningMsg.length()>0){
                                     warningMsg.append(",");
                                 }
                                 warningMsg.append(df.format(date)+"日填报工时("+workingTime+"h)不等于考勤总时长("+first.get().getWorkHours()+"h)");
                             }
-                        }else if(invoke.equals("无加班费")){
+                        }else{
                             if((Double.valueOf(String.valueOf(workingTime))<first.get().getWorkHours())){
                                 if(warningMsg.length()>0){
                                     warningMsg.append(",");

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

@@ -3987,11 +3987,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             Class<User> aClass = User.class;
                             Method method = aClass.getMethod(getter);
                             String invoke = (String) method.invoke(targetUser);
-                            if(invoke.equals("有加班费")){
+                            if(invoke==null||invoke.equals("有加班费")){
                                 if(!(Double.valueOf(String.valueOf(map.get("workingTime"))).equals(Double.valueOf(first.get().getWorkHours())))){
                                     map.put("exceedCardTime",1);
                                 }
-                            }else if(invoke.equals("无加班费")){
+                            }else{
                                 if((Double.valueOf(String.valueOf(map.get("workingTime")))<first.get().getWorkHours())){
                                     map.put("exceedCardTime",1);
                                 }
@@ -4316,11 +4316,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             Class<User> aClass = User.class;
                             Method method = aClass.getMethod(getter);
                             String invoke = (String) method.invoke(targetUser);
-                            if(invoke.equals("有加班费")){
+                            if(invoke==null||invoke.equals("有加班费")){
                                 if(!(Double.valueOf(String.valueOf(data.get("workingTime"))).equals(Double.valueOf(first.get().getWorkHours())))){
                                     map.put("exceedCardTime",1);
                                 }
-                            }else if(invoke.equals("无加班费")){
+                            }else{
                                 if((Double.valueOf(String.valueOf(data.get("workingTime")))<first.get().getWorkHours())){
                                     map.put("exceedCardTime",1);
                                 }
@@ -8978,19 +8978,19 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     ww.put("workingTime",0);
                     worktimeList.add(ww);
                 }
-                if(worktimeList.size()>0){
-                    worktimeList.forEach(w->{
-                        Optional<UserFvTime> first = userFvTimeList.stream().filter(u -> u.getWorkDate().isEqual(date) && u.getUserId().equals(m.userId)).findFirst();
-                        if(first.isPresent()){
-                            w.put("cardTime",first.get().getWorkHours());
-                        }
-                        w.put("name",m.name);
-                        w.put("corpwxDeptId",m.corpwxDeptId);
-                        w.put("corpwxUserId",m.corpwxUserId);
-                        w.put("departmentName",m.departmentName);
-                        w.put("userId",m.userId);
-                    });
-                }
+            }
+            if(worktimeList.size()>0){
+                worktimeList.forEach(w->{
+                    Optional<UserFvTime> first = userFvTimeList.stream().filter(u -> u.getWorkDate().isEqual(LocalDate.parse(String.valueOf(w.get("createDate")),df)) && u.getUserId().equals(m.userId)).findFirst();
+                    if(first.isPresent()){
+                        w.put("cardTime",first.get().getWorkHours());
+                    }
+                    w.put("name",m.name);
+                    w.put("corpwxDeptId",m.corpwxDeptId);
+                    w.put("corpwxUserId",m.corpwxUserId);
+                    w.put("departmentName",m.departmentName);
+                    w.put("userId",m.userId);
+                });
             }
             result.addAll(worktimeList);
         });