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-06-20 17:19:06 +08:00
parent d2feee9c1c
commit a6598342cc
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/entity/CourseEntity.java
View File

@@ -63,5 +63,5 @@ public class CourseEntity {
@TableField(exist = false)
private Integer taihuTalentId;
@TableField(exist = false)
private TaihuTalent taihuTalent;
private List<TaihuTalent> taihuTalent;
}

15
src/main/java/com/peanut/modules/master/controller/TaihuTalentController.java
View File

@@ -70,13 +70,21 @@ public class TaihuTalentController {
//绑定课程和太湖英才
@RequestMapping("/bindCourseAndTalent")
public R bindCourseAndTalent(@RequestBody CourseToTalent courseToTalent){
//去重
CourseToTalent one = courseToTalentService.getOne(new LambdaQueryWrapper<CourseToTalent>()
.eq(CourseToTalent::getCourseId, courseToTalent.getCourseId())
.eq(CourseToTalent::getTalentId, courseToTalent.getTalentId()));
if(one != null){
return R.error(501,"绑定失败，绑定关系已将存在");
}
int count = courseToTalentService.count(new LambdaQueryWrapper<CourseToTalent>()
.eq(CourseToTalent::getCourseId, courseToTalent.getCourseId()));
List<CourseToTaihumed> ctts = courseToTaihumedService.list(new LambdaQueryWrapper<CourseToTaihumed>()
.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<CourseToTalent>()
.eq(CourseToTalent::getCourseId,courseToTalent.getCourseId())
.eq(CourseToTalent::getTalentId,courseToTalent.getTalentId()));
boolean b = courseToTalentService.removeById(ctt.getId());
if(b){
return R.ok();
}else {

13
src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
View File

@@ -68,16 +68,19 @@ public class CourseController {
Page<CourseEntity> pageRes = courseService.page(new Page<>(Long.parseLong(params.get("current").toString())
, Long.parseLong(params.get("limit").toString())),wrapper);
for (CourseEntity course:pageRes.getRecords()){
List<TaihuTalent> 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<CourseToTalent>()
List<CourseToTalent> courseToTalents = courseToTalentService.list(new LambdaQueryWrapper<CourseToTalent>()
.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<CourseCatalogueEntity>()
.eq(CourseCatalogueEntity::getCourseId,course.getId())
.orderByAsc(CourseCatalogueEntity::getSort)));