zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

过期课程修改

Browse Source
This commit is contained in:
wuchunlei
2025-03-05 11:47:46 +08:00
parent efc893767d
commit 7921c8bfa9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/peanut/modules/psyche/controller/PsycheCourseController.java
View File

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -69,7 +71,7 @@ public class PsycheCourseController {
//我的课程-过期课程 //我的课程-过期课程
@RequestMapping("/getCourseExpire") @RequestMapping("/getCourseExpire")
public R getCourseExpire(){ public R getCourseExpire(){
List courseEntities = null; List courseEntities = new ArrayList();
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.distinct(); wrapper.distinct();
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId); wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
@@ -95,7 +97,6 @@ public class PsycheCourseController {
//我的课程-正在学习（收藏） //我的课程-正在学习（收藏）
@RequestMapping("/getUserCourseStudying") @RequestMapping("/getUserCourseStudying")
public R getUserCourseStudying(){ public R getUserCourseStudying(){
MyUserEntity user = ShiroUtils.getUser();
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.leftJoin(CourseToPsyche.class,CourseToPsyche::getCourseId,CourseEntity::getId); wrapper.leftJoin(CourseToPsyche.class,CourseToPsyche::getCourseId,CourseEntity::getId);
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId); wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId);

2
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -338,7 +338,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
@Override @Override
public List getCourseExpire(Map<String, Object> param) { 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<>(); MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.distinct(); wrapper.distinct();
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId); wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);