|
@@ -141,27 +141,20 @@ public class StudentStatisticsController {
|
|
|
record.setLeaveCount(leaveCount);
|
|
|
int actualCount = 0;
|
|
|
Set<Long> userIds = new HashSet<>();
|
|
|
+ Integer lateCount = 0, playTruantCount = 0;
|
|
|
for (StudentOutInRecordVo outInRecordVo : notStayMap.get(record.getId())) {
|
|
|
if(userIds.contains(outInRecordVo.getUserId())){
|
|
|
continue;
|
|
|
}
|
|
|
- actualCount ++;
|
|
|
- userIds.add(outInRecordVo.getUserId());
|
|
|
- }
|
|
|
- record.setActualCount(actualCount);
|
|
|
-
|
|
|
- Integer lateCount = 0, playTruantCount = 0;
|
|
|
- for (StudentOutInRecordVo outInRecord : notStayMap.get(record.getId())) {
|
|
|
- if(userIds.contains(outInRecord.getUserId())){
|
|
|
- continue;
|
|
|
- }
|
|
|
- if("迟到".equals(outInRecord.getAttendanceStatus())){
|
|
|
+ if("迟到".equals(outInRecordVo.getAttendanceStatus())){
|
|
|
lateCount ++;
|
|
|
- }else if("旷课".equals(outInRecord.getAttendanceStatus())){
|
|
|
+ }else if("旷课".equals(outInRecordVo.getAttendanceStatus())){
|
|
|
playTruantCount ++;
|
|
|
}
|
|
|
- userIds.add(outInRecord.getUserId());
|
|
|
+ actualCount ++;
|
|
|
+ userIds.add(outInRecordVo.getUserId());
|
|
|
}
|
|
|
+ record.setActualCount(actualCount);
|
|
|
record.setPlayTruantCount(playTruantCount);
|
|
|
record.setLateCount(lateCount);
|
|
|
|