作业完善

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperAnalyzeMapper.java

 import com.xhkjedu.sstudy.vo.paper.PaperCAnalyzeVo;
 import com.xhkjedu.sstudy.vo.paper.PaperGAnalyzeVo;
 import com.xhkjedu.sstudy.vo.paper.QuestionAnalyzeVo;
+import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPointScoreVo;
 
     //作业统计--按学生--年级下所有学生作业情况
     List<AStudentPaperVo> listPaperAllClassStu(@Param("paper") AnalyzeSearchVo paper);
+
+    //作业母题列表
+    List<PaperStudentQuestionVo> listQuestionByQuestionIds(@Param("questionids") List<String> questionids);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/model/paper/TPaperQtypeQuestion.java

     //学校id
     private Integer schoolid;
 
+    private String qn;//显示题号
+
     @Transient
     //处理题型1单选题2多选题3主观题4判断对错5判断✔6判断TF7完形填空8阅读理解
     private Integer ctype;

sstudy/src/main/java/com/xhkjedu/sstudy/model/paperstudent/TPaperStudentQuestion.java

 
     private Integer converted;//是否转换0未转换1已转换2转换失败
 
+    private String qn;//显示题号
+
     @Transient
     //试题题型id
     private String qtypeid;

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperAnalyzeService.java

 import com.xhkjedu.sstudy.model.paper.TPaperAnalyze;
 import com.xhkjedu.sstudy.model.paper.TPaperFile;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperGroup;
+import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.sstudy.vo.gradeclass.CStudentVo;
 import com.xhkjedu.sstudy.vo.paper.*;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo;
     public StudentPaperVo getPeopleDetailAnalyze(Integer psid) {
         StudentPaperVo paper = paperAnalyzeMapper.getStudentPaperAnalyze(psid);
         List<StudentPaperTypeVo> types = paperAnalyzeMapper.listPeopleDetailAnalyze(psid);
+        StudyUtil.setPaperQuestion(types, paperAnalyzeMapper);
         paper.setTypes(types);
         return paper;
     }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

                     ptq.setCreateid(createid);
                     ptq.setCreatetime(N_Utils.getSecondTimestamp());
                     ptq.setSchoolid(schoolid);
+                    ptq.setQn(ptq.getPtqorder().toString());
                     ptqs.add(ptq);
                 } else {
+                    Integer sorder = 1;
                     for (Map sq : sonqlist) {
                         TPaperQtypeQuestion ptq = new TPaperQtypeQuestion();
                         ptq.setPtid(qtype.getId());
                         ptq.setCreateid(createid);
                         ptq.setCreatetime(N_Utils.getSecondTimestamp());
                         ptq.setSchoolid(schoolid);
+                        ptq.setQn(qorder+"."+sorder);
+                        sorder++;
                         ptqs.add(ptq);
                     }
                 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentService.java

                     sq.setQscore(psq.getQscore());
                     sq.setQorder(psq.getQorder());
                     sq.setSchoolid(psq.getSchoolid());
+                    sq.setQn(psq.getQn());
                     savelist.add(sq);
                 }
             }
                 q.setMqtypename(mt.getQtypename());
                 q.setMhashear(mt.getHashear());
                 q.setMhearfile(mt.getHearfile());
+                q.setMqlevel(mt.getQlevel());
             }
         }
         return list;

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentWebService.java

 import com.xhkjedu.sstudy.service.question.QuestionClassService;
 import com.xhkjedu.sstudy.utils.ArithUtil;
 import com.xhkjedu.sstudy.utils.ConvertUtil;
+import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentWebVo;
                 paperStudentMapper.updateState(null,null,psid,1);//更改开始状态
                 types = paperAnalyzeMapper.listPeopleDetailAnalyze(psid);
             }
+            StudyUtil.setPaperQuestion(types, paperAnalyzeMapper);
             paper.setTypes(types);
         }catch (Exception e){
             log.error("开始做作业失败："+e.getMessage());
     public StudentPaperVo listPaperStudent(Integer psid) {
         StudentPaperVo paper = paperAnalyzeMapper.getStudentPaperAnalyzeWeb(psid);
         List<StudentPaperTypeVo> types = paperAnalyzeMapper.listPeopleDetailAnalyze(psid);
+        StudyUtil.setPaperQuestion(types, paperAnalyzeMapper);
         paper.setTypes(types);
         List<StudentPointScoreVo> points = paperAnalyzeMapper.listPointScoreByPsId(psid);
         paper.setPoints(points);

sstudy/src/main/java/com/xhkjedu/sstudy/utils/StudyUtil.java

 package com.xhkjedu.sstudy.utils;
 
 import com.xhkjedu.sstudy.config.ConfigKey;
+import com.xhkjedu.sstudy.mapper.paper.PaperAnalyzeMapper;
+import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
+import com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo;
+import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 import static com.xhkjedu.utils.N_Utils.getSecondTimestamp;
 
             return null;
         }
     }
+
+    //处理母子题
+    public static List<StudentPaperTypeVo> setPaperQuestion(List<StudentPaperTypeVo> types, PaperAnalyzeMapper paperAnalyzeMapper){
+        List<PaperStudentQuestionVo> qlist = new ArrayList<>();
+        types.forEach(t -> {
+            qlist.addAll(t.getQuestions());
+        });
+        List<String> questionpids = qlist.stream().filter(q -> q.getQlevel() == 3)
+                .map(q -> q.getQuestionpid()).distinct().collect(Collectors.toList());
+        List<PaperStudentQuestionVo> mquestions = new ArrayList<>();
+        if (N_Utils.isListNotEmpty(questionpids)) {
+            mquestions = paperAnalyzeMapper.listQuestionByQuestionIds(questionpids);
+        }
+        for (StudentPaperTypeVo t : types) {
+            List<PaperStudentQuestionVo> questionList = new ArrayList<>();
+            List<PaperStudentQuestionVo> questions = t.getQuestions();
+            LinkedHashMap<String, List<PaperStudentQuestionVo>> collect = questions.stream()
+                    .collect(Collectors.groupingBy(q -> q.getQuestionpid(), LinkedHashMap::new, Collectors.toList()));
+            for (Map.Entry<String, List<PaperStudentQuestionVo>> entry : collect.entrySet()) {
+                String questionpid = entry.getKey();
+                List<PaperStudentQuestionVo> list = entry.getValue();
+                PaperStudentQuestionVo tq = list.get(0);
+                PaperStudentQuestionVo q;
+                if(tq.getQlevel()==3){//子题
+                    q = mquestions.stream().filter(mq -> mq.getQuestionid().equals(questionpid)).findFirst().orElse(null);
+                    double score = list.stream().mapToDouble(PaperStudentQuestionVo::getQscore).sum();
+                    List<PaperStudentQuestionVo> sonques = list.stream().filter(l -> l.getQuestionpid().equals(questionpid)).collect(Collectors.toList());
+                    q.setQscore(score);
+                    q.setQorder(tq.getQorder());
+                    q.setSonques(sonques);
+                }else {
+                    q=tq;
+                }
+                questionList.add(q);
+            }
+            t.setQuestions(questionList);
+        }
+        return types;
+    }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/PaperStudentQuestionVo.java

 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PaperStudentQuestionVo {
     //试卷学生id
     private String mhearfile;//母题听力题文件地址
     private Integer hashear;//是否是听力题0不是1是
     private String hearfile;//听力题文件地址
+    private Integer qlevel;//试题级别1单题2母题
+    private Integer mqlevel;//母题试题级别1单题2母题
+    private Integer sorder;//子题排序
+    private String questionpid;//母题id
+    private String qn;//显示题号
+    private List<PaperStudentQuestionVo> sonques;//子题集合
 }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/question/QuestionVo.java

     //子题
     private List<Map> sonqlist;
 
+    private String qn;//显示题号
 }

sstudy/src/main/resources/mapper/paper/PaperAnalyzeMapper.xml

         ,(select u2.username from t_user u2 where u2.userid=ps.checkid)checkname
         from(select ps.psid,ps.studentid,ps.checkid,ps.userscore,ps.stoptime answertime,ps.costtime,ps.psstate,ps.pschecked
         ,ps.papernum,ps.paperscore
-        ,sum(case when q.ctype=3 then psq.stuscore else 0 end)zgscore
-        ,sum(case when q.ctype!=3 then psq.stuscore else 0 end)kgscore
+        ,sum(case when q.ctype in(3,13,14,15) then psq.stuscore else 0 end)zgscore
+        ,sum(case when q.ctype not in(3,13,14,15) then psq.stuscore else 0 end)kgscore
         from t_paper_student ps left join
         <if test="paper.papertype==1 or paper.papertype==3">
             t_paper_student_question psq on ps.psid=psq.psid left join t_question q on psq.questionid=q.questionid
             <result property="checkcomm" column="checkcomm"></result>
             <result property="hashear" column="hashear"></result>
             <result property="hearfile" column="hearfile"></result>
+            <result property="qlevel" column="qlevel"></result>
+            <result property="sorder" column="sorder"></result>
+            <result property="questionpid" column="questionpid"></result>
+            <result property="qn" column="qn"></result>
         </collection>
     </resultMap>
     <!--作业统计 按人详情 题型列表-->
     <select id="listPeopleDetailAnalyze" resultMap="typeQuestion">
         SELECT t.qtypename,t.ptorder,t.ptscore,t.ptnum
         ,psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.device,psq.checkcomm
-        ,psq.useranswer,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,psq.psid
-        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.hashear,q.hearfile
+        ,psq.useranswer,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore
+        ,psq.qorder,psq.qn,psq.psid
+        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.hashear,q.hearfile,q.qlevel,q.sorder
+        ,ifnull(q.questionpid,q.questionid)questionpid
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         LEFT JOIN t_paper_qtype_question tq ON psq.questionid=tq.questionid AND psq.paperid=tq.paperid
         LEFT JOIN t_paper_qtype t ON tq.ptid=t.ptid
         </if>
         order by ps.studentid,ps.paperid asc
     </select>
+    <!--作业母题列表-->
+    <select id="listQuestionByQuestionIds" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
+        select questionid,ctype,qstem,qoption,qanswer,qanalyze,q.hashear,q.hearfile,q.qlevel
+        from t_question q where questionid in
+        <foreach collection="questionids" item="questionid" open="(" separator="," close=")">
+            #{questionid}
+        </foreach>
+    </select>
 </mapper>

sstudy/src/main/resources/mapper/paper/PaperMapper.xml

             <result property="qanalyze" column="qanalyze"></result>
             <result property="hashear" column="hashear"></result>
             <result property="hearfile" column="hearfile"></result>
+            <result property="qn" column="qn"></result>
         </collection>
     </resultMap>
     <!--获取作业题型列表-->
     <select id="listPaperType" resultMap="typeResult">
-        select pt.qtypeid,pt.qtypename,pt.ptorder,pt.ptscore,pt.ptnum,ptq.questionid,ptq.ptqscore score,ptq.ptqorder
+        select pt.qtypeid,pt.qtypename,pt.ptorder,pt.ptscore,pt.ptnum,ptq.questionid,ptq.ptqscore score,ptq.ptqorder,ptq.qn
         ,q.questionid,ifnull(q.questionpid,q.questionid)questionpid,q.qlevel,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze
         ,q.hashear,q.hearfile
         from t_paper_qtype pt left join t_paper_qtype_question ptq on pt.ptid = ptq.ptid

sstudy/src/main/resources/mapper/paper/PaperQtypeQuestionMapper.xml

     <!--获取试卷中主观题数量-->
     <select id="getQuestionCountCtype" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT pqq.questionid) FROM t_paper_qtype_question pqq LEFT JOIN t_question q ON pqq.questionid=q.questionid
-        WHERE pqq.paperid=#{paperid} AND q.ctype=3
+        WHERE pqq.paperid=#{paperid} AND q.ctype in(3,13,14,15)
     </select>
 
     <!--据试卷id获取试卷中所有试题（试题和分值）-->

sstudy/src/main/resources/mapper/paper/PaperScantronMapper.xml

 
     <!--获取试卷中主观题数量-->
     <select id="getQuestionCountCtype" resultType="java.lang.Integer">
-       SELECT COUNT(*) FROM t_paper_scantron WHERE paperid=#{paperid} AND ctype=3
+       SELECT COUNT(*) FROM t_paper_scantron WHERE paperid=#{paperid} AND ctype in(3,13,14,15)
     </select>
 
 </mapper>

sstudy/src/main/resources/mapper/paperstudent/PaperStudedntScantronMapper.xml

         psc.qtypeid,psc.qtypename,psc.ctype,psc.psanswer,u.username studentname
         FROM t_paper_student_scantron pss LEFT JOIN t_user u ON pss.studentid=u.userid
         LEFT JOIN t_paper_scantron psc ON pss.pscaid = psc.pscaid
-        WHERE pss.psid=#{psid} and psc.ctype=3
+        WHERE pss.psid=#{psid} and psc.ctype in(3,13,14,15)
         order by pss.qorder
     </select>
 
         from t_paper_student_scantron pss left join t_paper_scantron ps on pss.pscaid = ps.pscaid
         left join t_user u on pss.studentid = u.userid
         left join t_paper_student ps1 on pss.psid=ps1.psid
-        where pss.paperid=#{paperid} and pss.classid=#{classid} and ps.ctype=3
+        where pss.paperid=#{paperid} and pss.classid=#{classid} and ps.ctype in(3,13,14,15)
         order by pss.checked,pss.pssid
     </select>
     <!--获取学生作业未批改试题数量-->

sstudy/src/main/resources/mapper/paperstudent/PaperStudentQuestionMapper.xml

     <!--获取学生作业详情-->
     <select id="getPaperQuestion" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
         SELECT psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.device,psq.checkcomm
-        ,psq.useranswer,psq.answertype,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,u.username studentname,psq.psid
-        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypename,q.hashear,q.hearfile
+        ,psq.useranswer,psq.answertype,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore
+        ,psq.stuscore,psq.qorder,u.username studentname,psq.psid,psq.qn
+        ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypename,q.hashear,q.hearfile,q.qlevel,q.sorder
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         ,(CASE WHEN q.ctype IN(16,17) THEN JSON_LENGTH(q.qoption) ELSE 0 END)qoptioncount
         ,(CASE WHEN q.questionpid IS NULL THEN ''
         ELSE (SELECT json_object('qstem',fq.qstem,'qoption',fq.qoption,'qanswer',fq.qanswer,'qanalyze',fq.qanalyze
-            ,'qtypename',fq.qtypename,'hashear',fq.hashear,'hearfile',fq.hearfile)
+            ,'qtypename',fq.qtypename,'hashear',fq.hashear,'hearfile',fq.hearfile,'qlevel',fq.qlevel)
         FROM t_question fq WHERE fq.questionid=q.questionpid) END)mqstem
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         LEFT JOIN t_user u ON psq.studentid=u.userid
     <!--获取学生待批改试题列表-->
     <select id="listCorrectQuestion" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
         SELECT psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.device,psq.checkcomm
-        ,psq.useranswer,psq.answertype,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,u.username studentname,psq.psid
+        ,psq.useranswer,psq.answertype,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore
+        ,psq.stuscore,psq.qorder,u.username studentname,psq.psid,psq.qn
         ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypeid,q.qtypename
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         ,(CASE WHEN q.ctype IN(7,8) THEN JSON_LENGTH(q.qoption) ELSE 0 END)qoptioncount
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         LEFT JOIN t_user u ON psq.studentid=u.userid
-        WHERE psq.psid=#{psid} and q.ctype=3
+        WHERE psq.psid=#{psid} and q.ctype in(3,13,14,15)
         ORDER BY psq.qorder
     </select>
     <!--作业关联试题列表-->
     <select id="listPaperQuestion" resultType="com.xhkjedu.sstudy.model.paperstudent.TPaperStudentQuestion">
-        SELECT ps.paperid,ps.classid,ps.studentid,ptq.questionid,ptq.ptqscore AS qscore,ptq.ptqorder qorder,ps.schoolid,ps.psid
+        SELECT ps.paperid,ps.classid,ps.studentid,ptq.questionid,ptq.ptqscore AS qscore,ptq.ptqorder qorder
+        ,ps.schoolid,ps.psid,ptq.qn
         FROM t_paper_student ps LEFT JOIN t_paper_qtype_question ptq ON ps.paperid=ptq.paperid WHERE ps.psid=#{psid}
     </select>
     <!--批量保存-->
     <insert id="batchSave" parameterType="java.util.List">
-        INSERT INTO t_paper_student_question (paperid,classid,studentid,questionid,qscore,qorder,schoolid,psid)
+        INSERT INTO t_paper_student_question (paperid,classid,studentid,questionid,qscore,qorder,qn,schoolid,psid)
         VALUES
         <foreach collection ="list" item="r" index= "index" separator =",">
-            (#{r.paperid},#{r.classid},#{r.studentid},#{r.questionid},#{r.qscore},#{r.qorder},#{r.schoolid},#{r.psid})
+            (#{r.paperid},#{r.classid},#{r.studentid},#{r.questionid},#{r.qscore},#{r.qorder},#{r.qn},#{r.schoolid},#{r.psid})
         </foreach>
     </insert>
     <!--获取学生未提交试题集合-->
     <resultMap id="questionResult" type="java.util.Map">
         <result property="qscore" column="qscore"></result>
         <result property="qorder" column="qorder"></result>
+        <result property="qn" column="qn"></result>
         <result property="qstem" column="qstem"></result>
         <result property="qoption" column="qoption"></result>
         <result property="qanswer" column="qanswer"></result>
         </collection>
     </resultMap>
     <select id="qcorrectList" resultMap="questionResult">
-        select psq.qscore,psq.qorder,q.qstem,q.qoption,q.qanswer,q.qanalyze
+        select psq.qscore,psq.qorder,psq.qn,q.qstem,q.qoption,q.qanswer,q.qanalyze
         ,psq.stuscore,psq.answered,psq.checked,psq.checkcomm,psq.psid,psq.psqid
         ,psq.device,psq.useranswer,psq.converted,psq.answertype,psq.useranswertext,psq.useranswertxt,u.username,ps.psstate
         from t_paper_student_question psq left join t_question q on psq.questionid = q.questionid
         left join t_user u on psq.studentid = u.userid
         left join t_paper_student ps on psq.psid=ps.psid
-        where psq.paperid=#{paperid} and psq.classid=#{classid} and q.ctype=3
+        where psq.paperid=#{paperid} and psq.classid=#{classid} and q.ctype in(3,13,14,15)
         order by psq.checked,psq.psqid
     </select>
     <!--获取学生作业未批改试题数量-->

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

         select ps.psanswer qanswer,qc.qscore,qc.qctype,qc.avgscore,qc.errorrate,qc.paperid,qc.classid,qc.questionid
         ,pss.useranswer section,count(pss.pssid)stunum,pss.stuscore,group_concat(u.username order by convert(u.username using gbk) separator '  ')stuname
         from (select max(qcid)qcid,questionid from t_question_class
-        where questionid=#{question.questionid} and classid=#{question.classid} and qctype=3)a
+        where questionid=#{question.questionid} and classid=#{question.classid} and qctype in(3,13,14,15))a
         left join t_question_class qc on a.qcid=qc.qcid
         left join t_classroom_paper_scantron ps on qc.questionid=ps.pscaid
         left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid and (pss.answered=1 or pss.checked=1)
         ,pss.stuscore,u.username stuname
         ,(select count(*) from t_classroom_paper_student ps where ps.paperid=qc.paperid and ps.classid=qc.classid)wtjnum
         from (select max(qcid)qcid,questionid from t_question_class
-        where questionid=#{question.questionid} and classid=#{question.classid} and qctype=3)a
+        where questionid=#{question.questionid} and classid=#{question.classid} and qctype in(3,13,14,15))a
         left join t_question_class qc on a.qcid=qc.qcid
         left join t_classroom_paper_scantron ps on qc.questionid=ps.pscaid
         left join t_classroom_paper_student_scantron pss on ps.pscaid=pss.pscaid and (pss.answered=1 or pss.checked=1)