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

This commit is contained in:
dongruihua
2022-10-31 22:25:18 +08:00

View File

@@ -396,7 +396,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
//List<StudyCourse> list = studyCourseDao.findList(builder.builder());
StringBuilder str=new StringBuilder();
if(!studyCourseQuery.getIds().isEmpty()){
for (String id:studyCourseQuery.getIds()){
for (String id:studyCourseQuery.getAids()){
str.append("'");
str.append(id);
str.append("'");
@@ -427,7 +427,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
String sql="select sc.id,sc.course_id,sc.course_type,sc.course_name,sc.aid,sc.aname,sc.source,sc.add_time,sc.start_time,sc.finish_time,sc.progress," +
"sc.total_duration,sc.last_score,sc.status,sc.status_time,sc.last_time," +
"c.score,c.cover_img from boe_course as c left join boe_study_course as sc on sc.course_id=c.id where " +
"sc.aid in("+str1+") and sc.course_id in ("+str+") order by sc.last_time";
"sc.aid in("+str+") and sc.course_id in ("+str1+") order by sc.last_time";
List<StudyCourse> rs=new ArrayList<StudyCourse>();
Set<String> checkSet=new HashSet<String>();
@@ -461,7 +461,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{
studyCourse.setProgress((Float) objs[10]);
studyCourse.setTotalDuration((Integer) objs[11]);
studyCourse.setLastScore((Float) objs[12]);
// studyCourse.setLastScore((Float) objs[12]);
studyCourse.setStatus((Integer) objs[13]);
if(objs[14]!=null){
Timestamp timestamp3 = (Timestamp) objs[14];