新生报到数据查询逻辑优化

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

@@ -365,6 +365,7 @@ public class BaseNewStudentController {
             }else if(el.getIsAdjust() == 0){
                 vo.setReportStatus("否");
             }
+            exportVos.add(vo);
         }
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
         EasyExcel.write(bot, BaseNewStudentExportVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(exportVos);

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

@@ -92,7 +92,7 @@
         LEFT JOIN xjr_user t12 ON t11.teacher_id = t12.id
         LEFT JOIN student_report_record t13 ON t9.id = t13.user_id
         and t13.base_semester_id = #{dto.baseSemesterId} and t13.delete_mark = 0
-        WHERE t1.delete_mark = 0 and (t1.delete_reason is null or t1.delete_reason = '')
+        WHERE t1.delete_mark = 0 and (t1.delete_reason is null or t1.delete_reason = '') AND t9.delete_mark = 0
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')
         </if>
@@ -169,7 +169,7 @@
         SELECT t1.id,t1.graduate_school,t1.name,t1.gender,t2.name AS gender_cn,t1.credential_number,t1.height,t1.weight,t1.family_mobile,
         t1.score,t1.graduate_class,t1.source,t5.name as source_cn,t1.stduy_status,t3.name AS stduy_status_cn,t1.mobile,t7.name as first_ambition,
         t8.name as second_ambition,t1.is_adjust,t1.status,ifnull(t11.name,t1.delete_reason) AS class_name,t12.name AS teacher_name ,t13.report_time,
-        t9.id as user_id,(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 base_new_student t1
+        t9.id as user_id,(select count(*) from student_report_record where user_id = t9.id and base_semester_id = #{dto.baseSemesterId} and delete_mark = 0) as is_report FROM base_new_student t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.gender = t2.code AND t2.item_id = 2023000000000000004
         LEFT JOIN xjr_dictionary_detail t3 ON t1.stduy_status = t3.code AND t3.item_id = 2023000000000000030
         LEFT JOIN xjr_dictionary_detail t5 ON t1.source = t5.code AND t5.item_id = 2023000000000000028
@@ -181,7 +181,7 @@
         LEFT JOIN base_class t11 ON t10.class_id = t11.id
         LEFT JOIN xjr_user t12 ON t11.teacher_id = t12.id
         LEFT JOIN student_report_record t13 ON t9.id = t13.user_id and t13.base_semester_id = #{dto.baseSemesterId} and t13.delete_mark = 0
-        WHERE t1.delete_mark = 0
+        WHERE t1.delete_mark = 0 AND t9.delete_mark = 0 and (t1.delete_reason is null or t1.delete_reason = '')
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name}, '%')
         </if>