|
@@ -285,11 +285,11 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
|
List<Integer> studentIds = records.stream().map(e -> e.getId()).collect(Collectors.toList());
|
|
|
Map<Integer,String> subjectMap = MapUtil.convertIntegerMap(studentDao.getStudentSubjectMapList(studentIds));
|
|
|
Map<Integer,String> groupNameMap = MapUtil.convertMybatisMap(musicGroupDao.queryNormalGroupName(studentIds));
|
|
|
- Integer signStandard = Integer.parseInt(param.get("signStandard").toString());
|
|
|
+ Integer standardDays = Integer.parseInt(param.get("standardDays").toString());
|
|
|
for (TempCampUserTrainingDetailVo record : records) {
|
|
|
record.setSubjectName(subjectMap.get(record.getId()));
|
|
|
record.setMusicGroupName(groupNameMap.get(record.getId()));
|
|
|
- record.setStandardFlag(record.getPlayDay() >= signStandard);
|
|
|
+ record.setStandardFlag(record.getPlayDay() >= standardDays);
|
|
|
}
|
|
|
}
|
|
|
return PageUtil.pageInfo(vos);
|
|
@@ -335,7 +335,7 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
|
|
|
Integer organId = user.getOrganId();
|
|
|
musicGroupDao.queryUserMusicGroups(user.getId());
|
|
|
List<String> musicGroupIds = studentRegistrationDao.queryStudentMusicGroup(user.getId());
|
|
|
- List<TempLittleArtistTrainingCamp> campList = this.baseMapper.findTrainingByStudent(organId,musicGroupIds);
|
|
|
+ List<TempLittleArtistTrainingCamp> campList = this.baseMapper.findTrainingByStudent(organId,StringUtils.join(musicGroupIds,","));
|
|
|
//查询该学员是否购买过该训练营
|
|
|
TempLittleArtistTrainingCampUserRelation userRelation = tempLittleArtistTrainingCampUserRelationService.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
|
|
|
.eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
|