Merge remote-tracking branch 'origin/ywx' into wn

smarking/src/main/java/com/xhkjedu/smarking/controller/exam/MsClassStudentController.java

@@ -162,11 +162,18 @@ public class MsClassStudentController {
      **/
     @PostMapping("/search_student")
     public ResultVo searchStudent(@RequestBody CStudentVo cs) {
+        Integer page = cs.getPage();
+        Integer size = cs.getPageSize();
         N_Utils.validation(new Object[]{
                 cs.getExamid(), "考试id", 1
                 , cs.getSchoolid(), "学校id", 1
                 , cs.getClasstype(), "班级类型", 1
+                , page, "页码", 1
+                , size, "条数", 1
         });
-        return new ResultVo(0, "查询成功！", msClassStudentService.searchStudent(cs));
+        PageHelper.startPage(page, size);
+        List<Map> list = msClassStudentService.searchStudent(cs);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "查询成功！", pageResult);
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/exam/CStudentVo.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.smarking.vo.exam;
 
+import com.xhkjedu.model.BaseBean;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @Date 2024/10/21 17:36
  **/
 @Data
-public class CStudentVo {
+public class CStudentVo extends BaseBean {
     //阅卷考试学生ID
     private Integer mcsid;
     //考试id

smarking/src/main/resources/mapper/exam/MsClassStudentMapper.xml

@@ -112,13 +112,13 @@
     <delete id="deleteByStu">
         delete ps.*,cs.*
         from ms_class_student cs left join ms_paper_student ps on cs.examid=ps.examid and cs.subjectid=ps.subjectid and cs.studentid=ps.studentid
-        where cs.examid=#{cs.examid} and cs.studentid=#{cs.studentid}
+        where cs.examid=#{cs.examid} and cs.studentid=#{cs.studentid} and cs.subjectid=#{cs.subjectid}
     </delete>
     <!--移除班级学生-->
     <delete id="deleteByClass">
         delete ps.*,cs.*,c.*
         from ms_class c left join ms_class_student cs on c.examid=cs.examid and c.classid=cs.classid
                         left join ms_paper_student ps on cs.examid=ps.examid and cs.studentid=ps.studentid
-        where c.examid=#{c.examid} and c.classid=#{c.classid}
+        where c.examid=#{cs.examid} and c.classid=#{cs.classid}
     </delete>
 </mapper>