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

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

@@ -1,57 +0,0 @@
-package com.xhkjedu.smarking.controller.exam;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.xhkjedu.smarking.model.exam.MsClass;
-import com.xhkjedu.smarking.service.exam.MsClassService;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.utils.PageUtil;
-import com.xhkjedu.vo.PageResult;
-import com.xhkjedu.vo.ResultVo;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷考试班级表相关操作
- * @Author auto
- * @Date 2024-10-15
- */
-@RestController
-@RequestMapping("/msClass")
-public class MsClassController {
-    @Resource
-    private MsClassService msClassService;
-
-    /**
-     * @Description 新增
-     * @Param [msClass]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/save")
-    public ResultVo save(@RequestBody MsClass msClass) {
-        msClassService.add(msClass);
-        return new ResultVo(0, "保存成功！");
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msClass]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/list")
-    public ResultVo queryList(@RequestBody MsClass msClass) {
-        Integer page = msClass.getPage();
-        Integer size = msClass.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsClass> list = msClassService.queryList(msClass);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
-    }
-}

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷考试学生表相关操作
@@ -25,11 +26,11 @@ public class MsClassStudentController {
     private MsClassStudentService msClassStudentService;
 
     /**
+     * @return com.xhkjedu.vo.ResultVo
      * @Description 新增
      * @Param [msClassStudent]
      * @Author auto
      * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/save")
     public ResultVo save(@RequestBody MsClassStudent msClassStudent) {
@@ -38,20 +39,27 @@ public class MsClassStudentController {
     }
 
     /**
+     * @return com.xhkjedu.vo.ResultVo
      * @Description 列表
      * @Param [msClassStudent]
      * @Author auto
      * @Date 2024-10-15
-     * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("/list")
     public ResultVo queryList(@RequestBody MsClassStudent msClassStudent) {
+        Integer examid = msClassStudent.getExamid();
+        Integer schoolid = msClassStudent.getSchoolid();
         Integer page = msClassStudent.getPage();
         Integer size = msClassStudent.getPageSize();
-        N_Utils.validation(new Object[]{page, "显示页码", 1, size, "显示条数", 1});
-        PageHelper.startPage(page, size);
-        List<MsClassStudent> list = msClassStudentService.queryList(msClassStudent);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
+        N_Utils.validation(new Object[]{examid, "考试id", 1, schoolid, "学校id", 1});
+        if (N_Utils.isEmptyInteger(page)) {
+            List<Map> list = msClassStudentService.queryList(msClassStudent);
+            return new ResultVo(0, "查询成功！", list);
+        } else {
+            PageHelper.startPage(page, size);
+            List<Map> list = msClassStudentService.queryList(msClassStudent);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "查询成功！", pageResult);
+        }
     }
 }

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

@@ -136,26 +136,6 @@ public class MsSubjectInvigilateController {
         return new ResultVo(0, "删除成功！");
     }
 
-    /**
-     * @Description 教师监考-监控列表
-     * @Date 2024/10/18 16:42
-     * @Author YWX
-     * @Param [subject]
-     * @Return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/list_jk")
-    public ResultVo listJkSubject(@RequestBody MsSubject subject) {
-        Integer teacherid = subject.getTeacherid();
-        Integer esstate = subject.getEsstate();
-        Integer page = subject.getPage();
-        Integer pageSize = subject.getPageSize();
-        N_Utils.validation(new Object[]{teacherid, "教师id", 1, page, "页码", 1, pageSize, "显示条数", 1});
-        PageHelper.startPage(page, pageSize);
-        List<Map> list = msSubjectInvigilateService.listJkSubject(0, teacherid, esstate);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
-    }
-
     /**
      * @Description 教师监考-监控列表（兼容集团校）
      * @Date 2024/10/18 16:48
@@ -191,26 +171,6 @@ public class MsSubjectInvigilateController {
         return new ResultVo(0, "查询成功！", msSubjectInvigilateService.getJtJkSubjectNum(teacherid));
     }
 
-    /**
-     * @Description 管理员监考-监控列表
-     * @Date 2024/10/18 16:55
-     * @Author YWX
-     * @Param [subject]
-     * @Return com.xhkjedu.vo.ResultVo
-     **/
-    @PostMapping("/list_ejk")
-    public ResultVo listExamJkSubject(@RequestBody MsSubject subject) {
-        Integer examid = subject.getExamid();
-        Integer esstate = subject.getEsstate();
-        Integer page = subject.getPage();
-        Integer pageSize = subject.getPageSize();
-        N_Utils.validation(new Object[]{examid, "考试id", 1, page, "页码", 1, pageSize, "显示条数", 1});
-        PageHelper.startPage(page, pageSize);
-        List<Map> list = msSubjectInvigilateService.listJkSubject(examid, 0, esstate);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "查询成功！", pageResult);
-    }
-
     /**
      * @Description 管理员监考-监控列表（兼容集团校）
      * @Date 2024/10/18 16:56

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsClassStudentMapper.java

@@ -24,4 +24,7 @@ public interface MsClassStudentMapper extends TkMapper<MsClassStudent> {
 
     //根据考号搜索参加考试学生
     List<Map> listStudentByExamIdAnExamno(@Param("examid") Integer examid, @Param("examno") String examno,@Param("subjectid") String subjectid);
+
+    //考生信息列表
+    List<Map> listAll(@Param("cs") MsClassStudent msClassStudent);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsSubjectMapper.java

@@ -32,4 +32,7 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
     int updatePtstateByMpid(@Param("mpid")Integer mpid,@Param("ptstate")Integer ptstate);
     //更改科目试卷题块设置状
     int updatePbstateByMpid(@Param("mpid")Integer mpid,@Param("pbstate")Integer pbstate);
+
+    //获取考试下所有科目名称
+    List<Map<String,String>> listSubjectNameByExamId(@Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/exam/MsClassStudent.java

@@ -28,4 +28,12 @@ public class MsClassStudent extends BaseBean {
     @Transient
     //考号
     private String examno;
+
+    @Transient
+    //学校id
+    private Integer schoolid;
+
+    @Transient
+    //学生姓名
+    private String studentname;
 }

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsClassService.java

@@ -1,41 +0,0 @@
-package com.xhkjedu.smarking.service.exam;
-
-import com.xhkjedu.smarking.mapper.exam.MsClassMapper;
-import com.xhkjedu.smarking.model.exam.MsClass;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @Description 阅卷考试班级表 服务实现类
- * @Author auto
- * @Date 2024-10-15
- */
-@Service
-public class MsClassService {
-    @Resource
-    private MsClassMapper msClassMapper;
-
-    /**
-     * @Description 新增
-     * @Param [msClass]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return void
-     **/
-    public void add(MsClass msClass){
-        msClassMapper.insert(msClass);
-    }
-
-    /**
-     * @Description 列表
-     * @Param [msClass]
-     * @Author auto
-     * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.exam.MsClass>
-     **/
-    public List<MsClass> queryList(MsClass msClass){
-        return msClassMapper.selectAll();
-    }
-}

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsClassStudentService.java

@@ -1,11 +1,12 @@
 package com.xhkjedu.smarking.service.exam;
 
 import com.xhkjedu.smarking.mapper.exam.MsClassStudentMapper;
+import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.model.exam.MsClassStudent;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Description 阅卷考试学生表 服务实现类
@@ -16,26 +17,37 @@ import java.util.List;
 public class MsClassStudentService {
     @Resource
     private MsClassStudentMapper msClassStudentMapper;
+    @Resource
+    private MsSubjectMapper msSubjectMapper;
 
     /**
+     * @return void
      * @Description 新增
      * @Param [msClassStudent]
      * @Author auto
      * @Date 2024-10-15
-     * @return void
      **/
-    public void add(MsClassStudent msClassStudent){
+    public void add(MsClassStudent msClassStudent) {
         msClassStudentMapper.insert(msClassStudent);
     }
 
     /**
+     * @return java.util.List<com.xhkjedu.smarking.model.exam.MsClassStudent>
      * @Description 列表
      * @Param [msClassStudent]
      * @Author auto
      * @Date 2024-10-15
-     * @return java.util.List<com.xhkjedu.smarking.model.exam.MsClassStudent>
      **/
-    public List<MsClassStudent> queryList(MsClassStudent msClassStudent){
-        return msClassStudentMapper.selectAll();
+    public List<Map> queryList(MsClassStudent msClassStudent) {
+        List<Map<String, String>> subjects = msSubjectMapper.listSubjectNameByExamId(msClassStudent.getExamid());
+        Map<String, String> subjectMap = new HashMap<>();
+        for (Map<String, String> subject : subjects) {
+            subjectMap.put(subject.get("subjectid"), subject.get("subjectname"));
+        }
+        List<Map> list = msClassStudentMapper.listAll(msClassStudent);
+        for (Map map : list) {
+            map.put("subjectname", subjectMap.get(map.get("subjectid")));
+        }
+        return list;
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsSubjectInvigilateService.java

@@ -157,24 +157,6 @@ public class MsSubjectInvigilateService {
         msSubjectInvigilateMapper.delByMsId(msid);
     }
 
-    /**
-     * @Description 教师监考-监控列表
-     * @Date 2024/10/18 16:15
-     * @Author YWX
-     * @Param [examid, teacherid, esstate]
-     * @Return java.util.List<java.util.Map>
-     **/
-    public List<Map> listJkSubject(int examid, Integer teacherid, Integer esstate) {
-        int timestamp = N_Utils.getSecondTimestamp();
-        String strtime = N_Utils.getStrtimeTimestamp(timestamp, "yyyy-MM-dd HH:mm:ss");
-        List<Map> list = msSubjectInvigilateMapper.listJkSubject(examid, teacherid, esstate, strtime);
-        for (Map map : list) {
-            List<Map> classList = setClassList(map);
-            map.put("classList", classList);
-        }
-        return list;
-    }
-
     private List<Map> setClassList(Map map) {
         List<Map> classes = JSON.parseArray(map.get("classnames").toString(), Map.class);
         List<Map> classList = new ArrayList<>();

smarking/src/main/java/com/xhkjedu/smarking/service/exam/MsSubjectService.java

@@ -35,7 +35,7 @@ public class MsSubjectService {
 
     public void updateById(MsSubject msSubject) {
         msSubject.setHandletime(N_Utils.getSecondTimestamp());
-        msSubjectMapper.updateByPrimaryKey(msSubject);
+        msSubjectMapper.updateByPrimaryKeySelective(msSubject);
     }
 
     /**

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

@@ -18,7 +18,16 @@
         order by c.classtype,c.classorder,mc.mcid
     </select>
     <!--考试关联学校班级-->
-    <select id="listSchoolClassByExamId" resultType="java.util.Map">
+    <resultMap id="schoolClass" type="java.util.Map">
+        <result property="schoolid" column="schoolid" />
+        <result property="schoolname" column="schoolname" />
+        <collection property="classes" ofType="java.util.Map" javaType="java.util.List" >
+            <result property="classid" column="classid" />
+            <result property="classname" column="classname" />
+            <result property="classnum" column="classnum" />
+        </collection>
+    </resultMap>
+    <select id="listSchoolClassByExamId" resultMap="schoolClass">
         select c.schoolid,s.schoolname,ts.classid,ts.classname
         ,(select count(*) from ms_class_student cs where cs.examid=c.examid and cs.classid=c.classid) as classnum
         from ms_class c left join t_school s on c.schoolid=s.schoolid

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

@@ -38,5 +38,22 @@
         and u.usertype=2 and u.examno like concat('%', #{examno}, '%')
         group by s.studentid
     </select>
+    <!--考生信息列表-->
+    <select id="listAll" resultType="java.util.Map">
+        select es.mcsid,es.classid,es.subjectid,u.username,u.examno,u.usersex,ec.classname
+        from ms_class_student es left join t_user u on es.studentid = u.userid
+        left join ms_class ec on es.classid=ec.classid and es.examid=ec.examid and es.subjectid=ec.subjectid
+        where es.examid=#{cs.examid} and ec.schoolid=#{cs.schoolid}
+        <if test="cs.classid!=null and cs.classid!=0">
+            and es.classid=#{cs.classid}
+        </if>
+        <if test="cs.subjectid!=null and cs.subjectid!='' and cs.subjectid!='0'">
+            and es.subjectid=#{cs.subjectid}
+        </if>
+        <if test="cs.studentname!=null and cs.studentname!=''">
+            and (u.username like '%${cs.studentname}%' or u.studentno like '%${cs.studentname}%')
+        </if>
+        order by es.mcsid desc
+    </select>
 
 </mapper>

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

@@ -43,6 +43,10 @@
         from ms_subject s left join ms_exam e on s.examid=e.examid
         where s.examid=#{examid} and s.leaderid=#{leaderid} order by s.msid
     </select>
+    <!--获取考试下所有科目名称-->
+    <select id="listSubjectNameByExamId" resultType="java.util.Map">
+        select subjectid,subjectname from ms_subject where examid=#{examid}
+    </select>
 
     <!--更改科目试卷模板设置状态-->
     <update id="updatePtstateByMpid">