考勤汇总查询bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java

@@ -34,9 +34,9 @@ public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<Atte
         if(params==null){
             throw new AppException("查询条件对象不能为空");
         }
-        if(params.getStaffId()==null){
-            throw new AppException("人员信息id不能为空");
-        }
+//        if(params.getStaffId()==null){
+//            throw new AppException("人员信息id不能为空");
+//        }
         if(StringUtils.isEmpty(params.getSummaryTimeStart())||StringUtils.isEmpty(params.getSummaryTimeEnd())){
             throw new AppException("查询日期范围不能为空");
         }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -685,24 +685,24 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             }
             Map<Long, List<AttendanceStaffStatEntity>> staffGroupCollect = attendanceStaffStatService.getListExt(params).parallelStream().collect(Collectors.groupingBy(AttendanceStaffStatEntity::getStaffId));
 
-            Iterator<AttendanceStatEntity> iterator = result.getList().iterator();
-            while (iterator.hasNext()) {
-                AttendanceStatEntity item = iterator.next();
+//            Iterator<AttendanceStatEntity> iterator = result.getList().iterator();
+//            while (iterator.hasNext()) {
+//                AttendanceStatEntity item = iterator.next();
+//                List<AttendanceStaffStatEntity> statEntities = staffGroupCollect.get(item.getStaffId());
+//                if (CollectionUtils.isNotEmpty(statEntities)) {
+//                    item.setAttendanceStaffStatEntities(statEntities);
+//                }else {
+//                    iterator.remove();
+//                }
+//            }
+
+            for (AttendanceStatEntity item : result.getList()) {
+                params.setStaffId(item.getStaffId());
                 List<AttendanceStaffStatEntity> statEntities = staffGroupCollect.get(item.getStaffId());
                 if (CollectionUtils.isNotEmpty(statEntities)) {
                     item.setAttendanceStaffStatEntities(statEntities);
-                }else {
-                    iterator.remove();
                 }
             }
-
-/*            for (AttendanceStatEntity item : result.getList()) {
-                params.setStaffId(item.getStaffId());
-                List<AttendanceStaffStatEntity> statEntities = attendanceStaffStatService.getListExt(params);
-                if (CollectionUtils.isNotEmpty(statEntities)) {
-                    item.setAttendanceStaffStatEntities(statEntities);
-                }
-            }*/
         }
         return result;
     }