|
|
@@ -394,7 +394,7 @@ public class AttendanceIndexStatsController extends BaseController {
|
|
394
|
394
|
// 统计该部门下维护了人员的班组数量
|
|
395
|
395
|
AttendanceTeamUserRecord queryRecord = new AttendanceTeamUserRecord();
|
|
396
|
396
|
queryRecord.setCheckInType("1");
|
|
397
|
|
- List<AttendanceTeamUserRecord> teamUserRecords = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryRecord, true);
|
|
|
397
|
+ List<AttendanceTeamUserRecord> teamUserRecords = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryRecord, false);
|
|
398
|
398
|
List<Long> distinctTeamIds = teamUserRecords.stream().filter(team -> teamList.contains(team.getAttendanceTeamId())).map(AttendanceTeamUserRecord::getAttendanceTeamId).distinct().collect(Collectors.toList());
|
|
399
|
399
|
|
|
400
|
400
|
|
|
|
@@ -432,7 +432,7 @@ public class AttendanceIndexStatsController extends BaseController {
|
|
432
|
432
|
// 统计该部门下被维护到班组的人员数量
|
|
433
|
433
|
AttendanceTeamUserRecord queryRecord = new AttendanceTeamUserRecord();
|
|
434
|
434
|
queryRecord.setCheckInType("1");
|
|
435
|
|
- List<AttendanceTeamUserRecord> teamUserRecords = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryRecord, true);
|
|
|
435
|
+ List<AttendanceTeamUserRecord> teamUserRecords = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(queryRecord, false);
|
|
436
|
436
|
List<Long> teamUserIds = teamUserRecords.stream().filter(team -> personnelList.contains(team.getUserId())).map(team -> team.getUserId()).collect(Collectors.toList());
|
|
437
|
437
|
|
|
438
|
438
|
// 返回两个统计中较大的值(被带上通道的人员数量或被班组长维护的人员数量)
|