分班调整

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

@@ -253,7 +253,10 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
         );
         List<BaseClass> classCodes = classList.stream().filter(x -> x.getCode() != null).collect(Collectors.toList());
         Collections.sort(classCodes, Comparator.comparing(BaseClass::getCode));
-        String classCode = classList.get(0).getCode();
+        String classCode = null;
+        if(!classCodes.isEmpty()){
+            classCode = classCodes.get(0).getCode();
+        }
 
         Map<Long, BaseClass> classMap = classList.stream().collect(Collectors.toMap(BaseClass::getId, x -> x));
 

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

@@ -267,6 +267,10 @@ public class StudentTryReadingReportController {
                 }
             }
         }
+        List<String> roleList = StpUtil.getRoleList();
+        if(roleList.contains("CLASSTE") && roleList.contains("TEACHER")){
+            dto.setTeacherId(StpUtil.getLoginIdAsLong());
+        }
 
         List<BandingTaskClassPageVo> list = bandingTaskClassService.getList(classDto);
         return RT.ok(list);
@@ -322,26 +326,26 @@ public class StudentTryReadingReportController {
 
         statisticsVo.setArrivedCount(dataList.stream().filter(x -> x.getReportTime() != null).count());
         statisticsVo.setNotArrivedCount(dataList.stream().filter(x -> x.getReportTime() == null).count());
-        statisticsVo.setArrivedMaleCount(dataList.stream().filter(x -> x.getReportTime() != null && GenderDictionaryEnum.MALE.getCode().equals(x.getGender())).count());
-        statisticsVo.setArrivedFemaleCount(dataList.stream().filter(x -> x.getReportTime() != null && GenderDictionaryEnum.FEMALE.getCode().equals(x.getGender())).count());
+        statisticsVo.setArrivedMaleCount(dataList.stream().filter(x -> x.getReportTime() != null && GenderDictionaryEnum.MALE.getValue().equals(x.getGender())).count());
+        statisticsVo.setArrivedFemaleCount(dataList.stream().filter(x -> x.getReportTime() != null && GenderDictionaryEnum.FEMALE.getValue().equals(x.getGender())).count());
 
         statisticsVo.setStayMaleCount(dataList.stream().filter(
-                x -> GenderDictionaryEnum.MALE.getCode().equals(x.getGender())
+                x -> GenderDictionaryEnum.MALE.getValue().equals(x.getGender())
                         && StudyStatusEnum.InResidence.getCode().equals(x.getStduyStatusCn())
                         && x.getReportTime() != null
         ).count());
         statisticsVo.setStayFemaleCount(dataList.stream().filter(
-                x -> GenderDictionaryEnum.FEMALE.getCode().equals(x.getGender())
+                x -> GenderDictionaryEnum.FEMALE.getValue().equals(x.getGender())
                         && StudyStatusEnum.InResidence.getCode().equals(x.getStduyStatusCn())
                         && x.getReportTime() != null
         ).count());
         statisticsVo.setNotStayMaleCount(dataList.stream().filter(
-                x -> GenderDictionaryEnum.MALE.getCode().equals(x.getGender())
+                x -> GenderDictionaryEnum.MALE.getValue().equals(x.getGender())
                         && StudyStatusEnum.AttendDaySchool.getCode().equals(x.getStduyStatusCn())
                         && x.getReportTime() != null
         ).count());
         statisticsVo.setNotStayFemaleCount(dataList.stream().filter(
-                x -> GenderDictionaryEnum.FEMALE.getCode().equals(x.getGender())
+                x -> GenderDictionaryEnum.FEMALE.getValue().equals(x.getGender())
                         && StudyStatusEnum.AttendDaySchool.getCode().equals(x.getStduyStatusCn())
                         && x.getReportTime() != null
         ).count());

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

@@ -278,7 +278,7 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
             setCredentialNumber(student.getCredentialNumber());
         }});
 
-        if(record.getReportTime() != null){
+        if(record.getReportTime() != null && user != null){
 
             BaseStudentSchoolRoll roll = rollService.getOne(
                     new QueryWrapper<BaseStudentSchoolRoll>().lambda()

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

@@ -291,7 +291,7 @@
         <if test="dto.reportTimeStart != null and dto.reportTimeEnd != null">
             and t1.report_time between #{dto.reportTimeStart} and #{dto.reportTimeEnd}
         </if>
-        ORDER BY t1.report_time IS NULL DESC, t1.report_time DESC,t5.name is null desc,t5.name
+        ORDER BY t5.name IS NULL,t5.name DESC,t1.report_time IS NULL DESC, t1.report_time DESC
     </select>
     <select id="getTryReadingList" parameterType="com.xjrsoft.module.student.dto.StudentTryReadingReportPageDto" resultType="com.xjrsoft.module.student.vo.StudentReportRecordPlanPageVo">
         SELECT t1.id, t1.user_id, t4.name AS grade_name,t5.name AS class_name,t6.name AS teacher_name,