新生报到调整

src/main/java/com/xjrsoft/module/base/dto/WhitelistManagementPageDto.java

@@ -37,4 +37,7 @@ public class WhitelistManagementPageDto extends PageInput {
 
     @ApiModelProperty("就读方式")
     private String readWay;
+
+    @ApiModelProperty("是否临时性的(1:是 0:否)")
+    private Integer isTemporary;
 }

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

@@ -182,6 +182,16 @@ public class StudentReportRecordController {
                 dto.setBaseSemesterId(semesterList.get(0).getId());
             }
         }
+        if(dto.getGradeId() == null){
+            LambdaQueryWrapper<BaseGrade> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper
+                    .orderByDesc(BaseGrade::getTitle)
+                    .select(BaseGrade.class,x -> VoToColumnUtil.fieldsToColumns(BaseGrade.class).contains(x.getProperty()));
+            List<BaseGrade> gradeList = gradeService.list(queryWrapper);
+            if(!gradeList.isEmpty()){
+                dto.setGradeId(gradeList.get(0).getId());
+            }
+        }
         StudentReportRecordStatisticsVo statisticsVo = studentReportRecordService.getClassStatistics(dto);
         if(statisticsVo == null){
             statisticsVo = new StudentReportRecordStatisticsVo();

src/main/resources/mapper/base/WhitelistManagement.xml

@@ -32,6 +32,9 @@
         <if test="dto.classId != null">
             AND t3.id = #{dto.classId}
         </if>
+        <if test="dto.isTemporary != null">
+            AND t1.is_temporary = #{dto.isTemporary}
+        </if>
     </select>
 
     <select id="getName" resultType="java.lang.String">

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

@@ -33,13 +33,13 @@
         ) AS arrived_count
         FROM base_class t1
         INNER JOIN xjr_user t2 ON t1.teacher_id = t2.id
-        WHERE t1.delete_mark = 0
+        WHERE t1.delete_mark = 0 and t1.grade_id = #{dto.gradeId}
         AND t1.teacher_id = #{dto.teacherId}
     </select>
     <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.StudentReportRecordPageDto"
             resultType="com.xjrsoft.module.student.vo.StudentReportRecordPageVo">
         SELECT t1.id as user_id,t1.name,t1.credential_number,t1.mobile,t4.name AS stduy_status_cn,t5.telephone AS parent_mobile,
-        (select count(*) from student_report_record where user_id = t1.id and base_semester_id = #{dto.baseSemesterId}) as is_report FROM xjr_user t1
+        (select count(*) from student_report_record where user_id = t1.id and base_semester_id = #{dto.baseSemesterId} and delete_mark = 0) as is_report FROM xjr_user t1
         INNER JOIN base_student_school_roll t2 ON t1.id = t2.user_id
         INNER JOIN base_class t3 ON t2.class_id = t3.id
         LEFT JOIN xjr_dictionary_detail t4 ON t2.stduy_status = t4.code