From 2f150449fe666f0a07013e2ec57c74b63c3f610e Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 24 Jul 2024 10:50:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index bf521d31..dd133c43 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -209,8 +209,30 @@ public class StudyServiceImpl implements IStudyService{ return pageList; } } - - return scItemDao.findPage(query.builder()); + String sql2 = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.progress,item.status from boe_study_course bsc left join " + + "boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + + "where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' " + + "UNION ALL " + + " select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,0 as progress,1 as status from boe_study_course bsc " + + " LEFT JOIN boe_study_course_item item on item.course_id = bsc.course_id " + + " where bsc.course_id = '"+courseId+"' and bsc.id != (" + + " select bsc.id from boe_study_course bsc " + + " left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" + + " )"; + List list = scDao.sqlFindList(sql2); + List item = new ArrayList<>(); + for (Object[] objs : list) { + StudyCourseItem sc = new StudyCourseItem(); + sc.setCourseId(objs[1].toString()); + sc.setContentId(objs[4].toString()); + sc.setProgress((Integer) objs[5]); + sc.setStatus((Integer) objs[6]); + sc.setAname(objs[3].toString()); + item.add(sc); + } + PageList pageList = new PageList<>(item); + return pageList; } From 2b3f59522c5d58a131d84b6f575f786850f16e26 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 24 Jul 2024 11:09:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index dd133c43..09700f84 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -1,5 +1,6 @@ package com.xboe.school.study.service.impl; +import java.math.BigInteger; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; @@ -224,8 +225,6 @@ public class StudyServiceImpl implements IStudyService{ List item = new ArrayList<>(); for (Object[] objs : list) { StudyCourseItem sc = new StudyCourseItem(); - sc.setCourseId(objs[1].toString()); - sc.setContentId(objs[4].toString()); sc.setProgress((Integer) objs[5]); sc.setStatus((Integer) objs[6]); sc.setAname(objs[3].toString()); From d81d4c474e10cd48a6acf078bb25e09d3db8f48a Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 24 Jul 2024 11:28:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index 09700f84..d44c4437 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -225,8 +225,8 @@ public class StudyServiceImpl implements IStudyService{ List item = new ArrayList<>(); for (Object[] objs : list) { StudyCourseItem sc = new StudyCourseItem(); - sc.setProgress((Integer) objs[5]); - sc.setStatus((Integer) objs[6]); + sc.setProgress(Integer.valueOf(objs[4].toString())); + sc.setStatus(Integer.valueOf(objs[5].toString())); sc.setAname(objs[3].toString()); item.add(sc); } From 9373a9563174d93c1b686181b7ae4e766e2a585d Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 24 Jul 2024 11:32:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index d44c4437..566bcc20 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -184,8 +184,10 @@ public class StudyServiceImpl implements IStudyService{ if(status!=null) { if(status==3) { query.addFilter(FieldFilters.eq("status", 2)); + return scItemDao.findPage(query.builder()); }else if(status==2){ query.addFilter(FieldFilters.eq("status",9)); + return scItemDao.findPage(query.builder()); }else if (status == 1) { String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname from boe_study_course bsc " + " where bsc.course_id = '"+courseId+"' and bsc.id != (" + From e77ee342254ed637e2ba8286e6f925358005c94e Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 24 Jul 2024 16:42:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/service/impl/StudyServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index 566bcc20..4e642137 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -212,7 +212,7 @@ public class StudyServiceImpl implements IStudyService{ return pageList; } } - String sql2 = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.progress,item.status from boe_study_course bsc left join " + + String sql2 = "select * from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.progress,item.status from boe_study_course bsc left join " + "boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + "where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' " + "UNION ALL " + @@ -222,7 +222,7 @@ public class StudyServiceImpl implements IStudyService{ " select bsc.id from boe_study_course bsc " + " left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" + - " )"; + " )) a group by a.id"; List list = scDao.sqlFindList(sql2); List item = new ArrayList<>(); for (Object[] objs : list) {