Merge remote-tracking branch 'origin/reg' into reg

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

@@ -683,6 +683,9 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
             pageInfo = new PageInfo(-1);
         }
         Result<AttendanceStatEntity> result = dao.getListExt(params, pageInfo);
+        if(!ObjectUtils.isEmpty(params.getSummaryTypeList())){
+            result.getPageInfo().setPrePageResult(500);
+        }
         if (CollectionUtils.isNotEmpty(result.getList())) {
             //todo 循环查询改造
             List<Long> staffIdList = result.getList().parallelStream().map(AttendanceStatEntity::getStaffId).collect(Collectors.toList());
@@ -699,6 +702,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                     item.setAttendanceStaffStatEntities(statEntities);
                 }else {
                     iterator.remove();
+                    pageInfo.setTotalResult(pageInfo.getTotalResult() - 1);
                 }
             }