新生报到调整

src/main/java/com/xjrsoft/module/banding/service/IBandingTaskClassService.java

@@ -11,6 +11,7 @@ import com.xjrsoft.module.banding.vo.BandingTaskClassReportStatisticsVo;
 import com.xjrsoft.module.banding.vo.BandingTaskClassStudentListVo;
 import com.xjrsoft.module.banding.vo.BandingTaskClassSureListVo;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.student.dto.StudentTryReadingReportPageDto;
 
 import java.util.List;
 import java.util.Map;
@@ -69,7 +70,7 @@ public interface IBandingTaskClassService extends MPJBaseService<BandingTaskClas
 
     Boolean deleteClass(List<Long> ids);
 
-    BandingTaskClassReportStatisticsVo getTryReadingReportClassStatistics(Long classId);
+    BandingTaskClassReportStatisticsVo getTryReadingReportClassStatistics(StudentTryReadingReportPageDto dto);
 
     Boolean removeByBaseClass(BaseClass baseClass);
 }

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassServiceImpl.java

@@ -553,10 +553,9 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
     }
 
     @Override
-    public BandingTaskClassReportStatisticsVo getTryReadingReportClassStatistics(Long classId) {
+    public BandingTaskClassReportStatisticsVo getTryReadingReportClassStatistics(StudentTryReadingReportPageDto dto) {
         BandingTaskClassReportStatisticsVo result = new BandingTaskClassReportStatisticsVo();
-        StudentTryReadingReportPageDto dto = new StudentTryReadingReportPageDto();
-        if(classId == 0L){
+        if(dto.getClassId() == 0L){
             StudentReportPlan plan = reportPlanService.getLastTryReadingPlan();
             BandingTask bandingTask = bandingTaskMapper.selectById(plan.getBandingTaskId());
             List<EnrollmentPlan> enrollmentPlans = enrollmentPlanMapper.selectList(
@@ -571,7 +570,7 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                 dto.setEnrollmentPlanId(enrollmentPlans.get(0).getId());
             }
         }else{
-            BandingTaskClass taskClass = this.getById(classId);
+            BandingTaskClass taskClass = this.getById(dto.getClassId());
             BandingTask task = bandingTaskMapper.selectById(taskClass.getBandingTaskId());
             List<EnrollmentPlan> enrollmentPlanList = enrollmentPlanMapper.selectList(
                     new QueryWrapper<EnrollmentPlan>().lambda()
@@ -586,7 +585,7 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
             }
         }
 
-        dto.setClassId(classId);
+        dto.setClassId(dto.getClassId());
         List<StudentReportRecordPlanPageVo> tryReadingList = reportRecordMapper.getTryReadingList(dto);
 
         result.setAllCount(tryReadingList.size());

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

@@ -126,7 +126,10 @@ public class BaseNewStudentReportController {
     @SaCheckPermission("studentreportrecord:detail")
     @XjrLog(value = "班级数据统计")
     public RT<BandingTaskClassReportStatisticsVo> classStatistics(@RequestParam Long classId){
-        return RT.ok(bandingTaskClassService.getTryReadingReportClassStatistics(classId));
+        return RT.ok(bandingTaskClassService.getTryReadingReportClassStatistics(new StudentTryReadingReportPageDto(){{
+            setClassId(classId);
+            setReportCategory(3);
+        }}));
     }
 
     @GetMapping(value = "/statistics")

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

@@ -287,7 +287,10 @@ public class StudentTryReadingReportController {
     @SaCheckPermission("studentreportrecord:detail")
     @XjrLog(value = "班级数据统计")
     public RT<BandingTaskClassReportStatisticsVo> classStatistics(@RequestParam Long classId){
-        return RT.ok(bandingTaskClassService.getTryReadingReportClassStatistics(classId));
+        return RT.ok(bandingTaskClassService.getTryReadingReportClassStatistics(new StudentTryReadingReportPageDto(){{
+            setClassId(classId);
+            setReportCategory(2);
+        }}));
     }
 
     @GetMapping(value = "/statistics")