mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-11 03:46:50 +08:00
提交修改
This commit is contained in:
@@ -392,7 +392,8 @@ public class CourseManageApi extends ApiBaseController{
|
|||||||
if(dto.getAuditUser()==null) {
|
if(dto.getAuditUser()==null) {
|
||||||
return badRequest("HRBP审核信息错误");
|
return badRequest("HRBP审核信息错误");
|
||||||
}
|
}
|
||||||
|
//此判断用于本地测试
|
||||||
|
if(!isLocalDevelopment()) {
|
||||||
if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
|
if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
|
||||||
return badRequest("HRBP审核信息人员错误");
|
return badRequest("HRBP审核信息人员错误");
|
||||||
}
|
}
|
||||||
@@ -400,6 +401,7 @@ public class CourseManageApi extends ApiBaseController{
|
|||||||
if(StringUtils.isBlank(dto.getAuditUser().getCode())) {
|
if(StringUtils.isBlank(dto.getAuditUser().getCode())) {
|
||||||
return badRequest("HRBP审核信息人员错误");
|
return badRequest("HRBP审核信息人员错误");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// //检查资源内容的完整性,内容需要在前端检查 ,修改,提交必须是在编辑区域才有的操作
|
// //检查资源内容的完整性,内容需要在前端检查 ,修改,提交必须是在编辑区域才有的操作
|
||||||
// if(StringUtils.isBlank(dto.getCourse().getResOwner1())) {
|
// if(StringUtils.isBlank(dto.getCourse().getResOwner1())) {
|
||||||
|
|||||||
@@ -322,7 +322,7 @@ public class CourseServiceImpl implements ICourseService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Course> findSimpleList(int pageIndex,String currentAid, CourseQueryDto dto) {
|
public List<Course> findSimpleList(int number,String currentAid, CourseQueryDto dto) {
|
||||||
List<IFieldFilter> filters = createFilters(dto);
|
List<IFieldFilter> filters = createFilters(dto);
|
||||||
//自动添加过滤已删除
|
//自动添加过滤已删除
|
||||||
filters.add(FieldFilters.eq("deleted",false));
|
filters.add(FieldFilters.eq("deleted",false));
|
||||||
|
|||||||
@@ -260,8 +260,38 @@ public class PortalIndexApi extends ApiBaseController{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 课程关联的推荐
|
||||||
|
* @param pager
|
||||||
|
* @param dto
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("/course-for-recommend")
|
||||||
|
public JsonResponse<List<Course>> courseRecommend(Course course){
|
||||||
|
String aid = this.getCurrent().getAccountId();
|
||||||
|
CourseQueryDto dto=new CourseQueryDto();
|
||||||
|
dto.setPublish(true);
|
||||||
|
dto.setYearFilter(true);
|
||||||
|
//还应该根据课程的规则查询
|
||||||
|
List<Course> list = courseService.findSimpleList(6, aid,dto);
|
||||||
|
//提取教师信息
|
||||||
|
List<String> ids=new ArrayList<String>();
|
||||||
|
|
||||||
|
|
||||||
|
for(Course c :list) {
|
||||||
|
ids.add(c.getId());
|
||||||
|
}
|
||||||
|
List<CourseTeacher> teachers = courseService.findTeachersByCourseIds(ids);
|
||||||
|
//注意对于多个教师的情况,这里只是设置第一个教师
|
||||||
|
for(Course c :list) {
|
||||||
|
for(CourseTeacher ct : teachers) {
|
||||||
|
if(ct.getCourseId().equals(c.getId())) {
|
||||||
|
c.setTeacherId(ct.getTeacherId());
|
||||||
|
c.setTeacher(ct.getTeacherName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return success(list);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user