试题栏添加ctyp,答题卡转pdf进行名字固定

sexam/src/main/java/com/xhkjedu/sexam/listener/MessageSender.java

@@ -51,13 +51,13 @@ public class MessageSender {
      * @Author wn
      * @Date 2022/8/2 13:57
      **/
-    public void base64ToPdf(Integer epid,Integer examid, List<String> imgs,String savefolder,Integer scantroncol) {
+    public void base64ToPdf(Integer examid, List<String> imgs,String savefolder,Integer scantroncol,String filename) {
         Map map = new HashMap();
-        map.put("epid", epid);
         map.put("examid", examid);
         map.put("imgs", imgs);
         map.put("scantroncol", scantroncol);
         map.put("savefolder",savefolder);
+        map.put("filename",filename);
 
         rabbitTemplate.convertAndSend(examBaseToPdfQueue, JSON.toJSONString(map));
     }

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

@@ -228,12 +228,14 @@ public class EBaseService {
                 Integer epid = paper.getEpid();
                 //获取试卷中所有试题
                 List<EPaperQtypeQuestion> queslist = ePaperQtypeQuestionMapper.listQuestionsByEpid(epid);
-                for (EPaperStudent ps : studentList) {
+                //获取该还是卷下试题学生信息
+                List<EPaperStudent> paperstulist = studentList.stream().filter(s -> s.getEpid().equals(epid)).collect(Collectors.toList());
+                for (EPaperStudent ps : paperstulist) {
                     for(EPaperQtypeQuestion q : queslist){
                         EPaperStudentQuestion epsq = new EPaperStudentQuestion();
                         epsq.setClassid(ps.getClassid());
                         epsq.setStudentid(ps.getStudentid());
-                        epsq.setEpid(ps.getEpid());
+                        epsq.setEpid(epid);
                         epsq.setEpsid(ps.getId());
                         epsq.setEptqid(q.getEptqid());
                         epsq.setCtype(q.getCtype());

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

@@ -811,8 +811,9 @@ public class EPaperQtypeService {
                 Integer schoolid = Integer.parseInt(map.get("schoolid").toString());
                 String cloudcode =  map.get("cloudcode").toString();
                 String path = cloudcode + File.separator + schoolid + File.separator + "exam";
+                String filename = map.get("examname").toString() + "(" + map.get("subjectname").toString() + ")";
                 Integer scantroncol = Integer.parseInt(map.get("scantroncol").toString());
-                convertUtil.baseToPdf(epid,examid,scantronfiles,path,scantroncol);
+                convertUtil.baseToPdf(examid,scantronfiles,path,scantroncol,filename);
             }
         }
     }

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

@@ -443,7 +443,6 @@ public class EPaperStudentService {
         if(!N_Utils.isTrueInteger(userid)){
             updateScanErrorInfo(2,pswvo);
             return;
-//            throw new Exception("考号有误");
         }
         //获取学生试卷
         EPaperStudent ps = ePaperStudentMapper.getPaperStudentByStuidAndEpid(pswvo.getEpid(),userid);
@@ -452,7 +451,6 @@ public class EPaperStudentService {
         if(ps == null) {
             updateScanErrorInfo(3,pswvo);
             return;
-//            throw new Exception("学生试卷不存在");
         }
         pswvo.setEpsid(ps.getEpsid());
         if(pswvo.getSstate() == 3){
@@ -520,10 +518,11 @@ public class EPaperStudentService {
             if(paperStudent.getHasbad() == 1){
                 eScanbatchMapper.updateWgnum(paperStudent.getBatchid());
             }
-            if(checked == 0){
+            //以下方法是合并答题卡图片，2022-08-19改成base64后客户端合并接口不再处理
+            /*if(checked == 0){
                 //获取试卷中需要合并图片的试题
                 chandleStudentQuestionNoconvertedPic(pswvo.getEpsid(),2);
-            }
+            }*/
         }
     }
 

sexam/src/main/java/com/xhkjedu/sexam/utils/ConvertUtil.java

@@ -36,8 +36,8 @@ public class ConvertUtil {
      * @Author wn
      * @Date 2022/8/2 17:20
      **/
-    public void baseToPdf(Integer epid,Integer examid, List<String> imgs, String savefolder,Integer scantroncol) {
-        messageSender.base64ToPdf(epid, examid,imgs, savefolder,scantroncol);
+    public void baseToPdf(Integer examid, List<String> imgs, String savefolder,Integer scantroncol,String filename) {
+        messageSender.base64ToPdf(examid,imgs, savefolder,scantroncol,filename);
     }
 
 }

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

@@ -119,9 +119,10 @@
 
     <!--获取试卷中答题卡文件-->
     <select id="getPaperScantronfile" resultType="java.util.Map">
-        select p.epid,p.examid,p.scantronfile,p.scantroncol,e.schoolid,
+        select p.epid,p.examid,p.scantronfile,p.scantroncol,e.schoolid,e.examname,s.subjectname,
         (select cloudcode from t_cloud limit 1) cloudcode
         from e_paper p left join e_base e on p.examid=e.examid
+        left join e_subject s on p.esid=s.esid
         where p.epid=#{epid}
     </select>
 

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

@@ -53,4 +53,7 @@ public interface UserBasketMapper extends TkMapper<TUserBasket> {
      * @return java.lang.Integer
      */
     Integer deleteByQuestioniduid(Integer userid, String questionid);
+
+    //获取试题处理题型
+    Integer getCtypeByQtypeid(@Param("qtypeid")String qtypeid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TUserBasket.java

@@ -19,6 +19,8 @@ public class TUserBasket extends BaseBean {
     //科目id
     private String subjectid;
 
+    private Integer ctype;
+
     //题型id
     private String qtypeid;
 

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

@@ -33,6 +33,8 @@ public class UserBasketService {
     public Integer save(TUserBasket model) {
         Integer ubid = userBasketMapper.getUbidByUserIdQuestionId(model.getUserid(),model.getQuestionid());
         if (N_Utils.isEmptyInteger(ubid)) {
+            Integer ctype = userBasketMapper.getCtypeByQtypeid(model.getQtypeid());
+            model.setCtype(ctype);
             model.setCreatetime(N_Utils.getSecondTimestamp());
             userBasketMapper.insertUseGeneratedKeys(model);
             questionMapper.updateCount(model.getQuestionid());//更新组题次数
@@ -75,10 +77,6 @@ public class UserBasketService {
 
                     questions = questions.stream().filter( o -> o.getHashear() ==0).collect(Collectors.toList());
                 }
-                /*b.setPtnum(questions.size());
-                Double scoretotal = questions.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
-                b.setPtscore(scoretotal);
-                b.setQuestions(questions);*/
 
                 if(questions.size() > 0){
                     UserBasketVo bn = new UserBasketVo();
@@ -97,6 +95,7 @@ public class UserBasketService {
                 UserBasketVo tlvo = new UserBasketVo();
                 tlvo.setQtypeid("tlt");
                 tlvo.setQtypename("听力题");
+                tlvo.setCtype(12);
                 tlvo.setPtnum(hearqs.size());
                 Double scoretotal = hearqs.stream().collect(Collectors.summingDouble(QuestionVo::getScore));
                 tlvo.setPtscore(scoretotal);

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

@@ -12,6 +12,8 @@ public class UserBasketVo {
     //科目id
     private String subjectid;
 
+    private Integer ctype;
+
     //题型id
     private String qtypeid;
 

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

@@ -4,6 +4,7 @@
     <resultMap id="basketResult" type="com.xhkjedu.sstudy.vo.question.UserBasketVo">
         <result property="userid" column="userid"></result>
         <result property="subjectid" column="subjectid"></result>
+        <result property="ctype" column="ctype"></result>
         <result property="qtypeid" column="qtypeid"></result>
         <result property="qtypename" column="qtypename"></result>
         <collection property="questions" ofType="com.xhkjedu.sstudy.vo.question.QuestionVo">
@@ -87,4 +88,9 @@
     <delete id="deleteByQuestioniduid">
         delete from t_user_basket where userid=#{userid} and questionid=#{questionid}
     </delete>
+
+    <!--获取试题处理题型-->
+    <select id="getCtypeByQtypeid" resultType="java.lang.Integer">
+        select ctype FROM t_subject_questiontype where qtypeid=#{qtypeid}
+    </select>
 </mapper>