班级错题报告 v3.3.2

学生错题集 v3.3.2
课堂批量结束 v3.3.1

sapi/src/main/resources/application.properties

@@ -100,4 +100,4 @@ cron.syncnum=100
 #每隔3s清除一下请求地址map
 cron.deleteUriMap=0/3 * * * * ?
 #版本号
-versionname=Test_v3.3.1
+versionname=Test_v3.3.2

sapi/src/main/resources/mapper/classreport/ClassReportMapper.xml

@@ -257,7 +257,7 @@
         left join t_paper_student_question psq on psq.paperid=p.paperid and psq.classid=qc.classid
         left join t_question_point qp on psq.questionid=qp.questionid
         where qc.schoolid=#{type.schoolid} AND qc.classid=#{type.classid} AND p.subjectid=#{type.subjectid}
-        and qc.qctype=1 and qp.pointid is not null
+        and qc.qctype in(1,3) and qp.pointid is not null
         <if test="type.reporttype==1">and YEARWEEK(FROM_UNIXTIME(qc.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)-#{type.basenum}</if>
         <if test="type.reporttype==2">and MONTH(FROM_UNIXTIME(qc.createtime))=MONTH(now())-#{type.basenum}</if>
         <if test="type.reporttype==3">and YEARWEEK(FROM_UNIXTIME(qc.createtime,'%Y-%m-%d'),1)=YEARWEEK(now(),1)</if>

sclass/src/main/resources/application.properties

@@ -63,4 +63,4 @@ enable.scheduled=false
 cron.deleteUriMap=0/3 * * * * ?
 
 #版本号
-versionname=Test_v3.3.0
+versionname=Test_v3.3.1

sclass/src/main/resources/mapper/classroom/ClassroomMapper.xml

@@ -383,7 +383,7 @@
     <update id="updateBatchRoomState" parameterType="java.util.List">
         UPDATE t_classroom set roomstate=2,endtime=createtime+60 * 45 WHERE
         <foreach collection="list" item="classid" index="index" separator="or">
-            classid=#{classid} and roomstate=1
+            (classid=#{classid} and roomstate=1)
         </foreach>
     </update>
     <!--课堂回顾详情-->

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/QuestionStudentMapper.java

@@ -68,12 +68,13 @@ public interface QuestionStudentMapper extends TkMapper<TQuestionStudent> {
 
     /**
      * 结构试题详情
+     *
+     * @return com.xhkjedu.vo.question.QuestionStudentVo
      * @Param [questionid, studentid]
      * @Author ywx
      * @Date 2020/9/5 9:41
-     * @return com.xhkjedu.vo.question.QuestionStudentVo
      **/
-    QuestionStudentVo detail(String questionid, Integer studentid);
+    QuestionStudentVo detail(@Param("questionid") String questionid, @Param("studentid") Integer studentid, @Param("qctype") Integer qctype);
 
     /**
      * 附件试题详情

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionClassService.java

@@ -151,7 +151,8 @@ public class QuestionClassService {
 
     //获取错题详情
     private void listQuestionDetail(List<QuestionClassVo> all, List<QuestionClassVo> questions, List<QuestionClassVo> scantrons, List<TQuestionExplain> explainAll) {
-        List<String> questionids = all.stream().filter(q -> q.getQctype() == 1).map(QuestionClassVo::getQuestionid).collect(Collectors.toList());
+        List<String> questionids = all.stream().filter(q -> q.getQctype() == 1 || q.getQctype() == 3)
+                .map(QuestionClassVo::getQuestionid).collect(Collectors.toList());
         List<String> sids = all.stream().filter(q -> q.getQctype() == 2).map(QuestionClassVo::getQuestionid).collect(Collectors.toList());
         if (N_Utils.isListNotEmpty(questionids)) questions.addAll(questionClassMapper.getQuestionById(questionids));
         if (N_Utils.isListNotEmpty(sids)) scantrons.addAll(questionClassMapper.getScantronById(sids));

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionStudentService.java

@@ -106,7 +106,8 @@ public class QuestionStudentService {
 
     //获取错题详情
     private void listQuestionDetail(List<QuestionStudentVo> list, List<QuestionClassVo> questions, List<QuestionClassVo> scantrons, List<TQuestionExplain> explainAll) {
-        List<String> questionids = list.stream().filter(q -> q.getQctype() == 1).map(QuestionStudentVo::getQuestionid).collect(Collectors.toList());
+        List<String> questionids = list.stream().filter(q -> q.getQctype() == 1 || q.getQctype() == 3)
+                .map(QuestionStudentVo::getQuestionid).collect(Collectors.toList());
         List<String> sids = list.stream().filter(q -> q.getQctype() == 2).map(QuestionStudentVo::getQuestionid).collect(Collectors.toList());
         if (N_Utils.isListNotEmpty(questionids)) questions.addAll(questionClassMapper.getQuestionById(questionids));
         if (N_Utils.isListNotEmpty(sids)) scantrons.addAll(questionClassMapper.getScantronById(sids));
@@ -232,7 +233,7 @@ public class QuestionStudentService {
     public QuestionStudentVo detailStuWeb(String questionid, Integer qctype, Integer studentid) {
         QuestionStudentVo question = null;
         if (qctype == 1 || qctype == 3) {
-            question = questionStudentMapper.detail(questionid, studentid);
+            question = questionStudentMapper.detail(questionid, studentid, qctype);
         } else {
             question = questionStudentMapper.sdetail(questionid, studentid);
             if (question != null) {

sstudy/src/main/resources/application.properties

@@ -107,4 +107,4 @@ file.showurl=http://schoolstatictest.xhkjedu.com/static/
 dbname=xhkjedu_school_test
 
 #版本号
-versionname=Test_v3.3.1
+versionname=Test_v3.3.2

sstudy/src/main/resources/mapper/question/QuestionClassMapper.xml

@@ -91,7 +91,7 @@
         <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!=''">
             left join t_question_point qp on q.questionid = qp.questionid
         </if>
-        where qc.qctype=1 and qc.classid=#{question.classid}
+        where qc.qctype!=2 and qc.classid=#{question.classid}
         and UNIX_TIMESTAMP(FROM_UNIXTIME(qc.createtime,'%Y%m%d'))>=#{question.starttime}
         and UNIX_TIMESTAMP(FROM_UNIXTIME(qc.createtime,'%Y%m%d'))&lt;=#{question.stoptime}
         <if test="question.subjectid!=null and question.subjectid!='0'.toString() and question.subjectid!=''">
@@ -166,7 +166,7 @@
         ,(select group_concat(p.pointname separator '  ') from t_question_point qp
         left join t_point p on qp.pointid = p.pointid where qp.questionid=q.questionid)pointname
         from (select max(qcid)qcid,questionid from t_question_class
-        where questionid=#{question.questionid} and classid=#{question.classid} and qctype=1)a
+        where questionid=#{question.questionid} and classid=#{question.classid} and qctype!=2)a
         left join t_question_class qc on a.qcid=qc.qcid
         left join t_question q on qc.questionid=q.questionid
         left join t_paper_student_question psq on qc.paperid=psq.paperid and qc.classid=psq.classid
@@ -209,7 +209,7 @@
         ,(select group_concat(p.pointname separator '  ') from t_question_point qp
         left join t_point p on qp.pointid = p.pointid where qp.questionid=q.questionid)pointname
         from (select max(qcid)qcid,questionid from t_question_class
-        where questionid=#{question.questionid} and classid=#{question.classid} and qctype=1)a
+        where questionid=#{question.questionid} and classid=#{question.classid} and qctype!=2)a
         left join t_question_class qc on a.qcid=qc.qcid
         left join t_question q on qc.questionid=q.questionid
         left join t_paper_student_question psq on qc.paperid=psq.paperid and qc.classid=psq.classid

sstudy/src/main/resources/mapper/question/QuestionExplainMapper.xml

@@ -31,7 +31,7 @@
         from t_question_explain qe left join t_user u on qe.createid=u.userid
         where
         <foreach collection="questions" item="question" index="index" separator="or">
-            qe.questionid=#{question.questionid} and qe.qctype=#{question.qctype}
+            (qe.questionid=#{question.questionid} and qe.qctype=${question.qctype})
         </foreach>
         order by qe.createtime desc
     </select>

sstudy/src/main/resources/mapper/question/QuestionStudentMapper.xml

@@ -102,7 +102,7 @@
         ,(select group_concat(p.pointname separator '  ') from t_question_point qp
         left join t_point p on qp.pointid = p.pointid where qp.questionid=qs.questionid)pointname
         from t_question_student qs left join t_question q on qs.questionid=q.questionid
-        where qs.questionid=#{questionid} and qs.studentid=#{studentid} and qs.qctype=1 limit 1
+        where qs.questionid=#{questionid} and qs.studentid=#{studentid} and qs.qctype=#{qctype} limit 1
     </select>
     <!--附件试题详情-->
     <select id="sdetail" resultType="com.xhkjedu.sstudy.vo.question.QuestionStudentVo">