Merge remote-tracking branch 'cloud-schoolapi/ywx'

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -70,12 +70,19 @@ public class EPaperQtypeService {
             return new ResultVo(1,"不能进行操作");
         }
 
+        List<EPaperQtype> qtypelist = paper.getQtypelist();
+        List<EPaperQtypeQuestion> questions = new ArrayList<>();
+        qtypelist.forEach(t -> {
+            questions.addAll(t.getQuestions());
+        });
+        long count = questions.stream().map(q -> q.getQn()).distinct().count();
+        if (count < questions.size()) return new ResultVo(1, "题号不能重复");
+
         //说明已经有改考试对应的试卷，删除试卷中试题，试卷分析
         ePaperQtypeMapper.deleteByEpid(espVo.getEpid());
         ePaperAnalyzeMapper.deleteByEpid(espVo.getEpid());
         ePaperFileMapper.deleteByEpid(espVo.getEpid());
 
-        List<EPaperQtype> qtypelist = paper.getQtypelist();
         List<EPaperQtypeQuestion> queslist = new ArrayList<>();//存放试题
         paper.setEpid(espVo.getEpid());
         setEPaperBaseDetail(paper,qtypelist);

sexam/src/main/resources/mapper/paper/EPaperCorrectTeacherMapper.xml

@@ -6,13 +6,13 @@
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
         ,truncate(a.pynum*100/a.tjnum,2)pgrate
         from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
-        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(pc.classid)classids
+        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(distinct pc.classid)classids
         ,count(case when psq.answered=1 then psq.epsqid else null end)tjnum
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
         left join e_paper_correctclass pc on p.epid = pc.epid
         left join e_paper_student_question psq on psq.epid = pc.epid and psq.classid=pc.classid and psq.qorder=pq.qorder
-        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15)
+        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
         ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
@@ -20,7 +20,7 @@
         ,count(case when psq.answered=1 and psq.checked=2 then psq.epsqid else null end)pynum
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
         left join e_paper_student_question psq on psq.epid = pq.epid and psq.qorder=pq.qorder
-        where pq.teacherid=#{teacherid})a left join e_subject es on a.esid = es.esid
+        where pq.teacherid=#{teacherid} group by p.epid)a left join e_subject es on a.esid = es.esid
         left join e_base eb on es.examid = eb.examid
         where a.tjnum!=a.pynum group by a.epid
     </select>
@@ -28,15 +28,15 @@
     <select id="listMarked" resultType="java.util.Map">
         select a.*,eb.examname,eb.gradeid,eb.examtype,es.sdate,es.begintime,es.endtime,es.subjectname
         from(select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
-        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(pc.classid)classids
+        ,group_concat(distinct pq.qorder order by pq.qorder)qorders,group_concat(distinct pc.classid)classids
         from e_paper p left join e_paper_qtype_question pq on p.epid = pq.epid
         left join e_paper_correctclass pc on p.epid = pc.epid
-        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15)
+        where pc.teacherid=#{teacherid} and pq.ctype in(3,14,15) group by p.epid
         union
         select p.esid,p.epid,group_concat(distinct pq.qn order by pq.qorder)qns
         ,group_concat(distinct pq.qorder order by pq.qorder)qorders,0 classids
         from e_paper p left join e_paper_correctquestion pq on p.epid = pq.epid
-        where pq.teacherid=#{teacherid})a left join e_subject es on a.esid = es.esid
+        where pq.teacherid=#{teacherid} group by p.epid)a left join e_subject es on a.esid = es.esid
         left join e_base eb on es.examid = eb.examid
         left join e_paper_student ps on a.epid=ps.epid
         group by a.epid