From dd0470f9dc856de3a6f9bbae4d2d1b761562dc50 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Tue, 18 Jun 2024 13:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=9C=A8=E5=AD=A6=E4=B9=A0=E4=B8=AD?= =?UTF-8?q?=20=E6=AD=A3=E5=9C=A8=E5=AD=A6=E4=B9=A0-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=BA=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/peanut/modules/common/entity/CourseEntity.java | 2 ++ .../com/peanut/modules/common/entity/UserCourseStudying.java | 2 +- .../modules/medical/service/impl/CourseServiceImpl.java | 2 +- .../peanut/modules/sociology/controller/CourseController.java | 4 ++-- .../modules/sociology/service/impl/CourseServiceImpl.java | 4 +++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java index dcb1d854..14f42bc7 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -48,4 +48,6 @@ public class CourseEntity { private Integer selective; @TableField(exist = false) private Integer isBuy; + @TableField(exist = false) + private Integer isStudying; } diff --git a/src/main/java/com/peanut/modules/common/entity/UserCourseStudying.java b/src/main/java/com/peanut/modules/common/entity/UserCourseStudying.java index 645dd4bb..beed60d0 100644 --- a/src/main/java/com/peanut/modules/common/entity/UserCourseStudying.java +++ b/src/main/java/com/peanut/modules/common/entity/UserCourseStudying.java @@ -15,7 +15,7 @@ public class UserCourseStudying { private Integer userId; - private Integer catalogueId; + private Integer courseId; private Date createTime; diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java index f6566b6b..c35a66da 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java @@ -92,7 +92,7 @@ public class CourseServiceImpl extends ServiceImpl 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"); diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java index 21487bc4..c0c48d5f 100644 --- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java @@ -104,7 +104,7 @@ public class CourseController { public R addUserCourseStudying(@RequestBody Map 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 map){ userCourseStudyingDao.delete(new LambdaQueryWrapper() - .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(); } diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java index cfb4579f..c3de651c 100644 --- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java @@ -268,7 +268,7 @@ public class CourseServiceImpl extends ServiceImpl 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 impl courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, wrapper); if(courseEntities!=null&&courseEntities.size()>0){ for (CourseEntity co:courseEntities){ + int i = studyingDao.selectCount(new LambdaQueryWrapper().eq(UserCourseStudying::getCourseId,co.getId()).eq(UserCourseStudying::getUserId,user.getId())); + co.setIsStudying(i>0?1:0); List courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort)); co.setCourseCatalogueEntityList(courseCatalogueEntities); }