From dc2d14468281f2d6d5e3bfe7da8bc63b1b050b35 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Mon, 22 Jul 2024 17:38:57 +0800 Subject: [PATCH 01/17] =?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 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 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 ef541afb..24752520 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 @@ -182,11 +182,21 @@ public class StudyServiceImpl implements IStudyService{ } if(status!=null) { if(status==3) { - query.addFilter(FieldFilters.eq("progress", 1)); + query.addFilter(FieldFilters.eq("status", 2)); }else if(status==2){ - query.addFilter(FieldFilters.eq("progress",100)); - }else if(status == 1){ - query.addFilter(FieldFilters.eq("progress",0)); + query.addFilter(FieldFilters.eq("status",9)); + }else if (status == 1) { + query.addFilter(FieldFilters.ne("status", 2)); + query.addFilter(FieldFilters.ne("status", 9)); + List list = scItemDao.findList(query.builder()); + List item = new ArrayList<>(list.size()); + for (StudyCourseItem sc : list) { + sc.setProgress(0); + sc.setStatus(1); + item.add(sc); + } + PageList pageList = new PageList<>(item); // 假设 PageList 有一个接受 List 的构造函数 + return pageList; } } From b2981cff8a449197f8dbe684505725ee67057a02 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 08:46:54 +0800 Subject: [PATCH 02/17] =?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 | 15 ++++++++++----- .../service/impl/StudySignupServiceImpl.java | 2 +- 2 files changed, 11 insertions(+), 6 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 24752520..8a9e234b 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 @@ -190,12 +190,17 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.ne("status", 9)); List list = scItemDao.findList(query.builder()); List item = new ArrayList<>(list.size()); - for (StudyCourseItem sc : list) { - sc.setProgress(0); - sc.setStatus(1); - item.add(sc); + if (list.isEmpty()){ + for (StudyCourseItem sc : list) { + sc.setProgress(0); + sc.setStatus(1); + sc.setAname(name); + item.add(sc); + } + PageList pageList = new PageList<>(item); + return pageList; } - PageList pageList = new PageList<>(item); // 假设 PageList 有一个接受 List 的构造函数 + PageList pageList = new PageList<>(item); return pageList; } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java index d9345ba2..8d0fe70b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudySignupServiceImpl.java @@ -168,7 +168,7 @@ public class StudySignupServiceImpl implements IStudySignupService{ //用于管理员添加报名 for(StudySignup ss : list) { addSignup(ss); - addStudyCourseItem(ss); +// addStudyCourseItem(ss); } } From 9fbeea85c6604f4df56ab2cfddad6625fbbe2a57 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 14:30:40 +0800 Subject: [PATCH 03/17] =?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 --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 8a9e234b..772c0bca 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 @@ -186,12 +186,15 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("status",9)); }else if (status == 1) { + String sql = "select id,course_id,course_name from boe_study_course where course_id = '"+courseId+"'"; + List list = scDao.sqlFindList(sql); query.addFilter(FieldFilters.ne("status", 2)); query.addFilter(FieldFilters.ne("status", 9)); - List list = scItemDao.findList(query.builder()); + List itemList = scDao.findList(query.builder()); List item = new ArrayList<>(list.size()); - if (list.isEmpty()){ - for (StudyCourseItem sc : list) { + if (itemList.isEmpty()){ + for (int i = 0; i < list.size()-1; i++) { + StudyCourseItem sc = new StudyCourseItem(); sc.setProgress(0); sc.setStatus(1); sc.setAname(name); From 3e9eaf30cbab8b29668bac3d8ec73085a05a810a Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 14:36:33 +0800 Subject: [PATCH 04/17] =?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 --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 772c0bca..90c2abe6 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 @@ -186,18 +186,18 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("status",9)); }else if (status == 1) { - String sql = "select id,course_id,course_name from boe_study_course where course_id = '"+courseId+"'"; + String sql = "select id,course_id,course_name,aname from boe_study_course where course_id = '"+courseId+"'"; List list = scDao.sqlFindList(sql); query.addFilter(FieldFilters.ne("status", 2)); query.addFilter(FieldFilters.ne("status", 9)); List itemList = scDao.findList(query.builder()); List item = new ArrayList<>(list.size()); if (itemList.isEmpty()){ - for (int i = 0; i < list.size()-1; i++) { + for (Object[] objs : list) { StudyCourseItem sc = new StudyCourseItem(); sc.setProgress(0); sc.setStatus(1); - sc.setAname(name); + sc.setAname(objs[3].toString()); item.add(sc); } PageList pageList = new PageList<>(item); From b0ac4951ad5e3983af56b226f16e58784ade60ec Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 14:47:25 +0800 Subject: [PATCH 05/17] =?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 --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 90c2abe6..db69965e 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 @@ -190,10 +190,10 @@ public class StudyServiceImpl implements IStudyService{ List list = scDao.sqlFindList(sql); query.addFilter(FieldFilters.ne("status", 2)); query.addFilter(FieldFilters.ne("status", 9)); - List itemList = scDao.findList(query.builder()); List item = new ArrayList<>(list.size()); - if (itemList.isEmpty()){ - for (Object[] objs : list) { + for (Object[] objs : list) { + List itemList = scDao.findList(query.builder()); + if (itemList.isEmpty()){ StudyCourseItem sc = new StudyCourseItem(); sc.setProgress(0); sc.setStatus(1); From 9aaab480bf698d5be5450a6c8e591191e8302c40 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 15:05:24 +0800 Subject: [PATCH 06/17] =?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 --- .../school/study/service/impl/StudyServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 db69965e..1564104e 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 @@ -186,22 +186,22 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("status",9)); }else if (status == 1) { - String sql = "select id,course_id,course_name,aname from boe_study_course where course_id = '"+courseId+"'"; + String sql = "select id, course_id, course_name, aname from boe_study_course where course_id = '" + courseId + "'"; List list = scDao.sqlFindList(sql); query.addFilter(FieldFilters.ne("status", 2)); query.addFilter(FieldFilters.ne("status", 9)); - List item = new ArrayList<>(list.size()); + + List item = new ArrayList<>(); for (Object[] objs : list) { - List itemList = scDao.findList(query.builder()); - if (itemList.isEmpty()){ + query.addFilter(FieldFilters.eq("course_id", objs[1])); // 添加一个额外的过滤条件来匹配 course_id + List itemList = scItemDao.findList(query.builder()); // 执行查询 + if (itemList.isEmpty()) { StudyCourseItem sc = new StudyCourseItem(); sc.setProgress(0); sc.setStatus(1); sc.setAname(objs[3].toString()); item.add(sc); } - PageList pageList = new PageList<>(item); - return pageList; } PageList pageList = new PageList<>(item); return pageList; From ea7ff473d0b261d0ce2915aa63302ba56117bd65 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 15:32:18 +0800 Subject: [PATCH 07/17] =?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 | 5 ++--- 1 file changed, 2 insertions(+), 3 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 1564104e..54992537 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 @@ -190,11 +190,10 @@ public class StudyServiceImpl implements IStudyService{ List list = scDao.sqlFindList(sql); query.addFilter(FieldFilters.ne("status", 2)); query.addFilter(FieldFilters.ne("status", 9)); - List item = new ArrayList<>(); for (Object[] objs : list) { - query.addFilter(FieldFilters.eq("course_id", objs[1])); // 添加一个额外的过滤条件来匹配 course_id - List itemList = scItemDao.findList(query.builder()); // 执行查询 + String sql2 = "select id, course_id, course_name, aname from boe_study_course_item where status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'"; + List itemList = scItemDao.sqlFindList(sql2);// 执行查询 if (itemList.isEmpty()) { StudyCourseItem sc = new StudyCourseItem(); sc.setProgress(0); From 7eb1dcd7c480052e27faafd4c2d2efed1733b6b5 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 15:54:56 +0800 Subject: [PATCH 08/17] =?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, 1 insertion(+), 1 deletion(-) 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 54992537..f7b2d929 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 @@ -192,7 +192,7 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.ne("status", 9)); List item = new ArrayList<>(); for (Object[] objs : list) { - String sql2 = "select id, course_id, course_name, aname from boe_study_course_item where status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'"; + String sql2 = "select id, course_id, course_name, aname from boe_study_course_item where `status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'"; List itemList = scItemDao.sqlFindList(sql2);// 执行查询 if (itemList.isEmpty()) { StudyCourseItem sc = new StudyCourseItem(); From 13914ede08342ff91384e8a4b6e69587b839cfa8 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 16:00:43 +0800 Subject: [PATCH 09/17] =?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, 1 insertion(+), 1 deletion(-) 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 f7b2d929..338e4133 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 @@ -192,7 +192,7 @@ public class StudyServiceImpl implements IStudyService{ query.addFilter(FieldFilters.ne("status", 9)); List item = new ArrayList<>(); for (Object[] objs : list) { - String sql2 = "select id, course_id, course_name, aname from boe_study_course_item where `status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'"; + String sql2 = "select id, course_id, content_name, aname from boe_study_course_item where `status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'"; List itemList = scItemDao.sqlFindList(sql2);// 执行查询 if (itemList.isEmpty()) { StudyCourseItem sc = new StudyCourseItem(); From 5e355986a0cc0f177e208dd3075675769330f7d4 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 16:54:42 +0800 Subject: [PATCH 10/17] =?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 --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 338e4133..6a482b19 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 @@ -186,10 +186,10 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("status",9)); }else if (status == 1) { - String sql = "select id, course_id, course_name, aname from boe_study_course where course_id = '" + courseId + "'"; + String sql = "select bsc.id, bsc.course_id, bsc.course_name, bsc.aname 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 item.content_id = '"+ contentId+"' and bsc.`status` !=9 and item.`status` !=2"; List list = scDao.sqlFindList(sql); - query.addFilter(FieldFilters.ne("status", 2)); - query.addFilter(FieldFilters.ne("status", 9)); List item = new ArrayList<>(); for (Object[] objs : list) { String sql2 = "select id, course_id, content_name, aname from boe_study_course_item where `status` !=2 and `status` !=9 and course_id = '" + courseId + "' and content_id = '"+contentId +"'"; From abef4c963e8c12d8dc19fce570abe75bbc2e14fa Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 17:51:55 +0800 Subject: [PATCH 11/17] =?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 --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 6a482b19..a3e2390a 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 @@ -186,9 +186,10 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("status",9)); }else if (status == 1) { - String sql = "select bsc.id, bsc.course_id, bsc.course_name, bsc.aname 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 item.content_id = '"+ contentId+"' and bsc.`status` !=9 and item.`status` !=2"; + String sql = "select bsc.* from boe_study_course bsc 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(sql); List item = new ArrayList<>(); for (Object[] objs : list) { From 4f6fbff5e1a0d08e717027db0e98bc2eab313048 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 23 Jul 2024 18:00:18 +0800 Subject: [PATCH 12/17] =?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 --- .../xboe/school/study/service/impl/StudyServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 a3e2390a..bf521d31 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 @@ -186,10 +186,12 @@ public class StudyServiceImpl implements IStudyService{ }else if(status==2){ query.addFilter(FieldFilters.eq("status",9)); }else if (status == 1) { - String sql = "select bsc.* from boe_study_course bsc where bsc.course_id = '"+courseId+"' and bsc.id = " + - " (select bsc.id from boe_study_course bsc " + + 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 != (" + + " 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+"')"; + " where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"'" + + " )"; List list = scDao.sqlFindList(sql); List item = new ArrayList<>(); for (Object[] objs : list) { 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 13/17] =?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 14/17] =?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 15/17] =?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 16/17] =?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 17/17] =?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) {