|
@@ -138,11 +138,11 @@ public class StudentManageServiceImpl implements StudentManageService {
|
|
|
Map<Integer, StudentListCourseDto> StudentListCourseDtoMap = studentListCourseDtoList.stream().collect(Collectors.toMap(StudentListCourseDto::getUserId, studentListCourseDto -> studentListCourseDto));
|
|
|
|
|
|
//用户协议
|
|
|
-// List<SysUserContracts> userAllContract = sysUserContractsDao.getUserAllContract(new ArrayList<>(userIds));
|
|
|
-// Map<Integer, Set<Integer>> userContractVersionMap = new HashMap<>();
|
|
|
-// if(!CollectionUtils.isEmpty(userAllContract)){
|
|
|
-// userContractVersionMap = userAllContract.stream().collect(Collectors.groupingBy(SysUserContracts::getUserId, Collectors.mapping(SysUserContracts::getVersion, Collectors.toSet())));
|
|
|
-// }
|
|
|
+ List<SysUserContracts> userAllContract = sysUserContractsDao.getUserAllContract(new ArrayList<>(userIds));
|
|
|
+ Map<Integer, Set<Integer>> userContractVersionMap = new HashMap<>();
|
|
|
+ if(!CollectionUtils.isEmpty(userAllContract)){
|
|
|
+ userContractVersionMap = userAllContract.stream().collect(Collectors.groupingBy(SysUserContracts::getUserId, Collectors.mapping(SysUserContracts::getVersion, Collectors.toSet())));
|
|
|
+ }
|
|
|
|
|
|
StudentListCourseDto studentListCourseDto = null;
|
|
|
for (StudentManageListDto dto : dataList) {
|
|
@@ -163,9 +163,12 @@ public class StudentManageServiceImpl implements StudentManageService {
|
|
|
dto.setHasPracticeCourse(YesOrNoEnum.NO);
|
|
|
}
|
|
|
|
|
|
-// if(userContractVersionMap.containsKey(dto.getUserId())){
|
|
|
+ if(userContractVersionMap.containsKey(dto.getUserId())){
|
|
|
// dto.setContractVersions(StringUtils.join(userContractVersionMap.get(dto.getUserId()), ","));
|
|
|
-// }
|
|
|
+ dto.setIsSignedContract(true);
|
|
|
+ }else{
|
|
|
+ dto.setIsSignedContract(false);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (queryInfo.getIsExport()) {
|