班级成绩查看导出

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -183,7 +183,7 @@ public class ScheduleController {
             }
         }
 
-        return RT.error("未能查询到当前周次");
+        return RT.ok();
     }
 
 

src/main/java/com/xjrsoft/module/xycxedu/controller/ExamSubjectScoreController.java

@@ -98,7 +98,7 @@ public class ExamSubjectScoreController {
     @SaCheckPermission("examsubjectscore:detail")
     @XjrLog("班级成绩查询(分页)")
     public RT<PageOutput<ClassStudentScorePageVo>> classStudentScorePage(@Valid ClassStudentScorePageDto dto){
-        if(dto.getTreeType() != 4 && dto.getTreeId() == null ){
+        if(dto.getTreeType() != 4 || dto.getTreeId() == null ){
             return RT.ok(new PageOutput<>());
         }
         PageOutput<ClassStudentScorePageVo> pageOutput = scoreService.getClassStudentScorePage(dto);

src/main/java/com/xjrsoft/module/xycxedu/service/impl/ExamSubjectScoreServiceImpl.java

@@ -141,7 +141,11 @@ public class ExamSubjectScoreServiceImpl extends MPJBaseServiceImpl<ExamSubjectS
         if(roleList.size() == 2 && roleList.contains("TEACHER") && roleList.contains("CLASSTE")){
             dto.setTeacherId(StpUtil.getLoginIdAsLong());
         }
+
         BaseStudentUserPageDto studentDto = BeanUtil.toBean(dto, BaseStudentUserPageDto.class);
+        if(dto.getTreeType() != null && dto.getTreeType() == 4){
+            studentDto.setQueryId(dto.getTreeId());
+        }
         Page<BaseStudentUserPageVo> studentPage = studentManagerService.getStudentPage(new Page<>(dto.getLimit(), dto.getSize()), studentDto);
 
         Set<Long> userIdSet = studentPage.getRecords().stream().map(x -> Long.parseLong(x.getId())).collect(Collectors.toSet());