过期课程修改
This commit is contained in:
@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -69,7 +71,7 @@ public class PsycheCourseController {
|
||||
//我的课程-过期课程
|
||||
@RequestMapping("/getCourseExpire")
|
||||
public R getCourseExpire(){
|
||||
List courseEntities = null;
|
||||
List courseEntities = new ArrayList();
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.distinct();
|
||||
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
|
||||
@@ -95,7 +97,6 @@ public class PsycheCourseController {
|
||||
//我的课程-正在学习(收藏)
|
||||
@RequestMapping("/getUserCourseStudying")
|
||||
public R getUserCourseStudying(){
|
||||
MyUserEntity user = ShiroUtils.getUser();
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.leftJoin(CourseToPsyche.class,CourseToPsyche::getCourseId,CourseEntity::getId);
|
||||
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId);
|
||||
|
||||
@@ -338,7 +338,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
|
||||
@Override
|
||||
public List getCourseExpire(Map<String, Object> param) {
|
||||
List<Map<String,Object>> courseEntities = null;
|
||||
List<Map<String,Object>> courseEntities = new ArrayList<>();
|
||||
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
|
||||
wrapper.distinct();
|
||||
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
|
||||
|
||||
Reference in New Issue
Block a user