我的课程-添加是否在学习中
正在学习-修改目录为课程
This commit is contained in:
@@ -48,4 +48,6 @@ public class CourseEntity {
|
||||
private Integer selective;
|
||||
@TableField(exist = false)
|
||||
private Integer isBuy;
|
||||
@TableField(exist = false)
|
||||
private Integer isStudying;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ public class UserCourseStudying {
|
||||
|
||||
private Integer userId;
|
||||
|
||||
private Integer catalogueId;
|
||||
private Integer courseId;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
wrapper.distinct();
|
||||
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
|
||||
wrapper.leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
|
||||
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCatalogueId,CourseCatalogueEntity::getId);
|
||||
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId);
|
||||
wrapper.eq(UserCourseStudying::getUserId,param.get("userId"));
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
|
||||
|
||||
@@ -104,7 +104,7 @@ public class CourseController {
|
||||
public R addUserCourseStudying(@RequestBody Map<String,Integer> map){
|
||||
UserCourseStudying userCourseStudying = new UserCourseStudying();
|
||||
userCourseStudying.setUserId(ShiroUtils.getUId());
|
||||
userCourseStudying.setCatalogueId(map.get("catalogueId"));
|
||||
userCourseStudying.setCourseId(map.get("courseId"));
|
||||
userCourseStudyingDao.insert(userCourseStudying);
|
||||
return R.ok().put("result",userCourseStudying);
|
||||
}
|
||||
@@ -117,7 +117,7 @@ public class CourseController {
|
||||
@RequestMapping("/removeUserCourseStudying")
|
||||
public R removeUserCourseStudying(@RequestBody Map<String,Integer> map){
|
||||
userCourseStudyingDao.delete(new LambdaQueryWrapper<UserCourseStudying>()
|
||||
.eq(UserCourseStudying::getUserId,ShiroUtils.getUId()).eq(UserCourseStudying::getCatalogueId,map.get("catalogueId")));
|
||||
.eq(UserCourseStudying::getUserId,ShiroUtils.getUId()).eq(UserCourseStudying::getCourseId,map.get("courseId")));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
@@ -268,7 +268,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
wrapper.distinct();
|
||||
wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
|
||||
wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
|
||||
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCatalogueId,CourseCatalogueEntity::getId);
|
||||
wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId);
|
||||
wrapper.eq(UserCourseStudying::getUserId,param.get("userId"));
|
||||
wrapper.selectAll(CourseEntity.class);
|
||||
wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
|
||||
@@ -328,6 +328,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
|
||||
courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper);
|
||||
if(courseEntities!=null&&courseEntities.size()>0){
|
||||
for (CourseEntity co:courseEntities){
|
||||
int i = studyingDao.selectCount(new LambdaQueryWrapper<UserCourseStudying>().eq(UserCourseStudying::getCourseId,co.getId()).eq(UserCourseStudying::getUserId,user.getId()));
|
||||
co.setIsStudying(i>0?1:0);
|
||||
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
|
||||
co.setCourseCatalogueEntityList(courseCatalogueEntities);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user