1
This commit is contained in:
parent
296eb4f3cb
commit
0221b1073a
@ -99,9 +99,9 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService
|
|||||||
IPage<DriveSchoolPay> driveSchoolPayIPage = driveSchoolPayMapper.stuList(driveSchoolPay, page);
|
IPage<DriveSchoolPay> driveSchoolPayIPage = driveSchoolPayMapper.stuList(driveSchoolPay, page);
|
||||||
List<DriveSchoolPay> driveSchoolPays = driveSchoolPayIPage.getRecords();
|
List<DriveSchoolPay> driveSchoolPays = driveSchoolPayIPage.getRecords();
|
||||||
|
|
||||||
ArrayList<DriveSchoolPay> collect = driveSchoolPays.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(DriveSchoolPay::getIdentity))), ArrayList::new));
|
// ArrayList<DriveSchoolPay> collect = driveSchoolPays.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(DriveSchoolPay::getIdentity))), ArrayList::new));
|
||||||
|
|
||||||
for (DriveSchoolPay schoolPay : collect) {
|
for (DriveSchoolPay schoolPay : driveSchoolPays) {
|
||||||
Long userId = schoolPay.getUserId();
|
Long userId = schoolPay.getUserId();
|
||||||
AdminUserRespDTO sysUser = userApi.getUser(userId);
|
AdminUserRespDTO sysUser = userApi.getUser(userId);
|
||||||
//SysUser sysUser = sysUserMapper.selectUserById(userId);
|
//SysUser sysUser = sysUserMapper.selectUserById(userId);
|
||||||
@ -110,8 +110,8 @@ public class DriveSchoolPayServiceImpl implements DriveSchoolPayService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//根据时间倒序排序
|
//根据时间倒序排序
|
||||||
collect.sort(Comparator.comparing(DriveSchoolPay::getCreateTime).reversed());
|
driveSchoolPays.sort(Comparator.comparing(DriveSchoolPay::getCreateTime).reversed());
|
||||||
driveSchoolPayIPage.setRecords(collect);
|
driveSchoolPayIPage.setRecords(driveSchoolPays);
|
||||||
return driveSchoolPayIPage;
|
return driveSchoolPayIPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user