开学报到调整

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

@@ -466,6 +466,10 @@ public class StudentReportRecordController {
             if(pageVo.getReportTime() != null){
                 excelVo.setReportTime(sdf.format(pageVo.getReportTime()));
             }
+            excelVo.setIsReport("否");
+            if(pageVo.getIsReport() != null && pageVo.getIsReport() == 1){
+                excelVo.setIsReport("是");
+            }
 
             dataList.add(excelVo);
         }

src/main/java/com/xjrsoft/module/student/vo/StudentReportRecordExcelVo.java

@@ -62,6 +62,11 @@ public class StudentReportRecordExcelVo {
     @ApiModelProperty("报到时间")
     private String reportTime;
 
+    @ExcelProperty("报到状态")
+    @ApiModelProperty("是否已报到（1:是 0:否）")
+    private String isReport;
+
+    @ExcelProperty("家长电话")
     @ApiModelProperty("家长电话")
     private String parentMobile;
 

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

@@ -84,9 +84,7 @@
         LEFT JOIN xjr_dictionary_detail t9 ON t2.stduy_status = t9.code
         LEFT JOIN xjr_dictionary_detail t10 ON t2.archives_status = t10.code
         WHERE t1.delete_mark = 0 AND t1.enabled_mark = 1
-        <if test="dto.studentReportPlanId != null">
             and t1.student_report_plan_id = #{dto.studentReportPlanId}
-        </if>
         <if test="dto.keyword != null and dto.keyword != ''">
             and t1.name like concat('%', #{dto.keyword},'%')
         </if>
@@ -103,7 +101,7 @@
             and t5.name like concat('%', #{dto.className}, '%')
         </if>
         <if test="dto.credentialNumber != null and dto.credentialNumber != ''">
-            and t3.credentialNumber like concat('%', #{dto.credentialNumber}, '%')
+            and t3.credential_number like concat('%', #{dto.credentialNumber}, '%')
         </if>
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
             and t2.archives_status = #{dto.archivesStatus}
@@ -164,7 +162,7 @@
             and t5.name like concat('%', #{dto.className}, '%')
         </if>
         <if test="dto.credentialNumber != null and dto.credentialNumber != ''">
-            and t3.credentialNumber like concat('%', #{dto.credentialNumber}, '%')
+            and t3.credential_number like concat('%', #{dto.credentialNumber}, '%')
         </if>
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
             and t2.archives_status = #{dto.archivesStatus}