parent
24112cc459
commit
53d363bf39
|
|
@ -130,14 +130,14 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
|
||||||
pageSize = 5;
|
pageSize = 5;
|
||||||
}
|
}
|
||||||
//获取当前分数
|
//获取当前分数
|
||||||
YxUserScore activeCurrentUserScore = null;
|
YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();;
|
||||||
if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) {
|
// if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) {
|
||||||
//是根据成绩单来的
|
// //是根据成绩单来的
|
||||||
activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId());
|
// activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId());
|
||||||
} else {
|
// } else {
|
||||||
//直接获取当前使用中的成绩单
|
// //直接获取当前使用中的成绩单
|
||||||
activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
|
// activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
|
||||||
}
|
// }
|
||||||
queryRecommendMajorVO.setScoreId(activeCurrentUserScore.getId());
|
queryRecommendMajorVO.setScoreId(activeCurrentUserScore.getId());
|
||||||
//文理分科
|
//文理分科
|
||||||
queryRecommendMajorVO.setCognitioPolyclinic(activeCurrentUserScore.getCognitioPolyclinic());
|
queryRecommendMajorVO.setCognitioPolyclinic(activeCurrentUserScore.getCognitioPolyclinic());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue