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

sexam/src/main/java/com/xhkjedu/sexam/controller/report/EReportStudentController.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.sexam.controller.report;
 
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author ywx
@@ -8,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @description 学生报告
  * @date 2022/8/8 9:44
  **/
+@RestController
 @RequestMapping("erstu")
 public class EReportStudentController {
 }

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclassQtype.java

@@ -50,5 +50,5 @@ public class ERclassQtype extends BaseBean {
     private Double classsrate;
 
     //小题题号字符串（1，2）
-    private String qn;
+    private String qns;
 }

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclassQuestionPoint.java

@@ -25,6 +25,9 @@ public class ERclassQuestionPoint extends BaseBean {
     //科目id
     private String subjectid;
 
+    //知识点id
+    private String pointid;
+
     //知识点名称
     private String pointname;
 

sexam/src/main/java/com/xhkjedu/sexam/model/reportstu/ERstudentPoint.java

@@ -25,11 +25,14 @@ public class ERstudentPoint extends BaseBean {
     //班级id
     private Integer classid;
 
+    //知识点id
+    private String pointid;
+
     //知识点名称
     private String pointname;
 
     //知识点题号
-    private String pqn;
+    private String qns;
 
     //知识点分值
     private Double score;

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

@@ -316,6 +316,7 @@ public class EPaperQtypeService {
             double scorerate = N_Utils.getDoubleDivideAndMulitiply(cscore, ePaper.getPscore());
             List<Integer> thlist = pvo.stream().map(EPaperQPointVo :: getQorder).collect(Collectors.toList());
             thlist = thlist.stream().distinct().collect(Collectors.toList());
+            pm.put("pointid",pvo.get(0).getPointid());
             pm.put("pointname",pvo.get(0).getPointname());
             pm.put("score",cscore);
             pm.put("srate",scorerate);

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java

@@ -378,7 +378,6 @@ public class EReportGenerateService {
                         qnstr = qnstr + "," + q.getQn();
                     }
 
-
                     //获取指定试题试题得分
                     List<EPaperStudentQuestion> qstu = stulist.stream().filter(o -> o.getEpid().equals(t.getEpid())
                              && o.getEptqid().equals(q.getEptqid())).collect(Collectors.toList());
@@ -451,7 +450,6 @@ public class EReportGenerateService {
                     eRclassQtype.setEpid(epid);
                     eRclassQtype.setClassid(entry.getKey());
                     eRclassQtype.setQtypename(t.getEptname());
-                    eRclassQtype.setQn(t.getEptorder().toString());
                     eRclassQtype.setScore(eptscore);
                     eRclassQtype.setNum(t.getEptnum());
                     eRclassQtype.setSrate(N_Utils.getDoubleDivideAndMulitiply(eptscore,pscore));
@@ -459,7 +457,7 @@ public class EReportGenerateService {
                     eRclassQtype.setGradesrate(tgsrate);
                     eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getTcscore(),erClassScoreVo.getStunum()));
                     eRclassQtype.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getTcscore(),eptscore * erClassScoreVo.getStunum() ));
-                    eRclassQtype.setQn(qnstr);
+                    eRclassQtype.setQns(qnstr);
 
                     rtypelist.add(eRclassQtype);
                 }
@@ -474,6 +472,7 @@ public class EReportGenerateService {
                 //遍历知识点处理年级班级知识点情况
                 for(int j=0;j<pointlist.size();j++){
                     Map pointmap = pointlist.get(j);
+                    String pointid = pointmap.get("pointid").toString();
                     String pointname = pointmap.get("pointname").toString();
                     Double score = Double.parseDouble(pointmap.get("score").toString());
                     Double scorerate = Double.parseDouble(pointmap.get("scorerate").toString());
@@ -498,6 +497,7 @@ public class EReportGenerateService {
                         pointvo.setClassid(classid);
                         pointvo.setEpid(epid);
                         pointvo.setSubjectid(subjectid);
+                        pointvo.setPointid(pointid);
                         pointvo.setPointname(pointname);
                         pointvo.setScore(score);
                         pointvo.setSrate(scorerate);

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

@@ -333,8 +333,12 @@ public class QuestionService {
         Map map = setSaveUpdateQuestion(question,saveQues,saveQPoints);
         setSaveUpdateQuesitonDirector(oldQuestion,question,saveQDirs);
         questionMapper.saveBathQuestion(saveQues);//保存试题
-        questionPointMapper.batchSave(saveQPoints);//保存试题关联知识点信息
-        questionDirectorMapper.batchSave(saveQDirs);//保存试题关联章节
+        if(N_Utils.isListNotEmpty(saveQPoints)){
+            questionPointMapper.batchSave(saveQPoints);//保存试题关联知识点信息
+        }
+        if(N_Utils.isListNotEmpty(saveQDirs)){
+            questionDirectorMapper.batchSave(saveQDirs);//保存试题关联章节
+        }
 
         //删除试题栏中原题，加入新题
        /* userBasketMapper.deleteByQuestioniduid(question.getCreateid(),oldQuestion.getQuestionid());

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

@@ -45,6 +45,9 @@ public class QuestionVo {
     //创建人
     private String createname;
 
+    //听力题文件地址
+    private String hearfile;
+
     //试题关联知识点
     private List<PointVo> points;
 

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

@@ -48,4 +48,7 @@ public class SelectQuestionVo {
 
     //创建人id
     private Integer createid;
+
+    //听力题听力文件地址
+    private String hearfile;
 }

sstudy/src/main/resources/application.properties

@@ -64,7 +64,7 @@ rabbitmq.resourceDelQueue=xhkjedutest.xhschool.resourceDelQueue_dev
 rabbitmq.resourceHandleQueue=xhkjedutest.xhschool.resourceHandleQueue_dev
 rabbitmq.imgMergeQueue=xhkjedutest.xhschool.imgMergeQueue_dev
 rabbitmq.imgMergeHandleQueue=xhkjedutest.xhschool.imgMergeHandleQueue_dev
-spring.rabbitmq.host=116.63.199.166
+spring.rabbitmq.host=49.4.26.249
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=xhkjedu
 spring.rabbitmq.password=xhkjedud07

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

@@ -68,6 +68,7 @@
         <result property="count" column="count"></result>
         <result property="directorid" column="directorid"></result>
         <result property="directorname" column="directorname"></result>
+        <result property="hearfile" column="hearfile"></result>
         <result property="belong" column="belong"></result>
         <result property="createid" column="createid"></result>
         <result property="source" column="source"></result>
@@ -114,7 +115,7 @@
     <select id="findById" resultMap="questionResult">
         select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong
         ,q.qtypeid,q.qtypename,q.createtime,q.source,q.year,q.region,q.schoolname,q.subjectid,q.schoolid
-        ,qd.directorid,d.directorall directorname,d.lsbid,
+        ,qd.directorid,d.directorall directorname,d.lsbid,q.hearfile
         sb.level,sb.subjectid,s.subjectname,v.versionname,sb.lsbname
         ,(select a.areaall from t_areazone a where a.areacode=q.region)areaall
         from t_question q left join t_question_director qd on q.questionid=qd.questionid
@@ -127,7 +128,7 @@
     <!--管理端试题列表-->
     <select id="findAll" resultType="com.xhkjedu.sstudy.vo.question.QuestionVo">
         select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong,q.createid
-        ,q.qtypeid,q.qtypename,q.createtime,q.count,q.qstate,q.source,q.year,q.region,q.schoolname
+        ,q.qtypeid,q.qtypename,q.createtime,q.count,q.qstate,q.source,q.year,q.region,q.schoolname,q.hearfile
         from t_question q left join t_question_director qd on q.questionid=qd.questionid
         <if test="question.belong!=null and question.belong==5">
             left join t_question_collect qc on q.questionid = qc.questionid
@@ -189,7 +190,7 @@
     <select id="listForSelect" resultType="com.xhkjedu.sstudy.vo.question.SelectQuestionVo">
         select q.questionid,q.score,q.complexity,q.qstem,q.qoption,q.qanswer,q.qanalyze
         ,q.qtypeid,q.qtypename,q.count,GROUP_CONCAT(p.pointname)points,q.ctype,q.belong,q.createid
-        ,q.source,q.year,q.region,q.schoolname,q.qlevel
+        ,q.source,q.year,q.region,q.schoolname,q.qlevel,q.hearfile
         from t_question q left join t_question_point qp on q.questionid = qp.questionid
         left join t_point p on p.pointid=qp.pointid
         left join t_question_director qd on q.questionid=qd.questionid