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

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppRecordService.java

     //删除
     public Integer deleteById(Integer versionid) {
         List<String> resourceUrls = appRecordMapper.listFolder(versionid);//获取APP文件夹
+        int result = appRecordMapper.deleteByPrimaryKey(versionid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appRecordMapper.deleteByPrimaryKey(versionid);
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppScanService.java

 
 import com.xhkjedu.sapi.listener.MessageSender;
 import com.xhkjedu.sapi.mapper.appversion.AppScanMapper;
-import com.xhkjedu.sapi.mapper.appversion.AppScanMapper;
 import com.xhkjedu.sapi.model.appversion.TAppScan;
 import com.xhkjedu.sapi.vo.appversion.AppversionVo;
 import com.xhkjedu.utils.N_Utils;
     //删除
     public Integer deleteById(Integer versionid) {
         List<String> resourceUrls = AppScanMapper.listFolder(versionid);//获取APP文件夹
+        Integer result = AppScanMapper.deleteByPrimaryKey(versionid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return AppScanMapper.deleteByPrimaryKey(versionid);
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppStuappService.java

     //删除
     public Integer deleteById(Integer versionid) {
         List<String> resourceUrls = appStuappMapper.listFolder(versionid);//获取APP文件夹
+        Integer result = appStuappMapper.deleteByPrimaryKey(versionid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appStuappMapper.deleteByPrimaryKey(versionid);
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppStuliveService.java

     //删除
     public Integer deleteById(Integer versionid) {
         List<String> resourceUrls = appStuliveMapper.listFolder(versionid);//获取APP文件夹
+        Integer result = appStuliveMapper.deleteByPrimaryKey(versionid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appStuliveMapper.deleteByPrimaryKey(versionid);
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppTeacherappService.java

     //删除
     public Integer deleteById(Integer versionid) {
         List<String> resourceUrls = appTeacherappMapper.listFolder(versionid);//获取APP文件夹
+        int result = appTeacherappMapper.deleteByPrimaryKey(versionid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appTeacherappMapper.deleteByPrimaryKey(versionid);
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppTeacherclientService.java

     //删除
     public Integer deleteById(Integer versionid) {
         List<String> resourceUrls = appTeacherclientMapper.listFolder(versionid);//获取APP文件夹
+        Integer result = appTeacherclientMapper.deleteByPrimaryKey(versionid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appTeacherclientMapper.deleteByPrimaryKey(versionid);
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppTeacherliveService.java

     //删除
     public Integer deleteById(Integer versionid) {
         List<String> resourceUrls = appTeacherliveMapper.listFolder(versionid);//获取APP文件夹
+        Integer result = appTeacherliveMapper.deleteByPrimaryKey(versionid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appTeacherliveMapper.deleteByPrimaryKey(versionid);
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppthirdService.java

     @Transactional(rollbackFor = Exception.class)
     public Integer deleteById(Integer appid) {
         List<String> resourceUrls = appthirdHistoryMapper.listFolder(appid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        Integer result = appthirdMapper.deleteByPrimaryKey(appid);
         handleThirdManager(appid, 2);//处理应用白名单
-        return appthirdMapper.deleteByPrimaryKey(appid);
+        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        return result;
     }
 
     //修改
      **/
     public void deleteByApphId(Integer apphid) {
         List<String> resourceUrls = appthirdHistoryMapper.listFolder2(apphid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
         appthirdHistoryMapper.deleteByPrimaryKey(apphid);
+        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
     }
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/itemtool/ReadService.java

      */
     public Integer del(Integer readid){
         List<String> resourceUrls = readMapper.listFolder(readid);//获取电子书文件夹
+        Integer result = readMapper.deleteByPrimaryKey(readid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return readMapper.deleteByPrimaryKey(readid);
+        return result;
     }
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchService.java

      */
     public Integer del(Integer researchid) {
         List<String> resourceUrls = researchMapper.listFolder(researchid);//获取教研文件夹
+        Integer result = researchMapper.deleteByPrimaryKey(researchid);
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return researchMapper.deleteByPrimaryKey(researchid);
+        return result;
     }
 
     /**

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

     //年级得分
     private Double gradescore;
 
+    //年级平均分
+    private Double gradeavgscore;
+
     //年级得分率
     private Double gradesrate;
 
     //班级得分
     private Double classscore;
 
+    //班级平均分
+    private Double classavgscore;
+
     //班级得分率
     private Double classsrate;
 

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

 
         Map rtnmap = new HashMap();
         rtnmap.put("answerlist", JSON.toJSONString(answermap));
-        if(goodlist.size()>0){
-            rtnmap.put("goodlist", JSON.toJSONString(goodlist));
-        }else{
-            rtnmap.put("goodlist", "");
-        }
-        if(badlist.size()>0){
-            rtnmap.put("badlist", JSON.toJSONString(badlist));
-        }else{
-            rtnmap.put("badlist", "");
-        }
-
+        rtnmap.put("goodlist", JSON.toJSONString(goodlist));
         rtnmap.put("badlist", JSON.toJSONString(badlist));
         rtnmap.put("erroroption",erroroption);
         return rtnmap;
             Double tgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();//难易度下学生得分
             Double tgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();//难易度下试题总分
             Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);//年级得分率
+            Double tgavgscore = N_Utils.getDoubleDivideForAvg(tgstuscore,qgstulist.size());
+
 
             for (Map classm : classes) {
                 Integer classid = Integer.parseInt(classm.get("classid").toString());
                 if(N_Utils.isListNotEmpty(qcstulist)){
                     Double qcscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
                     Double qcstuscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                    Double qcavgscore = N_Utils.getDoubleDivideForAvg(qcstuscore,qcstulist.size());
 
                     ERclassComplexity erc = new ERclassComplexity();
                     erc.setExamid(examPaperClassVo.getExamid());
                     erc.setScore(score);
                     erc.setSrate(srate);
                     erc.setGradescore(tgstuscore);
+                    erc.setGradeavgscore(tgavgscore);
                     erc.setGradesrate(tgsrate);
                     erc.setClassscore(qcstuscore);
                     erc.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(qcstuscore, qcscore));
+                    erc.setClassavgscore(qcavgscore);
                     erc.setQns(qns.substring(0, qns.lastIndexOf(",")));
                     complist.add(erc);
                 }

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

     //试题题干
     private String qstem;
 
+    private String qstemtxt;
+
     //试题选项
     private String qoption;
 

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

             <result column="answer" property="answer"></result>
             <result column="qctype" property="ctype"></result>
             <result column="qstem" property="qstem"></result>
+            <result column="qstemtxt" property="qstemtxt"></result>
             <result column="qoption" property="qoption"></result>
             <result column="qanswer" property="qanswer"></result>
             <result column="qanalyze" property="qanalyze"></result>
     <!--试题详情-->
     <select id="listPaperQtypeQuestions" resultMap="qtypesQuestion">
         select t.eptid,t.epid,t.ctype,t.eptname,t.eptnum,t.eptorder,t.eptscore,tq.eptqid,tq.questionid,tq.answer,
-               tq.score,tq.qn,tq.qorder,q.qtypeid,q.qtypename,q.ctype qctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,
+               tq.score,tq.qn,tq.qorder,q.qtypeid,q.qtypename,q.ctype qctype,q.qstem,q.qstemtxt,q.qoption,q.qanswer,q.qanalyze,
                q.complexity,q.hashear,q.hearfile,q.qlevel,q.sorder,q.questionpid,fq.snum,fq.qstem as mqstem,fq.complexity as mcomplexity,
                fq.qtypeid mqtypeid,fq.qtypename mqtypename,fq.ctype mctype,fq.qanalyze mqanalyze,fq.qanswer mqanswer,
                fq.qlevel mqlevel,fq.hashear mhashear,fq.hearfile mhearfile

sexam/src/main/resources/mapper/report/ERstudentMapper.xml

     <select id="listStudentExamHistory" resultType="java.util.Map">
         select e.examid,e.examdate,s.classrank,s.schoolrank
         from e_rstudent s LEFT JOIN e_base e on s.examid=e.examid
-        where s.studentid=#{studentid} and s.subjectid=#{subjectid} order by e.examdate desc limit 10
+        where s.studentid=#{studentid} and s.subjectid=#{subjectid} order by e.examdate limit 10
     </select>
 
     <!--学生报告-学科分析-学科名次-->
     </select>
     <!--学生报告-学科分析-难易度分析-->
     <select id="listSubjectComplexitys" resultType="java.util.Map">
-        select sc.complexity,sc.stuscore,sc.stusrate,cc.score,cc.srate,cc.gradescore,cc.gradesrate,cc.classscore,cc.classsrate,cc.qns
+        select sc.complexity,sc.stuscore,sc.stusrate,cc.score,cc.srate,cc.gradescore,cc.gradeavgscore,cc.gradesrate,
+               cc.classscore,cc.classavgscore,cc.classsrate,cc.qns
         from e_rstudent_complexity sc left join e_rclass_complexity cc on sc.examid=cc.examid
             and sc.subjectid=cc.subjectid and sc.complexity=cc.complexity and sc.classid=cc.classid
         where sc.examid=#{examid} and sc.subjectid=#{subjectid} and sc.studentid=#{studentid} order by sc.complexity
     </select>
     <!--学生报告-学科分析-题型分析-->
     <select id="listSubjectQtypes" resultType="java.util.Map">
-        select st.qtypename,st.stuscore,st.stusrate,ct.score,ct.srate,ct.gradescore,ct.gradesrate,ct.classscore,ct.classsrate,ct.qns
+        select st.qtypename,st.stuscore,st.stusrate,ct.score,ct.srate,ct.gradescore,ct.gradesrate,ct.gradeavgscore
+               ,ct.classscore,ct.classsrate,ct.classavgscore,ct.qns
         from e_rstudent_qtype st left join e_rclass_qtype ct on st.examid=ct.examid
             and st.subjectid=ct.subjectid and st.qtypeid=ct.qtypeid and st.classid=ct.classid
         where st.examid=#{examid} and st.subjectid=#{subjectid} and st.studentid=#{studentid} order by st.erstid
     <!--学生报告-学科分析-试题分析（附件）-->
     <select id="listSubjectQuestionsForFj" resultType="java.util.Map">
         select sq.qn,sq.qorder,sq.stuscore,sq.qscore,cq.qtypename,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate
+               ,cq.gradeavgscore,cq.classavgscore
         from e_paper_student_question sq left join e_paper_student ps on sq.epsid=ps.epsid
         left join e_rclass_question cq on ps.examid=cq.examid and sq.eptqid=cq.eptqid and sq.classid=cq.classid
         and cq.eptqid=cq.eptqid where ps.examid=#{examid} and ps.subjectid=#{subjectid} and sq.studentid=#{studentid} order by sq.eptqid
         <result property="qtypename" column="qtypename" />
         <result property="classscore" column="classscore" />
         <result property="classsrate" column="classsrate" />
+        <result property="classavgscore" column="classavgscore" />
         <result property="gradescore" column="gradescore" />
         <result property="gradesrate" column="gradesrate" />
+        <result property="gradeavgscore" column="gradeavgscore" />
         <result property="qscore" column="score" />
         <result property="epid" column="epid" />
         <result property="qn" column="qn" />
     </resultMap>
     <select id="listSubjectQuestionsForTk" resultMap="listSubjectQuesTk">
         select cq.questionid,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate,cq.qtypename,cq.score,
-        cq.epid,cq.qn,ps.studentid from e_rclass_question cq
+        cq.epid,cq.qn,ps.studentid,cq.classavgscore,cq.gradeavgscore from e_rclass_question cq
         left join e_paper_student ps on cq.epid=ps.epid and cq.classid=ps.classid
         where  cq.epid=#{epid} and ps.studentid=#{studentid} order by cq.qorder
     </select>

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

      */
     public Integer delPaper(TPaper paper){
         List<String> resourceUrls = paperFileService.listFolder(paper.getPaperid());//获取作业文件夹
+        int result =  paperMapper.delPaper(paper.getPaperid());
         messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return paperMapper.delPaper(paper.getPaperid());
+        return result;
     }
 
     /**

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

     //试题题干
     private String qstem;
 
+
+    private String qstemtxt;
+
     //试题选项
     private String qoption;
 
     //子题
     private List<Map> sonqlist;
 
-    private String qstemtxt;
 }

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

 
 import java.util.List;
 
+
 @Data
 public class UserBasketVo {
     //用户id

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

             <result property="complexity" column="complexity"></result>
             <result property="ctype" column="ctype"></result>
             <result property="qstem" column="qstem"></result>
+            <result property="qstemtxt" column="qstemtxt"></result>
             <result property="qoption" column="qoption"></result>
             <result property="qanswer" column="qanswer"></result>
             <result property="qanalyze" column="qanalyze"></result>
         <result property="complexity" column="complexity"></result>
         <result property="ctype" column="ctype"></result>
         <result property="qstem" column="qstem"></result>
+        <result property="qstemtxt" column="qstemtxt"></result>
         <result property="qoption" column="qoption"></result>
         <result property="qanswer" column="qanswer"></result>
         <result property="qanalyze" column="qanalyze"></result>
         </collection>
     </resultMap>
     <select id="findAll" resultMap="basketResult">
-        select ub.*,q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.createtime
+        select ub.*,q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qstemtxt,q.qoption,q.qanswer,q.qanalyze,q.createtime
         ,q.count,qp.pointid,p.pointname,q.qlevel,q.snum,q.hashear,q.hearfile
         from t_user_basket ub left join t_subject_questiontype tsq on ub.qtypeid = tsq.qtypeid
         left join t_question q on ub.questionid = q.questionid
         order by tsq.qtypeorder,q.questionid
     </select>
     <select id="listSonQuestions" resultMap="listSonQuestions">
-        select q.questionid,q.score,q.complexity,q.ctype,q.qtypeid,q.qtypename,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.createtime
+        select q.questionid,q.score,q.complexity,q.ctype,q.qtypeid,q.qtypename,q.qstem,q.qstemtxt,q.qoption,q.qanswer,q.qanalyze,q.createtime
          ,q.count,q.questionpid,q.qlevel,q.sorder,qp.pointid,p.pointname from t_question q
         left join t_question_point qp on q.questionid = qp.questionid
         left join t_point p on qp.pointid = p.pointid