|
|
@@ -193,6 +193,9 @@ public class ScheduleController {
|
|
|
|
|
|
List<String> uids = items.stream().map(AttendanceServiceListAttendClassRecordsResult.RecordsItem::getUserUid).distinct().collect(Collectors.toList());
|
|
|
for (String uid : uids) {
|
|
|
+ if(uid.equals("ggqvgpwpruzuxtqgzwskpy271m574321")){
|
|
|
+ String sdsd = "";
|
|
|
+ }
|
|
|
Optional<SmartUser> student = students.stream().filter(e -> e.getXwStudentUid().equals(uid)).findFirst();
|
|
|
if (student != null && student.isPresent()) {
|
|
|
List<SmartAttendance> oldAttends = attendanceList.stream().filter(e -> e.getUserId().equals(student.get().getId())
|
|
|
@@ -201,6 +204,7 @@ public class ScheduleController {
|
|
|
if (newAttends != null && newAttends.size() > 0) {
|
|
|
int i = 0;
|
|
|
for (AttendanceServiceListAttendClassRecordsResult.RecordsItem newAttend : newAttends) {
|
|
|
+
|
|
|
if (oldAttends.size() > i) {
|
|
|
SmartAttendance oldData = new SmartAttendance();
|
|
|
oldData = oldAttends.get(i);
|