Merge branch 'preview' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers into release

This commit is contained in:
dongruihua
2022-11-01 10:30:53 +08:00

View File

@@ -392,24 +392,25 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
List<Object[]> clist= studyCourseDao.findListFields(courseHql,studyCourseQuery.getIds()); List<Object[]> clist= studyCourseDao.findListFields(courseHql,studyCourseQuery.getIds());
List<Object[]> slist= studyCourseDao.findListFields(studyHql,studyCourseQuery.getAids(),studyCourseQuery.getIds()); List<Object[]> slist= studyCourseDao.findListFields(studyHql,studyCourseQuery.getAids(),studyCourseQuery.getIds());
//数据数量一般不会太多不超过20条所以直接使用嵌套循环 //数据数量一般不会太多不超过20条所以直接使用嵌套循环
for(Object[] cobjs : clist) { for(Object[] sobjs : slist) {
StudyCourse sc=new StudyCourse(); StudyCourse sc=new StudyCourse();
sc.setCourseId(ConvertUtil.toStr(cobjs[0])); sc.setCourseId(ConvertUtil.toStr(sobjs[0]));
sc.setCourseImage(ConvertUtil.toStr(cobjs[1])); sc.setAddTime((LocalDateTime)sobjs[1]);
sc.setLastScore(ConvertUtil.toFloat(cobjs[2]));//课程分数,使用此值来承载 sc.setProgress(ConvertUtil.toFloat(sobjs[2]));
for(Object[] sobjs : slist) { sc.setAid(ConvertUtil.toStr(sobjs[3]));
String cid=ConvertUtil.toStr(sobjs[0]);
for(Object[] cobjs : clist) {
String cid=ConvertUtil.toStr(cobjs[0]);
if(cid!=null && cid.equals(sc.getCourseId())) { if(cid!=null && cid.equals(sc.getCourseId())) {
sc.setAddTime((LocalDateTime)sobjs[1]); sc.setCourseImage(ConvertUtil.toStr(cobjs[1]));
sc.setProgress(ConvertUtil.toFloat(sobjs[2])); sc.setLastScore(ConvertUtil.toFloat(cobjs[2]));//课程分数,使用此值来承载
sc.setAid(ConvertUtil.toStr(sobjs[3])); break;
} }
} }
if(sc.getProgress()==null) { if(sc.getProgress()==null) {
sc.setProgress(0f); sc.setProgress(0f);
} }
rs.add(sc); rs.add(sc);
} }
}catch(Exception e) { }catch(Exception e) {
log.error("查询错误",e); log.error("查询错误",e);