|
|
|
@ -114,7 +114,7 @@ public class MemberService {
|
|
|
|
|
MemberExample example = new MemberExample();
|
|
|
|
|
MemberExample.Criteria criteria = example.createCriteria();
|
|
|
|
|
criteria.andTrainingIdEqualTo(trainingId);
|
|
|
|
|
example.setOrderByClause("stuRank ASC");
|
|
|
|
|
example.setOrderByClause("stu_rank ASC");
|
|
|
|
|
PageHelper.startPage(index, size);
|
|
|
|
|
return new PageInfo<>(memberMapper.selectByExample(example));
|
|
|
|
|
}
|
|
|
|
@ -134,7 +134,13 @@ public class MemberService {
|
|
|
|
|
criteria.andTrainingNameEqualTo(trainingName);
|
|
|
|
|
}
|
|
|
|
|
if (markStatus != null) {
|
|
|
|
|
//TODO 待确定评分状态
|
|
|
|
|
//未评分
|
|
|
|
|
if (markStatus == 0) {
|
|
|
|
|
criteria.andReportScoreIsNull();
|
|
|
|
|
} else {
|
|
|
|
|
//已评分
|
|
|
|
|
criteria.andReportScoreIsNotNull();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (StringUtils.hasText(keyword)) {
|
|
|
|
|
criteria.andNameLike("%" + keyword + "%");
|
|
|
|
|