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

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

@@ -74,56 +74,7 @@ public class MsSubjectSearchController {
     }
 
     /**
-     * 考试科目阅卷设置列表
-     *
-     * @return com.xhkjedu.vo.ResultVo
-     * @Param [base]
-     * @Author ywx
-     * @Date 2022/7/21 16:59
-     **/
-    @PostMapping("/list_subject")
-    public ResultVo listSubject(@RequestBody ESubjectVo base) {
-        Integer examid = base.getExamid();
-        N_Utils.validation(new Object[]{examid, "考试id", 1});
-        Map map = subjectSearchService.listSubject(examid);
-        return new ResultVo(0, "获取成功！", map);
-    }
-
-    /**
-     * 主监考人查找
-     *
-     * @return com.xhkjedu.vo.ResultVo
-     * @Param [base]
-     * @Author ywx
-     * @Date 2022/7/29 14:32
-     **/
-    @PostMapping("/list_zt")
-    public ResultVo listMasterTeacher(@RequestBody EBaseVo base) {
-        Integer schoolid = base.getSchoolid();
-        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
-        List<Map> list = subjectSearchService.listMasterTeacher(schoolid);
-        return new ResultVo(0, "获取成功！", list);
-    }
-
-    /**
-     * 主监考人快捷查找
-     *
-     * @return com.xhkjedu.vo.ResultVo
-     * @Param [base]
-     * @Author ywx
-     * @Date 2022/7/29 15:25
-     **/
-    @PostMapping("/list_qzt")
-    public ResultVo listQuickMasterTeacher(@RequestBody EBaseVo base) {
-        Integer schoolid = base.getSchoolid();
-        String username = base.getUsername();
-        N_Utils.validation(new Object[]{schoolid, "学校id", 1, username, "姓名", 2});
-        Map list = subjectSearchService.listQuickMasterTeacher(schoolid, username);
-        return new ResultVo(0, "获取成功！", list);
-    }
-
-    /**
-     * @Description 按考试搜索考试学生
+     * @Description 据考号搜索参加考试学生
      * @Param [student]
      * @Return com.xhkjedu.vo.ResultVo
      * @Author wn
@@ -133,8 +84,9 @@ public class MsSubjectSearchController {
     public ResultVo listStudentByExamno(@RequestBody MsClassStudent student) {
         Integer examid = student.getExamid();
         String examno = student.getExamno();
-        N_Utils.validation(new Object[]{examid, "考试id", 1, examno, "考号", 2});
-        List<Map> list = subjectSearchService.listStudentByExamno(examid, examno);
+        String subjectid = student.getSubjectid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1, examno, "考号", 2, subjectid, "科目id", 2});
+        List<Map> list = subjectSearchService.listStudentByExamno(examid, examno, subjectid);
         return new ResultVo(0, "获取成功！", list);
     }
 }

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

@@ -36,5 +36,5 @@ public interface MsClassMapper extends TkMapper<MsClass> {
     List<Map> listSearchTeacher(@Param("usernames") String[] usernames,@Param("examid") Integer examid);
 
     //按班设置教师列表
-    List<Map> listClassTeacher(@Param("classids") String classids,@Param("examid") String subjectid);
+    List<Map> listClassTeacher(@Param("classids") String classids,@Param("subjectid") String subjectid);
 }

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

@@ -23,5 +23,5 @@ public interface MsClassStudentMapper extends TkMapper<MsClassStudent> {
     List<MsClassStudent> listByClassIds(@Param("classids") List<Integer> classids);
 
     //根据考号搜索参加考试学生
-    List<Map> listStudentByExamIdAnExamno(@Param("examid") Integer examid,@Param("examno") String examno);
+    List<Map> listStudentByExamIdAnExamno(@Param("examid") Integer examid, @Param("examno") String examno,@Param("subjectid") String subjectid);
 }

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

@@ -1,7 +1,7 @@
 package com.xhkjedu.smarking.service.exam;
 
-import com.xhkjedu.smarking.mapper.exam.*;
-import com.xhkjedu.smarking.mapper.system.UserMapper;
+import com.xhkjedu.smarking.mapper.exam.MsClassMapper;
+import com.xhkjedu.smarking.mapper.exam.MsClassStudentMapper;
 import com.xhkjedu.smarking.vo.exam.CTeacherVo;
 import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
@@ -15,12 +15,6 @@ public class MsSubjectSearchService {
     @Resource
     private MsClassMapper classMapper;
     @Resource
-    private MsExamMapper examMapper;
-    @Resource
-    private MsSubjectMapper subjectMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
     private MsClassStudentMapper classStudentMapper;
 
     // 查找设置
@@ -82,69 +76,8 @@ public class MsSubjectSearchService {
         return list;
     }
 
-    public Map listSubject(Integer examid) {
-        Map map = examMapper.findById(examid);
-        /*List<Map> subjects = subjectMapper.listSubjectCSet(examid);// 考试科目阅卷设置列表
-        Integer schoolid = Integer.parseInt(map.get("schoolid").toString());// 发起考试的学校
-        for (Map s : subjects) {
-            Integer correcttype = (Integer) s.get("correcttype");
-            Integer epid = (Integer) s.get("epid");
-            List<Map> list = new ArrayList<>();
-            if (correcttype == 1) {
-                list = classMapper.listSchoolClassByExamId(schoolid, examid);// 考试班级
-                List<Map> users = ePaperCorrectclassMapper.listByEpId(epid);// 试卷批阅人
-                for (Map m : list) {
-                    List<Map> cmapList = (List<Map>) m.get("classes");
-                    for (Map c : cmapList) {
-                        List<Map> teachers = users.stream().filter(u -> u.get("classid").equals(c.get("classid")))
-                                                  .sorted(Comparator.comparing(t -> t.get("username").toString())).collect(Collectors.toList());
-                        c.put("teachers", teachers);
-                    }
-                }
-            } else if (correcttype == 2) {
-                list = ePaperCorrectquestionMapper.listQnByEpId(epid);
-                List<Map> users = ePaperCorrectquestionMapper.listByEpId(epid);// 试卷批阅人
-                for (Map q : list) {
-                    Object qorder = q.get("qorder");
-                    List<Map> teachers = users.stream().filter(u -> u.get("qorder").equals(qorder))
-                                              .sorted(Comparator.comparing(t -> t.get("username").toString())).collect(Collectors.toList());
-                    q.put("teachers", teachers);
-                }
-            }
-            s.put("correctList", list);
-        }
-        map.put("subjects", subjects);*/
-        return map;
-    }
-
-    // 主监考人查找
-    public List<Map> listMasterTeacher(Integer schoolid) {
-        return userMapper.listMasterTeacher(schoolid);
-    }
-
-    // 主监考人快捷查找
-    public Map listQuickMasterTeacher(Integer schoolid, String username) {
-        Map map = new HashMap();
-        String[] usernames = username.split("，");
-        List<Map> teachers = userMapper.listQuickMasterTeacher(usernames, schoolid);
-        Map<String, Object> nameMap = teachers.stream().map(t -> t.get("username").toString()).distinct().collect(Collectors.toMap(t -> t, t -> t));
-        StringBuilder sb = new StringBuilder();
-        for (String name : usernames) {
-            if (nameMap.get(name) == null) {
-                sb.append(name).append("，");
-            }
-        }
-        map.put("teachers", teachers);// 匹配的教师
-        String notExist = sb.toString();// 未匹配的教师
-        if (N_Utils.isNotEmpty(notExist)) {
-            notExist = notExist.substring(0, notExist.length() - 1);
-        }
-        map.put("notExist", notExist);
-        return map;
-    }
-
     // 据考号搜索参加考试学生
-    public List<Map> listStudentByExamno(Integer examid, String examno) {
-        return classStudentMapper.listStudentByExamIdAnExamno(examid, examno);
+    public List<Map> listStudentByExamno(Integer examid, String examno, String subjectid) {
+        return classStudentMapper.listStudentByExamIdAnExamno(examid, examno, subjectid);
     }
 }

smarking/src/main/resources/application.properties

@@ -77,6 +77,12 @@ spring.rabbitmq.listener.simple.retry.initial-interval=30000ms
 #\u91CD\u8BD5\u6B21\u6570\u8D85\u8FC7\u4E0A\u9762\u7684\u8BBE\u7F6E\u4E4B\u540E\uFF0C\u662F\u5426\u4E22\u5F03(\u6D88\u8D39\u8005listener\u629B\u51FA\u5F02\u5E38\uFF0C\u662F\u5426\u91CD\u56DE\u961F\u5217\uFF08\u9ED8\u8BA4true\uFF1A\u91CD\u56DE\u961F\u5217\uFF0Cfalse\uFF1A\u4E0D\u91CD\u56DE\u961F\u5217\uFF08\u53EF\u7ED3\u5408\u6B7B\u4FE1\u4EA4\u6362\u673A\uFF09\uFF09
 spring.rabbitmq.listener.simple.default-requeue-rejected=false
 
+#\u52A9\u901A\u79D1\u6280\u77ED\u4FE1\u914D\u7F6E
+zt.username=xinghuo666
+zt.password=jUTEBk6e
+zt.url=http://api.mix2.zthysms.com/
+signName=\u3010\u6CB3\u5357\u661F\u706B\u71CE\u539F\u3011
+
 #\u5B9A\u65F6\u4EFB\u52A1
 #\u9ED8\u8BA4\u4E3Afalse\uFF0C\u4E0D\u5F00\u542F\u5B9A\u65F6\u4EFB\u52A1
 enable.scheduled=false

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

@@ -32,8 +32,8 @@
     </select>
     <!--获取教师科目-->
     <select id="listSubjectByTeacherIds" resultType="com.xhkjedu.smarking.vo.exam.CTeacherVo">
-        select tp.teacherid,sb.subjectid
-        from t_teacher_powersb tp left join t_subject_book sb on tp.lsbid = sb.lsbid
+        select tp.teacherid,tp.subjectid
+        from t_teacher_powersb tp
         where tp.teacherid in(${teacherids})
         group by tp.teacherid
     </select>
@@ -56,8 +56,7 @@
         select ct.classid,ct.teacherid,u.username,u.loginname,u.usersex
         from t_class_teacher ct left join t_user u on ct.teacherid = u.userid
         left join t_teacher_powersb tp on tp.teacherid=ct.teacherid
-        left join t_subject_book sb on tp.lsbid = sb.lsbid
-        where ct.classid in(${classids}) and sb.subjectid=#{subjectid} and u.userstate=1
+        where ct.classid in(${classids}) and tp.subjectid=#{subjectid} and u.userstate=1
         group by ct.classid,ct.teacherid
     </select>
 </mapper>

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

@@ -31,10 +31,11 @@
     <!--根据考号搜索参加考试学生-->
     <select id="listStudentByExamIdAnExamno" resultType="java.util.Map">
         select s.studentid,u.username studentname,u.examno,c.classid,c.classname,e.gradeid
-        from ms_class_student s left join ms_class c on s.examid=c.examid and c.subjectid=s.subjectid
+        from ms_class_student s left join ms_class c on s.examid=c.examid and c.subjectid=s.subjectid and s.classid=c.classid
         left join t_user u on s.studentid=u.userid
         left join ms_exam e on c.examid=e.examid
-        where s.examid=#{examid} and u.usertype=2 and u.examno like concat('%', #{examno}, '%')
+        where s.examid=#{examid} and s.subjectid=#{subjectid}
+        and u.usertype=2 and u.examno like concat('%', #{examno}, '%')
         group by s.studentid
     </select>
 

smarking/src/main/resources/mapper/paper/MsPaperAnalyzeMapper.xml

@@ -8,7 +8,7 @@
     </delete>
 
     <!--根据试卷ID查询试卷分析-->
-    <select id="getObjByMpId" resultType="com.xhkjedu.smarking.entity.MsPaperAnalyze">
+    <select id="getObjByMpId" resultType="com.xhkjedu.smarking.model.paper.MsPaperAnalyze">
         SELECT * FROM ms_paper_analyze WHERE mpid = #{mpid}
     </select>
 

smarking/src/main/resources/mapper/paper/MsPaperFileMapper.xml

@@ -13,7 +13,7 @@
     </delete>
 
     <!--试卷附件-->
-    <select id="listFilesbyMpid" resultType="com.xhkjedu.smarking.entity.MsPaperFile">
+    <select id="listFilesbyMpid" resultType="com.xhkjedu.smarking.model.paper.MsPaperFile">
         select * from ms_paper_file where mpid=#{mpid} order by fileorder
     </select>
 </mapper>

smarking/src/main/resources/mapper/paper/MsPaperQtypeMapper.xml

@@ -91,7 +91,7 @@
         <result column="mptnum" property="mptnum"></result>
         <result column="mptorder" property="mptorder"></result>
         <result column="mptscore" property="mptscore"></result>
-        <collection property="questionfjs" ofType="com.xhkjedu.smarking.vo.paper.msPaperQtypeQuestion" javaType="java.util.List">
+        <collection property="questionfjs" ofType="com.xhkjedu.smarking.vo.paper.MsPaperQtypeQuestionVo" javaType="java.util.List">
             <result column="mptqid" property="mptqid"></result>
             <result column="mptid" property="mptid"></result>
             <result column="qscore" property="qscore"></result>

smarking/src/main/resources/mapper/system/UserMapper.xml

@@ -24,9 +24,8 @@
     </select>
     <!--主监考人查找-->
     <select id="listMasterTeacher" resultType="java.util.Map">
-        select u.userid teacherid,u.username,u.loginname,u.usersex,sb.subjectid
+        select u.userid teacherid,u.username,u.loginname,u.usersex,tp.subjectid
         from t_user u left join t_teacher_powersb tp on tp.teacherid=u.userid
-        left join t_subject_book sb on tp.lsbid = sb.lsbid
         where u.schoolid=#{schoolid} and u.usertype=1 and u.userstate=1
         group by u.userid
     </select>