|
@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.ynfy.buss.course.course.entity.Course;
|
|
import com.ynfy.buss.course.course.entity.Course;
|
|
import com.ynfy.buss.course.course.service.ICourseService;
|
|
import com.ynfy.buss.course.course.service.ICourseService;
|
|
import com.ynfy.buss.course.coursecatalog.service.ICourseCatalogService;
|
|
import com.ynfy.buss.course.coursecatalog.service.ICourseCatalogService;
|
|
-import com.ynfy.buss.exam.exam.entity.Exam;
|
|
|
|
-import com.ynfy.buss.exam.exam.service.IExamService;
|
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -17,6 +15,7 @@ import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
|
+import org.jeecg.modules.system.service.ISysPositionService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
@@ -24,7 +23,6 @@ import org.springframework.web.servlet.ModelAndView;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
-import java.util.Objects;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Description: course
|
|
* @Description: course
|
|
@@ -44,7 +42,7 @@ public class CourseController extends JeecgController<Course, ICourseService> {
|
|
private ICourseCatalogService courseCatalogService;
|
|
private ICourseCatalogService courseCatalogService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private IExamService examService;
|
|
|
|
|
|
+ private ISysPositionService sysPositionService;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 分页列表查询
|
|
* 分页列表查询
|
|
@@ -131,6 +129,9 @@ public class CourseController extends JeecgController<Course, ICourseService> {
|
|
return Result.error("未找到对应数据");
|
|
return Result.error("未找到对应数据");
|
|
}
|
|
}
|
|
course.setCatalogList(courseCatalogService.listByCourseId(course.getId()));
|
|
course.setCatalogList(courseCatalogService.listByCourseId(course.getId()));
|
|
|
|
+ if (StringUtils.isNotBlank(course.getTeacherPost())) {
|
|
|
|
+ course.setTeacherPost(sysPositionService.listByCodes(Arrays.asList(course.getTeacherPost().split(","))));
|
|
|
|
+ }
|
|
return Result.OK(course);
|
|
return Result.OK(course);
|
|
}
|
|
}
|
|
|
|
|