漏填增加自己看自己的

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

@@ -4721,6 +4721,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     if (collect1.size() > 0) {
                         allRangeUserList = userMapper.selectList(new QueryWrapper<User>().in("id", collect1).or().eq("id",user.getId()).orderByDesc("department_id"));
                     }
+                } else {
+                    //只看自己的
+                    allRangeUserList.add(user);
                 }
             }
         } else {
@@ -4739,9 +4742,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 needRangeUserList.add(u);
             }
         }
+        System.out.println("needRangeUserList:"+needRangeUserList.size());
         List<UserMonthWork> userMonthWorks = new ArrayList<UserMonthWork>();
         //获取所有同步的企业微信数据
-//        List<Map> userCorpwxTimeMapList = userCorpwxTimeMapper.selectByAsk(companyId,startDate,endDate);
         List<UserCorpwxTime> userCorpwxTimeList = userCorpwxTimeMapper.selectList(new QueryWrapper<UserCorpwxTime>().between("create_date", LocalDate.parse(startDate, df), LocalDate.parse(endDate, df)).eq("company_id", user.getCompanyId()));
         String lastUserId = null;
         UserMonthWork lastUserData = null;
@@ -4776,13 +4779,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             }
             lastUserId = id;
         }
-
-        LocalDateTime c=LocalDateTime.now();
         //计算未填的人员
         List<User> noReportUserList = needRangeUserList.stream()
                 .filter(au->!userMonthWorks.stream().anyMatch(mon->mon.userId.equals(au.getId())))
                 .collect(Collectors.toList());
-
+        System.out.println("noReportUserList:"+noReportUserList.size());
         noReportUserList.forEach(noR-> {
             UserMonthWork mon = new UserMonthWork();
             mon.userId = noR.getId();
@@ -4817,35 +4818,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<Map<String, Object>> worktimeList = userMonthWork.worktimeList;
             //获取到该员工请假的数据
             List<UserCorpwxTime> curUserCorpTime = userCorpwxTimeList.stream().filter(s->s.getCorpwxUserid() != null && s.getCorpwxUserid().equals(userMonthWork.corpwxUserId)).collect(Collectors.toList());
-//            for (Map<String, Object> corpWx : userCorpwxTimeMapList) {
-//                if (((String)corpWx.get("corpwx_userid")).equals(userMonthWork.corpwxUserId)) {
-//                    curUserCorpTime.add(corpWx);
-//                }
-//            }
-
-            //处理企业微信的请假数据
-//            curUserCorpTime.forEach(corpTime->{
-//                java.sql.Date leaveDate = (java.sql.Date)corpTime.get("create_date");
-//                String leaveDateStr = sdf.format(leaveDate);
-//                Optional<Map<String, Object>> find = worktimeList.stream().filter(w->((String)w.get("createDate")).equals(leaveDateStr)).findFirst();
-//                if (find.isPresent()) {
-//                    //打卡的有记录，加上请假
-//                    String newStr = (double)find.get().get("workingTime")+"("+MessageUtils.message("leave.leave")+(corpTime.get("ask_leave_time"))+"h)";
-//                    find.get().put("workingTime", newStr);
-//                } else {
-//                    //没有对应的打卡记录，直接加上当天请假
-//                    Map<String, Object> leaveMap = new HashMap<>();
-//                    leaveMap.put("createDate", leaveDateStr);
-//                    //leaveMap.put("workingTime", "当天请假"+corpTime.get("ask_leave_time")+"h");
-//                    leaveMap.put("workingTime", MessageUtils.message("leave.leaveOfDay")+corpTime.get("ask_leave_time")+"h");
-//                    worktimeList.add(leaveMap);
-//                }
-//            });
             curUserCorpTime.forEach(corpTime->{
                 LocalDate wDate = corpTime.getCreateDate();
                 String curWDateStr = df.format(wDate);
                 double askLeaveTime = corpTime.getAskLeaveTime();
-//                String leaveDateStr = sdf.format(leaveDate);
                 Optional<Map<String, Object>> find = worktimeList.stream().filter(w->((String)w.get("createDate")).equals(curWDateStr)).findFirst();
                 if (find.isPresent()) {
                     //打卡的有记录，如果有请假，加上请假
@@ -6801,6 +6777,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     if (collect1.size() > 0) {
                         allRangeUserList = userMapper.selectList(new QueryWrapper<User>().in("id", collect1).eq("report_status",0));
                     }
+                } else {
+                    //只看自己的
+                    allRangeUserList.add(user);
                 }
             }
         } else {