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

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

     }
 
     //处理题型中客观题
-    private static int[] octypelist = new int[]{1,2,4,5,6,7,8,10};
+    private static int[] octypelist = new int[]{1,2,4,5,6,7,8,10,16,17};
     /**
      * @Description 判断ctype是否是客观题
      * @Param [ctype]

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperQtypeMapper.java

     //制作答题卡时获取试卷中试题
     List<Map> listPaperqtypeQuestionsForScan(@Param("epid") Integer epid);
 
-    //保存试题正确答案
-    void updateBatchQuestionAnswer(@Param("list")List<EPaperQtypeQuestion> list);
-
-    //批量保存答题卡
-    void updateBatchQuestionForScan(@Param("list")List<EPaperQtypeQuestion> list);
-
-    //试卷中所有试题基础信息
-    List<EPaperQtypeQuestion> listQuestionsByEpid(@Param("epid") Integer epid);
-
     //根据试卷id删除试题
     void deleteByEpid(@Param("epid") Integer epid);
 

sexam/src/main/java/com/xhkjedu/sexam/mapper/paper/EPaperQtypeQuestionMapper.java

 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.paper.EPaperQtypeQuestion;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 题库题型试题
  * Date 2022/7/19 8:57
  **/
 public interface EPaperQtypeQuestionMapper extends TkMapper<EPaperQtypeQuestion> {
+    //保存试题正确答案
+    void updateBatchQuestionAnswer(@Param("list") List<EPaperQtypeQuestion> list);
+
+    //批量保存答题卡
+    void updateBatchQuestionForScan(@Param("list")List<EPaperQtypeQuestion> list);
+
+    //修改客观题选项数量
+    void updateBatchQuestionOptionnum(@Param("list")List<EPaperQtypeQuestion> list);
 
+    //试卷中所有试题基础信息
+    List<EPaperQtypeQuestion> listQuestionsByEpid(@Param("epid") Integer epid);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paper/EPaperQtypeQuestion.java

     //作文格数
     private Integer gnum;
 
+    //答题区高度
+    private Integer height;
+
+    //答题区富文本
+    private String queshtml;
+
     //难易度
     @Transient
     private Integer complexity;

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

 import com.xhkjedu.sexam.mapper.exam.ESubjectMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperQtypeQuestionMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
     @Resource
     private EBaseMacMapper eBaseMacMapper;
     @Resource
-    private EPaperQtypeMapper ePaperQtypeMapper;
+    private EPaperQtypeQuestionMapper ePaperQtypeQuestionMapper;
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
 
             for (EPaper paper : papers) {
                 Integer epid = paper.getEpid();
                 //获取试卷中所有试题
-                List<EPaperQtypeQuestion> queslist = ePaperQtypeMapper.listQuestionsByEpid(epid);
+                List<EPaperQtypeQuestion> queslist = ePaperQtypeQuestionMapper.listQuestionsByEpid(epid);
                 for (EPaperStudent ps : studentList) {
                     for(EPaperQtypeQuestion q : queslist){
                         EPaperStudentQuestion epsq = new EPaperStudentQuestion();

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

                 if(q.getOptionnum()==null){
                     q.setOptionnum(0);
                 }
-                Integer qorder = q.getQorder();
+                /*Integer qorder = q.getQorder();
                 if (ptype == 1 && ctype != 11) {
                     q.setQn(qorder.toString());
                 } else if (ptype == 1 && ctype == 11) {
                     q.setQn(qorder + "." + (i + 1));
-                }
+                }*/
                 if(q.getCtype() == 14){
                     q.setGnum(900);//语文作文格数
                 }else if(q.getCtype() == 15){
     }
 
     //保存试卷分析--题库
-    private void savePaperAnalyzeForQuestion(EPaper ePaper){
+    public void savePaperAnalyzeForQuestion(EPaper ePaper){
         //保存之前先清除之前的试卷分析
         ePaperAnalyzeMapper.deleteByEpid(ePaper.getEpid());
         //总体分析（主观题、客观题）
         List<EPaperQtypeVo> qtypelist = ePaperQtypeMapper.listPaperQtypeQuestions(ePaper.getEpid());//试卷题型试题信息
         List<EPaperQtypeQuestionVo> queslist = new ArrayList<>();//试卷中所有试题(子题)
         List<EPaperQPointVo> quespoints = new ArrayList<>();//试卷中所有单题和子题以及对应知识点
+        List<EPaperQtypeQuestion> uplist = new ArrayList<>();//如果是客观题则获取客观题选项数量更改试卷中客观题选项数量
 
         //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解10任务型阅读11综合题12听力
         List<Map> typelist = new ArrayList<>();//题型分析
                 if(!qorderlist.contains(q.getQorder())){
                     qorderlist.add(q.getQorder());
                 }
+                int ctype = q.getCtype();
+                if(ctype == 1 || ctype ==2 || ctype==4 || ctype ==5 || ctype==6){
+                    List<String> strlst = JSON.parseArray(q.getQoption(),String.class);
+                    EPaperQtypeQuestion eqq = new EPaperQtypeQuestion();
+                    eqq.setEptqid(q.getEptqid());
+                    eqq.setOptionnum(strlst.size());
+                    uplist.add(eqq);
+                }
             }
 
             double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
-            EPaperQsVo tvo = new EPaperQsVo();
             Map tmap = new HashMap();
             tmap.put("qtname",qt.getEptname());
             tmap.put("num",qt.getEptnum());
         epa.setComplexityjson(JSON.toJSONString(clist));//难易度分析
         epa.setPointjson(JSON.toJSONString(pointlist));//知识点分析
         ePaperAnalyzeMapper.insertUseGeneratedKeys(epa);
-
+        if(N_Utils.isListNotEmpty(uplist)){
+            ePaperQtypeQuestionMapper.updateBatchQuestionOptionnum(uplist);
+        }
     }
 
     //保存试卷分析--附件
     public void saveQuesitonAnswer(EPaper ePaper){
         List<EPaperQtypeQuestion> questions = ePaper.getQuestions();
         if(questions != null && questions.size() > 0){
-            ePaperQtypeMapper.updateBatchQuestionAnswer(questions);
+            ePaperQtypeQuestionMapper.updateBatchQuestionAnswer(questions);
             ePaper.setAnswered(1);
             ePaperMapper.updateEPaperAnswered(ePaper);
             //设置完答案进行匹配
         Integer examstate = Integer.parseInt(map.get("examstate").toString());
         if(examstate > 0){
             //获取试卷中原试题答案
-            List<EPaperQtypeQuestion> yqlist = ePaperQtypeMapper.listQuestionsByEpid(epid);
+            List<EPaperQtypeQuestion> yqlist = ePaperQtypeQuestionMapper.listQuestionsByEpid(epid);
             List<EPaperQtypeQuestion> changeQs = new ArrayList<>();//改变答案的试题
             for(EPaperQtypeQuestion tq : questions){
                 EPaperQtypeQuestion yq = yqlist.stream().filter(y -> y.getEptqid().equals(tq.getEptqid())).findFirst().orElse(null);
     public Map getPaperAndQuesitons(Integer epid){
         Map eps = ePaperMapper.getExamPaperAndSubject(epid);//考试考试科目名称
         List<Map> qtypes = new ArrayList<>();//题型试题
-        if(eps!=null && eps.get("ptype")!=null){
-            int ptype = Integer.parseInt(eps.get("ptype").toString());//试卷类型1题库2附件
+        if(eps!=null){
             qtypes = ePaperQtypeMapper.listPaperqtypeQuestionsForScan(epid);
-            if(ptype == 1){
-                //处理试卷中试题选项数量
-                for(Map qtm : qtypes){
-                    List<Map> qlist = (List<Map>) qtm.get("questions");
-                    for(Map qm : qlist){
-                        String qoption = qm.get("qoption").toString();
-                        Integer ctype = Integer.parseInt(qm.get("ctype").toString());
-                        if(ctype == 1 || ctype ==2 || ctype==4 || ctype ==5 || ctype==6 ){
-                            List<String> strlst = JSON.parseArray(qoption,String.class);
-                            qm.put("qoption","");
-                            qm.put("optionnum",strlst.size());
-                        }else if(ctype == 7 || ctype == 8 || ctype ==10){
-                            //完形填空、阅读理解、任务型阅读
-                            List<QuestionOptionVo> qopt = JSON.parseArray(qoption,QuestionOptionVo.class);
-                            qm.put("optionnum",qopt.get(0).getSqoptions().size());
-                            qm.put("quenum",qopt.size());
-                            qm.put("qoption","");
-
-                        }
-                    }
-                }
-            }
 
             //设置答题卡需要默认值
             if(eps.get("scantronnote") == null){
             paper.setScantronnum(pn);
         }
         ePaperMapper.updatePaperScantron(paper);
-        ePaperQtypeMapper.updateBatchQuestionForScan(questions);
+        ePaperQtypeQuestionMapper.updateBatchQuestionForScan(questions);
         if(paper.getPstate() == 1){
             eSubjectMapper.updateEsubjectStateByEpid(1,paper.getEpid());
             //提交之后把答题卡base图片转成pdf

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.paper.EPaperFileMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperQtypeQuestionMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EScanbatchMapper;
     @Resource
     private EPaperStudentMapper ePaperStudentMapper;
     @Resource
-    private EPaperQtypeMapper ePaperQtypeMapper;
+    private EPaperQtypeQuestionMapper ePaperQtypeQuestionMapper;
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
     @Resource
     //保存学生试卷关联信息
     private void savePaperStudentQuestion(EPaperStudentVo psvo) {
         //生成学生试卷
-        List<EPaperQtypeQuestion> pqlist = ePaperQtypeMapper.listQuestionsByEpid(psvo.getEpid());
+        List<EPaperQtypeQuestion> pqlist = ePaperQtypeQuestionMapper.listQuestionsByEpid(psvo.getEpid());
 
         List<EPaperStudentQuestion> psqlist = new ArrayList<>();
         for (EPaperQtypeQuestion q : pqlist) {

sexam/src/main/java/com/xhkjedu/sexam/vo/paper/EPaperQPointVo.java

     private String pointname;//知识点名称
 
     private String questionid;//试题id
+    private Integer eptqid;//试题id
     private double score;//分值
     private Integer qorder;//试题排序
 }

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

             <result column="mqanalyze" property="mqanalyze"></result>
             <result column="mqlevel" property="mqlevel"></result>
             <collection property="points" ofType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo" javaType="java.util.List"
-                        column="questionid" select="listQuestionPoints">
+                        column="{questionid=questionid,qlevel=qlevel,questionpid=questionpid" select="listQuestionPoints">
                 <result column="pointid" property="pointid"></result>
                 <result column="pointname" property="pointname"></result>
             </collection>
     <select id="listQuestionPoints" resultType="com.xhkjedu.sexam.vo.paper.EPaperQPointVo">
         select qp.pointid,p.pointname from t_question_point qp
         left join t_point p on qp.pointid=p.pointid
-        where qp.questionid=#{questionid} order by p.pointorder
+        where
+        <if test="qlevel==1">
+            qp.questionid=#{questionid}
+        </if>
+        <if test="qlevel==3">
+            qp.questionid=#{questionpid}
+        </if>
+        order by p.pointorder
     </select>
 
     <!--试卷题型试题信息（附件）-->
             <result column="optionnum" property="optionnum"></result>
             <result column="coord" property="coord"></result>
             <result column="gnum" property="gnum"></result>
-            <result column="qoption" property="qoption"></result>
+            <result column="height" property="height"></result>
+            <result column="queshtml" property="queshtml"></result>
         </collection>
     </resultMap>
 
     <!--制作答题卡时获取试卷中试题-->
     <select id="listPaperqtypeQuestionsForScan" resultMap="qtypesQuestionsForScan">
-        select t.eptname ,t.ctype,t.eptnum,t.eptorder,t.eptscore,
-        tq.eptqid,tq.ctype qctype,tq.score,tq.qorder,tq.qn,tq.optionnum,tq.coord,tq.gnum,q.qoption
+        select t.eptname,t.ctype,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.ctype qctype,tq.score,
+        tq.qorder,tq.qn,tq.optionnum,tq.coord,tq.gnum,tq.height,tq.queshtml
         from e_paper_qtype_question tq  left join e_paper_qtype t on t.eptid=tq.eptid
-        left join t_question q on tq.questionid=q.questionid
-        where t.epid=#{epid} order by t.eptorder,tq.qorder,q.sorder
+        where t.epid=#{epid} order by t.eptorder,tq.qorder
     </select>
 
     <!--保存试题正确答案-->

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sexam.mapper.paper.EPaperQtypeQuestionMapper">
+
+    <!--保存试题正确答案-->
+    <update id="updateBatchQuestionAnswer">
+        update e_paper_qtype_question set
+        <trim prefix="answer=case" suffix="end">
+            <foreach collection="list" item="q">
+                when eptqid=#{q.eptqid} then #{q.answer}
+            </foreach>
+        </trim>
+        <where>
+            <foreach collection="list" item="q" separator="or">
+                eptqid=#{q.eptqid}
+            </foreach>
+        </where>
+    </update>
+
+    <!--保存试卷答题卡坐标-->
+    <update id="updateBatchQuestionForScan">
+        update e_paper_qtype_question
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="coord = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.coord}
+                </foreach>
+            </trim>
+            <trim prefix="gnum = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.gnum}
+                </foreach>
+            </trim>
+            <trim prefix="height = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.height}
+                </foreach>
+            </trim>
+            <trim prefix="queshtml = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.queshtml}
+                </foreach>
+            </trim>
+        </trim>
+        <where>
+            <foreach collection="list" item="q" separator="or">
+                eptqid=#{q.eptqid}
+            </foreach>
+        </where>
+    </update>
+
+    <!--保存主观题选项数量-->
+    <update id="updateBatchQuestionOptionnum">
+        update e_paper_qtype_question
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="optionnum = case" suffix="end,">
+                <foreach collection="list" item="q">
+                    when eptqid=#{q.eptqid} then #{q.optionnum}
+                </foreach>
+            </trim>
+        </trim>
+        <where>
+            <foreach collection="list" item="q" separator="or">
+                eptqid=#{q.eptqid}
+            </foreach>
+        </where>
+    </update>
+
+    <!--试卷中所有试题基础信息-->
+    <select id="listQuestionsByEpid" resultType="com.xhkjedu.sexam.model.paper.EPaperQtypeQuestion">
+        select * from e_paper_qtype_question where epid=#{epid} order by qorder
+    </select>
+
+
+</mapper>

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

     @Test
     void contextLoads() {
         EPaper ePaper = new EPaper();
-        ePaper.setEpid(68);
-        ePaper.setPnum(15);
-        ePaper.setPscore(172.0);
+        ePaper.setEpid(289);
+        ePaper.setPnum(7);
+        ePaper.setPscore(80.0);
 
-        ePaperQtypeService.chandleScantronFile(156);
+        ePaperQtypeService.savePaperAnalyzeForQuestion(ePaper);
     }
 
 }

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

                 List<QuestionVo> questions = b.getQuestions();
 
                 List<QuestionVo> tllist = questions.stream().filter( o -> o.getHashear() ==1).collect(Collectors.toList());
-                if(N_Utils.isNotEmpty(tllist)){
+                if(N_Utils.isListNotEmpty(tllist)){
                     hearqs.addAll(tllist);
 
                     questions = questions.stream().filter( o -> o.getHashear() ==0).collect(Collectors.toList());
                 b.setQuestions(questions);
             }
 
-            if(N_Utils.isNotEmpty(hearqs)){
+            if(N_Utils.isListNotEmpty(hearqs)){
                 UserBasketVo tlvo = new UserBasketVo();
                 tlvo.setQtypename("听力题");
                 tlvo.setPtnum(hearqs.size());
                 tlvo.setPtscore(scoretotal);
                 tlvo.setQuestions(hearqs);
                 baskets.add(0,tlvo);
-
             }
         }else{
             for (UserBasketVo b : baskets) {

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

         <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!=''">
             and qp.pointid=#{question.pointid}
         </if>
-        <if test="question.qtypeid!=null and question.qtypeid!='0'.toString() and question.qtypeid!=''">
-            and q.qtypeid=#{question.qtypeid}
+        <if test="question.hashear!=null and question.hashear == 1">
+            and q.hashear=1
+        </if>
+        <if test="question.hashear!=1 and question.qtypeid!=null and question.qtypeid!='0'.toString() and question.qtypeid!=''">
+            and q.hashear=0 and q.qtypeid=#{question.qtypeid}
         </if>
         <if test="question.complexity!=null and question.complexity!=0">
             and q.complexity=#{question.complexity}