试读报到移动端班级统计

src/main/java/com/xjrsoft/module/student/controller/StudentTryReadingReportController.java

@@ -221,16 +221,18 @@ public class StudentTryReadingReportController {
             classDto.setBandingTaskId(plan.getBandingTaskId());
         }else{
             EnrollmentPlan enrollmentPlan = enrollmentPlanService.getById(dto.getEnrollmentPlanId());
-            List<BandingTask> list = bandingTaskService.list(
-                    new QueryWrapper<BandingTask>().lambda()
-                            .eq(BandingTask::getEnrollType, enrollmentPlan.getEnrollType())
-                            .eq(BandingTask::getGradeId, enrollmentPlan.getGradeId())
-                            .eq(BandingTask::getDeleteMark, DeleteMark.NODELETE.getCode())
-                            .eq(BandingTask::getEnabledMark, EnabledMark.ENABLED.getCode())
-                            .orderByDesc(BandingTask::getId)
-            );
-            if(!list.isEmpty()){
-                classDto.setBandingTaskId(list.get(0).getId());
+            if(enrollmentPlan != null){
+                List<BandingTask> list = bandingTaskService.list(
+                        new QueryWrapper<BandingTask>().lambda()
+                                .eq(BandingTask::getEnrollType, enrollmentPlan.getEnrollType())
+                                .eq(BandingTask::getGradeId, enrollmentPlan.getGradeId())
+                                .eq(BandingTask::getDeleteMark, DeleteMark.NODELETE.getCode())
+                                .eq(BandingTask::getEnabledMark, EnabledMark.ENABLED.getCode())
+                                .orderByDesc(BandingTask::getId)
+                );
+                if(!list.isEmpty()){
+                    classDto.setBandingTaskId(list.get(0).getId());
+                }
             }
         }
 

src/main/resources/mapper/student/StudentReportRecordMapper.xml

@@ -236,8 +236,8 @@
         LEFT JOIN xjr_dictionary_detail t8 ON t3.source = t8.code and t8.delete_mark = 0
         LEFT JOIN xjr_dictionary_detail t9 ON t3.stduy_status = t9.code and t9.delete_mark = 0
         LEFT JOIN banding_task t10 ON t5.banding_task_id = t10.id
-        LEFT JOIN base_grade t4 ON t10.grade_id = t4.id
         LEFT JOIN enrollment_plan t11 ON t11.id = t3.enrollment_plan_id
+        LEFT JOIN base_grade t4 ON t11.grade_id = t4.id
         LEFT JOIN student_report_plan t12 ON t12.id = t1.student_report_plan_id
         LEFT JOIN base_major_set t13 ON t13.id = t5.major_set_id
         LEFT JOIN xjr_dictionary_detail t14 ON t5.class_type = t14.code and t14.delete_mark = 0
@@ -308,8 +308,8 @@
         LEFT JOIN xjr_dictionary_detail t8 ON t3.source = t8.code and t8.delete_mark = 0
         LEFT JOIN xjr_dictionary_detail t9 ON t3.stduy_status = t9.code and t9.delete_mark = 0
         LEFT JOIN banding_task t10 ON t5.banding_task_id = t10.id
-        LEFT JOIN base_grade t4 ON t10.grade_id = t4.id
         LEFT JOIN enrollment_plan t11 ON t11.id = t3.enrollment_plan_id
+        LEFT JOIN base_grade t4 ON t11.grade_id = t4.id
         LEFT JOIN student_report_plan t12 ON t12.id = t1.student_report_plan_id
         LEFT JOIN base_major_set t13 ON t13.id = t5.major_set_id
         LEFT JOIN xjr_dictionary_detail t14 ON t5.class_type = t14.code and t14.delete_mark = 0