详情中添加课程
This commit is contained in:
@@ -1,26 +1,25 @@
|
|||||||
package com.peanut.modules.common.controller;
|
package com.peanut.modules.taihumed.controller;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||||
import com.peanut.common.utils.R;
|
import com.peanut.common.utils.R;
|
||||||
import com.peanut.modules.common.entity.TaihuTalent;
|
import com.peanut.modules.common.entity.*;
|
||||||
import com.peanut.modules.common.entity.UserCertificate;
|
|
||||||
import com.peanut.modules.common.entity.UserCertificateLabel;
|
|
||||||
import com.peanut.modules.common.service.TaihuTalentService;
|
import com.peanut.modules.common.service.TaihuTalentService;
|
||||||
import com.peanut.modules.common.service.UserCertificateLabelService;
|
import com.peanut.modules.common.service.UserCertificateLabelService;
|
||||||
import com.peanut.modules.common.service.UserCertificateService;
|
import com.peanut.modules.common.service.UserCertificateService;
|
||||||
|
import com.peanut.modules.master.service.CourseService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RestController("commonTaihuTalent")
|
@RestController("taihumedTaihuTalent")
|
||||||
@RequestMapping("common/taihuTalent")
|
@RequestMapping("taihumed/taihuTalent")
|
||||||
public class TaihuTalentController {
|
public class TaihuTalentController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -29,6 +28,8 @@ public class TaihuTalentController {
|
|||||||
private UserCertificateService userCertificateService;
|
private UserCertificateService userCertificateService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private UserCertificateLabelService userCertificateLabelService;
|
private UserCertificateLabelService userCertificateLabelService;
|
||||||
|
@Autowired
|
||||||
|
private CourseService courseService;
|
||||||
|
|
||||||
//太湖英才列表
|
//太湖英才列表
|
||||||
@RequestMapping("/getTaihuTalents")
|
@RequestMapping("/getTaihuTalents")
|
||||||
@@ -101,10 +102,17 @@ public class TaihuTalentController {
|
|||||||
res.add(label);
|
res.add(label);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper();
|
||||||
|
wrapper.rightJoin(CourseToTalent.class,CourseToTalent::getCourseId,CourseEntity::getId);
|
||||||
|
wrapper.leftJoin(TaihuTalent.class,TaihuTalent::getId,CourseToTalent::getTalentId);
|
||||||
|
wrapper.selectAll(CourseEntity.class);
|
||||||
|
wrapper.eq(CourseToTalent::getTalentId,taihuTalent.getId());
|
||||||
|
List<CourseEntity> courseList = courseService.list(wrapper);
|
||||||
return R.ok()
|
return R.ok()
|
||||||
.put("taihuTalent",taihuTalent)
|
.put("taihuTalent",taihuTalent)
|
||||||
.put("label",titleLabel)
|
.put("label",titleLabel)
|
||||||
.put("certificates",res);
|
.put("certificates",res)
|
||||||
|
.put("courseList",courseList);
|
||||||
}
|
}
|
||||||
|
|
||||||
void getUserCertificates(List<UserCertificate> us,UserCertificateLabel label,int userId){
|
void getUserCertificates(List<UserCertificate> us,UserCertificateLabel label,int userId){
|
||||||
Reference in New Issue
Block a user