From a6598342cce68575693cc84bae87a7dfda4608a6 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 20 Jun 2025 17:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/entity/CourseEntity.java | 2 +- .../master/controller/TaihuTalentController.java | 15 +++++++++++++-- .../taihumed/controller/CourseController.java | 13 ++++++++----- 3 files changed, 22 insertions(+), 8 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 56258c04..322d3e6e 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -63,5 +63,5 @@ public class CourseEntity { @TableField(exist = false) private Integer taihuTalentId; @TableField(exist = false) - private TaihuTalent taihuTalent; + private List taihuTalent; } diff --git a/src/main/java/com/peanut/modules/master/controller/TaihuTalentController.java b/src/main/java/com/peanut/modules/master/controller/TaihuTalentController.java index 410da83a..83f95ced 100644 --- a/src/main/java/com/peanut/modules/master/controller/TaihuTalentController.java +++ b/src/main/java/com/peanut/modules/master/controller/TaihuTalentController.java @@ -70,13 +70,21 @@ public class TaihuTalentController { //绑定课程和太湖英才 @RequestMapping("/bindCourseAndTalent") public R bindCourseAndTalent(@RequestBody CourseToTalent courseToTalent){ - //去重 CourseToTalent one = courseToTalentService.getOne(new LambdaQueryWrapper() .eq(CourseToTalent::getCourseId, courseToTalent.getCourseId()) .eq(CourseToTalent::getTalentId, courseToTalent.getTalentId())); if(one != null){ return R.error(501,"绑定失败,绑定关系已将存在"); } + int count = courseToTalentService.count(new LambdaQueryWrapper() + .eq(CourseToTalent::getCourseId, courseToTalent.getCourseId())); + List ctts = courseToTaihumedService.list(new LambdaQueryWrapper() + .eq(CourseToTaihumed::getCourseId,courseToTalent.getCourseId())); + for (CourseToTaihumed ctt:ctts){ + if (count>0&&(ctt.getTaihumedId()==99||ctt.getTaihumedId()==100)){ + return R.error(501,"绑定失败,此课程只能绑定一人"); + } + } courseToTalentService.save(courseToTalent); return R.ok(); } @@ -84,7 +92,10 @@ public class TaihuTalentController { //解绑课程和太湖英才 @RequestMapping("/unbindCourseAndTalent") public R unbindCourseAndTalent(@RequestBody CourseToTalent courseToTalent){ - boolean b = courseToTalentService.removeById(courseToTalent.getId()); + CourseToTalent ctt = courseToTalentService.getOne(new LambdaQueryWrapper() + .eq(CourseToTalent::getCourseId,courseToTalent.getCourseId()) + .eq(CourseToTalent::getTalentId,courseToTalent.getTalentId())); + boolean b = courseToTalentService.removeById(ctt.getId()); if(b){ return R.ok(); }else { diff --git a/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java b/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java index 9d3120db..66cee0e7 100644 --- a/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java +++ b/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java @@ -68,16 +68,19 @@ public class CourseController { Page pageRes = courseService.page(new Page<>(Long.parseLong(params.get("current").toString()) , Long.parseLong(params.get("limit").toString())),wrapper); for (CourseEntity course:pageRes.getRecords()){ + List list = new ArrayList<>(); if (course.getTaihuTalentId()!=null){ - course.setTaihuTalent(taihuTalentService.getById(course.getTaihuTalentId())); + list.add(taihuTalentService.getById(course.getTaihuTalentId())); + course.setTaihuTalent(list); }else { - CourseToTalent courseToTalent = courseToTalentService.getOne(new LambdaQueryWrapper() + List courseToTalents = courseToTalentService.list(new LambdaQueryWrapper() .eq(CourseToTalent::getCourseId,course.getId())); - if (courseToTalent!=null){ - TaihuTalent taihuTalent = taihuTalentService.getById(courseToTalent.getTalentId()); - course.setTaihuTalent(taihuTalent); + for (CourseToTalent ctt:courseToTalents){ + TaihuTalent taihuTalent = taihuTalentService.getById(ctt.getTalentId()); + list.add(taihuTalent); } } + course.setTaihuTalent(list); course.setCourseCatalogueEntityList(courseCatalogueService.list(new LambdaQueryWrapper() .eq(CourseCatalogueEntity::getCourseId,course.getId()) .orderByAsc(CourseCatalogueEntity::getSort)));