|
@@ -59,7 +59,7 @@ public class CourseController {
|
|
|
@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
|
|
|
@ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
|
|
|
@ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
|
|
|
- return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
|
|
|
+ return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "开课课程考试总览-试题难度得分情况分析接口")
|
|
@@ -75,7 +75,7 @@ public class CourseController {
|
|
|
if (Objects.isNull(sysUser)) {
|
|
|
throw ExceptionResultEnum.NOT_LOGIN.exception();
|
|
|
}
|
|
|
- return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
|
|
|
+ return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "开课课程考试总览-各难度水平题目上的作答分析接口")
|
|
@@ -91,7 +91,7 @@ public class CourseController {
|
|
|
if (Objects.isNull(sysUser)) {
|
|
|
throw ExceptionResultEnum.NOT_LOGIN.exception();
|
|
|
}
|
|
|
- return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
|
|
|
+ return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "开课课程考试总览图表接口")
|
|
@@ -101,7 +101,7 @@ public class CourseController {
|
|
|
@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
|
|
|
@ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
|
|
|
@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
|
|
|
- return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
|
|
|
+ return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "考查课程考试总览-公共课概况接口")
|
|
@@ -142,10 +142,10 @@ public class CourseController {
|
|
|
@RequestMapping(value = "/survey_aspoints/calculation", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "赋分试算接口", response = TrialCalculationResult.class)})
|
|
|
public Result surveyAspointsCalculation(
|
|
|
- @ApiParam(value = "考试id", required = true) @RequestParam String examId,
|
|
|
- @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
|
|
|
- @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
|
|
|
- return ResultUtil.ok(taExamCourseService.trialCalculate(SystemConstant.convertIdToLong(examId),courseCode,coefficient));
|
|
|
+ @ApiParam(value = "考试id", required = true) @RequestParam String examId,
|
|
|
+ @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
|
|
|
+ @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
|
|
|
+ return ResultUtil.ok(taExamCourseService.trialCalculate(SystemConstant.convertIdToLong(examId), courseCode, coefficient));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "赋分管理-发布&撤回接口")
|
|
@@ -155,9 +155,7 @@ public class CourseController {
|
|
|
@ApiParam(value = "考试id", required = true) @RequestParam String examId,
|
|
|
@ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
|
|
|
@ApiParam(value = "发布状态", required = true) @RequestParam PublishStatusEnum publishStatus) {
|
|
|
-
|
|
|
- analyzeForReportService.publishReport(SystemConstant.convertIdToLong(examId),courseCode,publishStatus);
|
|
|
+ analyzeForReportService.publishReport(SystemConstant.convertIdToLong(examId), courseCode, publishStatus);
|
|
|
return ResultUtil.ok();
|
|
|
}
|
|
|
-
|
|
|
}
|