|
@@ -390,8 +390,10 @@ public class StudentReportRecordController {
|
|
|
if(dto.getClassId() == null){
|
|
if(dto.getClassId() == null){
|
|
|
dto.setClassId(classId);
|
|
dto.setClassId(classId);
|
|
|
}
|
|
}
|
|
|
- Long planId = planService.getEffectivePlanId(dto.getTeacherId(), dto.getClassId());
|
|
|
|
|
- dto.setStudentReportPlanId(planId);
|
|
|
|
|
|
|
+ if(dto.getStudentReportPlanId() == null){
|
|
|
|
|
+ Long planId = planService.getEffectivePlanId(dto.getTeacherId(), dto.getClassId());
|
|
|
|
|
+ dto.setStudentReportPlanId(planId);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
Page<StudentReportRecordPlanPageVo> planPage = studentReportRecordService.getPlanPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
|
|
Page<StudentReportRecordPlanPageVo> planPage = studentReportRecordService.getPlanPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
|
|
|
PageOutput<StudentReportRecordPlanPageVo> pageOutput = ConventPage.getPageOutput(planPage, StudentReportRecordPlanPageVo.class);
|
|
PageOutput<StudentReportRecordPlanPageVo> pageOutput = ConventPage.getPageOutput(planPage, StudentReportRecordPlanPageVo.class);
|