|
@@ -95,37 +95,20 @@ public class ExamStudentController extends ControllerSupport {
|
|
|
@Autowired
|
|
|
ExamRecordCloudService examRecordCloudService;
|
|
|
|
|
|
- @ApiOperation(value = "查询考试的课程分页")
|
|
|
- @GetMapping("examCoursePage/{curPage}/{pageSize}")
|
|
|
- public PageInfo<CourseDomain> getExamCoursePage(@PathVariable Integer curPage,
|
|
|
- @PathVariable Integer pageSize, @RequestParam(required = true) Long examId,
|
|
|
- @RequestParam(required = false) Long courseId,
|
|
|
- @RequestParam(required = false) String courseLevel) {
|
|
|
+ @ApiOperation(value = "查询考试的课程集合")
|
|
|
+ @GetMapping("queryExamCourseList")
|
|
|
+ public List<CourseDomain> getExamCourseList(@RequestParam(required = true) Long examId) {
|
|
|
|
|
|
User accessUser = getAccessUser();
|
|
|
Long rootOrgId = accessUser.getRootOrgId();
|
|
|
|
|
|
StringBuilder sql = new StringBuilder(
|
|
|
"SELECT t.exam_id from ec_e_exam_student t where t.exam_id=?");
|
|
|
- if (null != courseId) {
|
|
|
- sql.append(" and t.course_id=?");
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(courseLevel)) {
|
|
|
- sql.append(" and t.course_level=?");
|
|
|
- }
|
|
|
|
|
|
sql.append(" group by t.exam_id,t.course_id");
|
|
|
- sql.append(" limit ").append(curPage).append(",").append("pageSize");
|
|
|
|
|
|
- Query query = em.createNativeQuery(
|
|
|
- "SELECT t.exam_id from ec_e_exam_student t where t.exam_id=1 group by t.exam_id,t.course_id");
|
|
|
+ Query query = em.createNativeQuery(sql.toString());
|
|
|
query.setParameter(1, examId);
|
|
|
- if (null != courseId) {
|
|
|
- query.setParameter(2, courseId);
|
|
|
- }
|
|
|
- if (StringUtils.isNotBlank(courseLevel)) {
|
|
|
- query.setParameter(3, courseLevel);
|
|
|
- }
|
|
|
|
|
|
List<?> resultList = query.getResultList();
|
|
|
|
|
@@ -148,10 +131,7 @@ public class ExamStudentController extends ControllerSupport {
|
|
|
|
|
|
em.close();
|
|
|
|
|
|
- PageInfo<CourseDomain> page = new PageInfo<CourseDomain>();
|
|
|
- page.setList(list);
|
|
|
-
|
|
|
- return page;
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
/**
|