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

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

@@ -232,4 +232,18 @@ public class MsExamController {
         N_Utils.validation(new Object[]{examid, "考试id", 1});
         return new ResultVo(0, "查询成功", msExamService.listSubject(examid));
     }
+
+    /*
+     * @Description 考试状态
+     * @Date 2025/1/7 17:19:25
+     * @Author WN
+     * @Param [msExam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_state")
+    public ResultVo getExamstate(@RequestBody MsExam msExam) {
+        Integer examid = msExam.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        return new ResultVo(0, "查询成功", msExamService.getExamstate(examid));
+    }
 }

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

@@ -424,4 +424,15 @@ public class MsExamService {
         map.put("subjects", msSubjectMapper.listByExamId(examid));
         return map;
     }
+
+    /*
+     * @Description 获取考试状态
+     * @Date 2025/1/7 17:18:40
+     * @Author WN
+     * @Param [examid]
+     * @Return java.lang.Integer
+     **/
+    public Integer getExamstate(Integer examid){
+        return msExamMapper.getExamstate(examid);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperBlockService.java

@@ -5,7 +5,6 @@ import com.xhkjedu.smarking.mapper.paper.MsPaperBlockMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperBlockQuestionMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperMapper;
 import com.xhkjedu.smarking.mapper.paper.MsPaperQtypeQuestionMapper;
-import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentBlockMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 import com.xhkjedu.smarking.model.paper.MsPaperBlock;
 import com.xhkjedu.smarking.model.paper.MsPaperBlockQuestion;
@@ -35,11 +34,9 @@ public class MsPaperBlockService {
     @Resource
     private MsSubjectMapper msSubjectMapper;
     @Resource
-    private MsPaperQtypeQuestionMapper msPaperQtypeQuestionMapper;
-    @Resource
-    private MsPaperStudentBlockMapper msPaperStudentBlockMapper;
-    @Resource
     private MsPaperStudentMapper msPaperStudentMapper;
+    @Resource
+    private MsPaperQtypeQuestionMapper msPaperQtypeQuestionMapper;
 
     /*
      * @Description 获取试卷所有题块
@@ -91,6 +88,7 @@ public class MsPaperBlockService {
                 bq.setMpid(mpid);
                 bq.setCreateid(createid);
                 bq.setCreatetime(timestamp);
+
                 questions.add(bq);
             }
         }

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsTemplateService.java

@@ -238,7 +238,7 @@ public class MsTemplateService {
                 pbquestion.setMpid(mpid);
                 pbquestion.setMbqtype(1);
                 pbquestion.setMptqid(q.getMptqid());
-                pbquestion.setBqn(tbquestion.getQn());
+                pbquestion.setBqn(q.getQnstr());
                 pbquestion.setBqscore(q.getQscore());
                 pbquestion.setBqorder(tbquestion.getMtbqorder());
                 pbquestion.setCreateid(createid);

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

@@ -28,10 +28,10 @@
         left join t_user u on cs.studentid=u.userid
         where ps.examid=#{stu.examid} and ps.subjectid=#{stu.subjectid} and ps.sstate=3
         <if test="stu.classid!=null and stu.classid!=0">
-            ,and cs.classid=#{stu.classid}
+            and cs.classid=#{stu.classid}
         </if>
         <if test="stu.studentname!=null and stu.studentname!=''">
-            and (u.username like concat('%', #{stu.studentname}, '%') or u.examno like concat('%',#{stu.studentname},'%')
+            and (u.username like concat('%', #{stu.studentname}, '%') or u.examno like concat('%',#{stu.studentname},'%'))
         </if>
         order by cs.mcsid
     </select>
@@ -44,7 +44,7 @@
         left join ms_class c on cs.classid=c.classid and ps.examid=c.examid
         left join t_user u on cs.studentid=u.userid
         left join ms_subject s on ps.subjectid=s.subjectid
-        where ps.examid=#{stu.examid} and ps.subjectid in
+        where ps.examid=#{stu.examid} and ps.sstate=3 and ps.subjectid in
         <foreach collection="stu.subjectids" item="s" open="(" close=")" separator=",">
             #{s}
         </foreach>