From ce5d256f8be1bead53a6266ebeff3ceade333f8d Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 15:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B=E5=81=9C?= =?UTF-8?q?=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/school/study/dto/StudyCourseSimple.java | 2 ++ .../school/study/service/impl/StudyCourseServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java index 3bc55d28..233a7397 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dto/StudyCourseSimple.java @@ -40,4 +40,6 @@ public class StudyCourseSimple { * 删除标识 */ private Boolean deleted; + + private Boolean enabled; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index 9e5a4457..57210572 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -419,7 +419,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ @Override public List followids(StudyCourseQuery studyCourseQuery) { //分两次查询，查询课程，查询学习记录 - String courseHql="Select id,coverImg,score,name,sysType1,sysType2,sysType3,deleted from "+Course.class.getSimpleName()+" where id in(?1)"; + String courseHql="Select id,coverImg,score,name,sysType1,sysType2,sysType3,deleted,enabled from "+Course.class.getSimpleName()+" where id in(?1)"; String studyHql="Select courseId,addTime,progress,aid from "+StudyCourse.class.getSimpleName()+" where aid in(?1) and courseId in(?2)"; List rs=new ArrayList<>(); @@ -445,6 +445,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ sc.setSysType2(ConvertUtil.toStr(cobjs[5])); sc.setSysType3(ConvertUtil.toStr(cobjs[6])); sc.setDeleted(ConvertUtil.toBool(cobjs[7])); + sc.setEnabled(ConvertUtil.toBool(cobjs[8])); break; } } @@ -475,6 +476,7 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ sc.setSysType2(ConvertUtil.toStr(cobjs[5])); sc.setSysType3(ConvertUtil.toStr(cobjs[6])); sc.setDeleted(ConvertUtil.toBool(cobjs[7])); + sc.setEnabled(ConvertUtil.toBool(cobjs[8])); rs.add(sc); }