bug 分数段

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/dto/excel/AssignDto.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 public class AssignDto {
 
-    @ExcelNote(value = "考试编号")
+    @ExcelNote(value = "考试id")
     @NotNull
     private String examId;
 

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/execute/AsyncDataCalculateTempleteService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.TBTask;
+import com.qmth.teachcloud.common.enums.TaskResultEnum;
 import com.qmth.teachcloud.common.enums.TaskStatusEnum;
 import com.qmth.teachcloud.common.service.CacheService;
 import com.qmth.teachcloud.common.service.TBTaskService;
@@ -62,13 +63,16 @@ public class AsyncDataCalculateTempleteService extends AsyncCalculateTaskTemplet
             TaskCalculateService taskCalculateService = SpringContextHolder.getBean(TaskCalculateService.class);
             taskCalculateService.dataCalculate(map);
             tbExamCourse.setPublishStatus(PublishStatusEnum.UN_PUBLISH);
+            tbTask.setResult(TaskResultEnum.SUCCESS);
         }catch (Exception e){
             log.error("请求出错", e);
             exception = e.getMessage();
             tbTask.setRemark(exception);
+            tbTask.setResult(TaskResultEnum.ERROR);
             tbExamCourse.setPublishStatus(oldStatus);
         }finally {
             tbExamCourseService.updateById(tbExamCourse);
+            tbTaskService.updateById(tbTask);
             if (Objects.isNull(exception)){
                 cacheService.removeExamStudentReportCache();
                 cacheService.removeCollegeDeanCache();

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

@@ -503,7 +503,7 @@ public class BasicDatasourceController {
 
             String teacherCode;
             Long orgId = null;
-            if (tbExaminationRelations.size() != 1){
+            if (tbExaminationRelations.size() == 0){
                 teacherCode = teacherInfo;
             }else {
                 List<String> teacherCodeList = tbExaminationRelations.stream().map(TBExaminationRelation::getTeacherCode).distinct().collect(Collectors.toList());

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

@@ -43,7 +43,7 @@ public class SysReportController {
     @ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TBExamResult.class)})
     public Result listSemester(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId) {
         QueryWrapper<TBExam> tbExamQueryWrapper = new QueryWrapper<>();
-        tbExamQueryWrapper.select(" DISTINCT id,semester ").eq("school_id", SystemConstant.convertIdToLong(schoolId));
+        tbExamQueryWrapper.select(" DISTINCT id,semester,exam_time ").eq("school_id", SystemConstant.convertIdToLong(schoolId)).orderByDesc("exam_time");
         List<TBExam> tbExamList = tbExamService.list(tbExamQueryWrapper);
         List<TBExamResult> tbExamResultList = null;
         if (Objects.nonNull(tbExamList) && tbExamList.size() > 0) {