|
@@ -59,11 +59,11 @@ public class SysReportController {
|
|
@RequestMapping(value = "/common/list_exam", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/common/list_exam", method = RequestMethod.POST)
|
|
@ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TBExamResult.class)})
|
|
@ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TBExamResult.class)})
|
|
public Result listExam(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
|
|
public Result listExam(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
|
|
- @ApiParam(value = "学期枚举", required = true) @RequestParam SemesterEnum semesterEnum) {
|
|
+ @ApiParam(value = "学期枚举", required = true) @RequestParam SemesterEnum semester) {
|
|
QueryWrapper<TBExam> tbExamQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<TBExam> tbExamQueryWrapper = new QueryWrapper<>();
|
|
tbExamQueryWrapper.select(" DISTINCT id,exam_name as examName,exam_code as examCode ")
|
|
tbExamQueryWrapper.select(" DISTINCT id,exam_name as examName,exam_code as examCode ")
|
|
.eq("school_id", SystemConstant.convertIdToLong(schoolId))
|
|
.eq("school_id", SystemConstant.convertIdToLong(schoolId))
|
|
- .eq("semester", semesterEnum);
|
|
+ .eq("semester", semester);
|
|
List<TBExam> tbExamList = tbExamService.list(tbExamQueryWrapper);
|
|
List<TBExam> tbExamList = tbExamService.list(tbExamQueryWrapper);
|
|
List<TBExamResult> tbExamResultList = null;
|
|
List<TBExamResult> tbExamResultList = null;
|
|
if (Objects.nonNull(tbExamList) && tbExamList.size() > 0) {
|
|
if (Objects.nonNull(tbExamList) && tbExamList.size() > 0) {
|