学生报到

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

@@ -354,6 +354,8 @@ public class StudentReportRecordController {
                 return RT.ok(new PageOutput<>());
             }
             dto.setClassId(classId);
+            Long planId = planService.getEffectivePlanId(dto.getTeacherId());
+            dto.setStudentReportPlanId(planId);
         }
         Page<StudentReportRecordPlanPageVo> planPage = studentReportRecordService.getPlanPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<StudentReportRecordPlanPageVo> pageOutput = ConventPage.getPageOutput(planPage, StudentReportRecordPlanPageVo.class);

src/main/java/com/xjrsoft/module/student/service/impl/StudentReportPlanServiceImpl.java

@@ -200,10 +200,9 @@ public class StudentReportPlanServiceImpl extends MPJBaseServiceImpl<StudentRepo
                         .leftJoin(StudentReportPlanClassRelation.class, StudentReportPlanClassRelation::getStudentReportPlanId, StudentReportPlan::getId)
                         .leftJoin(BaseClass.class, BaseClass::getId, StudentReportPlanClassRelation::getClassId)
                         .eq(teacherId != null, BaseClass::getTeacherId, teacherId)
-                        .eq(StudentReportPlan::getDeleteMark, DeleteMark.NODELETE.getCode())
                         .eq(StudentReportPlan::getEnabledMark, EnabledMark.ENABLED.getCode())
-                        .ge(StudentReportPlan::getStartTime, now)
-                        .le(StudentReportPlan::getEndTime, now)
+                        .le(StudentReportPlan::getStartTime, now)
+                        .ge(StudentReportPlan::getEndTime, now)
                         .orderByDesc(StudentReportPlan::getId)
         );
         if(!list.isEmpty()){