新生报到调整

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

@@ -147,6 +147,19 @@ public class StudentReportRecordController {
     @ApiOperation(value="班主任查询(分页)")
     @SaCheckPermission("studentreportrecord:detail")
     public RT<PageOutput<StudentReportRecordPageVo>> mobilePage(@Valid StudentReportRecordPageDto dto){
+        if(dto.getBaseSemesterId() == null){
+            LambdaQueryWrapper<BaseSemester> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper
+                    .orderByDesc(BaseSemester::getStartDate)
+                    .select(BaseSemester.class,x -> VoToColumnUtil.fieldsToColumns(BaseSemester.class).contains(x.getProperty()));
+            List<BaseSemester> semesterList = semesterService.list(queryWrapper);
+            if(!semesterList.isEmpty()){
+                dto.setBaseSemesterId(semesterList.get(0).getId());
+            }
+        }
+        if(dto.getTeacherId() == null){
+            dto.setTeacherId(StpUtil.getLoginIdAsLong());
+        }
         Page<StudentReportRecordPageVo> page = studentReportRecordService.getMobilePage(new Page<>(dto.getLimit(), dto.getSize()), dto);
         PageOutput<StudentReportRecordPageVo> pageOutput = ConventPage.getPageOutput(page, StudentReportRecordPageVo.class);
         return RT.ok(pageOutput);

src/main/java/com/xjrsoft/module/student/dto/StudentReportRecordPageDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.student.dto;
 
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,6 +15,9 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class StudentReportRecordPageDto extends PageInput {
+    @ApiModelProperty("学期id")
+    private Long baseSemesterId;
 
-
+    @ApiModelProperty("教师id")
+    private Long teacherId;
 }

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

@@ -45,9 +45,9 @@
         LEFT JOIN xjr_dictionary_detail t4 ON t2.stduy_status = t4.code
         LEFT JOIN base_student_family t5 ON t5.user_id = t1.id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
-        AND t2.class_id = #{dto.teacherId}
-        <if test="dto.name != null and dto.name != ''">
-            t1.name like concat('%', #{dto.name},'%')
+        AND t3.teacher_id = #{dto.teacherId}
+        <if test="dto.keyword != null and dto.keyword != ''">
+            t1.name like concat('%', #{dto.keyword},'%')
         </if>
         ORDER BY t1.create_date DESC, t2.create_date DESC,t3.create_date DESC
     </select>