bug修复

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/ExamRecordResult.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Description: ExamRecordResult
@@ -57,6 +58,9 @@ public class ExamRecordResult implements Serializable {
     }
 
     public Double getAssignedScore() {
+        if (Objects.isNull(assignedScore)) {
+            return 0D;
+        }
         return assignedScore;
     }
 
@@ -65,6 +69,9 @@ public class ExamRecordResult implements Serializable {
     }
 
     public Double getPercentGrade() {
+        if (Objects.isNull(percentGrade)) {
+            return 0D;
+        }
         return percentGrade;
     }
 

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysReportController.java

@@ -114,9 +114,9 @@ public class SysReportController {
     @RequestMapping(value = "/common/list_inspect_college_not_absent", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
     public Result listInspectCollegeNotAbsent(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
-                                     @ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                     @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode) {
-        return ResultUtil.ok(tbExamStudentService.selectInspectCollegeListNotAbsent(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode));
+                                              @ApiParam(value = "考试id", required = false) @RequestParam(required = false) String examId,
+                                              @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode) {
+        return ResultUtil.ok(tbExamStudentService.selectInspectCollegeListNotAbsent(SystemConstant.convertIdToLong(schoolId), Objects.nonNull(examId) ? SystemConstant.convertIdToLong(examId) : null, courseCode));
     }
 
     @ApiOperation(value = "教师列表")
@@ -133,10 +133,10 @@ public class SysReportController {
     @RequestMapping(value = "/common/list_teacher_not_absent", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
     public Result listTeacherNotAbsent(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
-                              @ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                              @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                              @ApiParam(value = "考查学院id", required = false) @RequestParam(required = false) String inspectCollegeId) {
-        return ResultUtil.ok(tbExamStudentService.selectTeachListNotAbsent(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(inspectCollegeId) ? SystemConstant.convertIdToLong(inspectCollegeId) : null));
+                                       @ApiParam(value = "考试id", required = false) @RequestParam(required = false) String examId,
+                                       @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
+                                       @ApiParam(value = "考查学院id", required = false) @RequestParam(required = false) String inspectCollegeId) {
+        return ResultUtil.ok(tbExamStudentService.selectTeachListNotAbsent(SystemConstant.convertIdToLong(schoolId), Objects.nonNull(examId) ? SystemConstant.convertIdToLong(examId) : null, courseCode, Objects.nonNull(inspectCollegeId) ? SystemConstant.convertIdToLong(inspectCollegeId) : null));
     }
 
     @ApiOperation(value = "班级列表")