班级报告优化

背诵优化
作业试题统计注释掉

sapi/src/main/java/com/xhkjedu/sapi/service/classreport/ClassReportService.java

@@ -1,8 +1,25 @@
 package com.xhkjedu.sapi.service.classreport;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.sapi.mapper.classreport.*;
-import com.xhkjedu.sapi.model.classreport.*;
+import com.xhkjedu.sapi.mapper.classreport.ClassReportMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassErrorqueMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassErrorquefdMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassGuideMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassLiveMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassPaperMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassPointMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassReciteMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClassRoomMapper;
+import com.xhkjedu.sapi.mapper.classreport.ReportClasstypeMapper;
+import com.xhkjedu.sapi.model.classreport.TReportClassErrorque;
+import com.xhkjedu.sapi.model.classreport.TReportClassErrorquefd;
+import com.xhkjedu.sapi.model.classreport.TReportClassGuide;
+import com.xhkjedu.sapi.model.classreport.TReportClassLive;
+import com.xhkjedu.sapi.model.classreport.TReportClassPaper;
+import com.xhkjedu.sapi.model.classreport.TReportClassPoint;
+import com.xhkjedu.sapi.model.classreport.TReportClassRecite;
+import com.xhkjedu.sapi.model.classreport.TReportClassRoom;
+import com.xhkjedu.sapi.model.classreport.TReportClasstype;
 import com.xhkjedu.sapi.vo.classreport.CGradeSubjectVo;
 import com.xhkjedu.sapi.vo.classreport.ReportClasstypeVo;
 import com.xhkjedu.sapi.vo.classreport.ReportRateVo;
@@ -13,7 +30,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.DoubleSummaryStatistics;
+import java.util.HashMap;
+import java.util.IntSummaryStatistics;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -1055,8 +1079,8 @@ public class ClassReportService {
             r.setGuidemaxnum(c.getMaxnum());//发布预习最高次数
             r.setGuideprerate(c.getNumrate());//发布预习次数同比
             r.setGuiderank(c.getRank());//发布预习次数排名
-            r.setPrerate(c.getTjprerate());//平均预习率
-            r.setGuideavgrate(c.getPjtjrate());//预习率同比
+            r.setPrerate(c.getTjprerate());//预习率同比
+            r.setGuideavgrate(c.getPjtjrate());//平均预习率
             list1.add(r);
             return list1;
         }
@@ -1203,35 +1227,36 @@ public class ClassReportService {
 
             Double commitrate = 0.0;//提交率
             Double checkrate = 0.0;//批改率
-            if (module.equals("preview") || module.equals("classroom") || module.equals("paper") || module.equals("recite")) {//预习、课堂、作业、背诵
-                int xsnum = list2.stream().mapToInt(ReportClasstypeVo::getXsnum).sum();
-                int tjnum = list2.stream().mapToInt(ReportClasstypeVo::getTjnum).sum();
-                pjtjrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getNumrate).summaryStatistics().getAverage(), 2);
-                commitrate = N_Utils.getIntegerDivideAndMulitiply(tjnum, xsnum);
+            gslist.add(gs);
+            if (cid.equals(classid)) {
+                if (module.equals("preview") || module.equals("classroom") || module.equals("paper") || module.equals("recite")) {//预习、课堂、作业、背诵
+                    int xsnum = list2.stream().mapToInt(ReportClasstypeVo::getXsnum).sum();
+                    int tjnum = list2.stream().mapToInt(ReportClasstypeVo::getTjnum).sum();
+                    pjtjrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getNumrate).summaryStatistics().getAverage(), 2);
+                    commitrate = N_Utils.getIntegerDivideAndMulitiply(tjnum, xsnum);
 
-                if (module.equals("paper")) {//作业
-                    int pgnum = list2.stream().mapToInt(ReportClasstypeVo::getPgnum).sum();
-                    checkrate = N_Utils.getIntegerDivideAndMulitiply(pgnum, tjnum);
-                    pjpgrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getPgrate).summaryStatistics().getAverage(), 2);
+                    if (module.equals("paper")) {//作业
+                        int pgnum = list2.stream().mapToInt(ReportClasstypeVo::getPgnum).sum();
+                        checkrate = N_Utils.getIntegerDivideAndMulitiply(pgnum, tjnum);
+                        pjpgrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getPgrate).summaryStatistics().getAverage(), 2);
+                    }
+                } else if (module.equals("live")) {//直播
+                    pjtjrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getMinutenum).summaryStatistics().getAverage(), 2);
                 }
-            } else if (module.equals("live")) {//直播
-                pjtjrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getMinutenum).summaryStatistics().getAverage(), 2);
-            }
 
-            Double correctrate = 0.0;//正确率
-            if (module.equals("paper") || module.equals("recite")) {//作业、背诵
-                Double pscore = list2.stream().mapToDouble(ReportClasstypeVo::getPscore).sum();
-                Double uscore = list2.stream().mapToDouble(ReportClasstypeVo::getUscore).sum();
-                correctrate = N_Utils.getDoubleDivideAndMulitiply(uscore, pscore);
-                pjzqrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getZqrate).summaryStatistics().getAverage(), 2);
-            }
-            gslist.add(gs);
-            if (cid.equals(classid)) {
+                Double correctrate = 0.0;//正确率
+                if (module.equals("paper") || module.equals("recite")) {//作业、背诵
+                    Double pscore = list2.stream().mapToDouble(ReportClasstypeVo::getPscore).sum();
+                    Double uscore = list2.stream().mapToDouble(ReportClasstypeVo::getUscore).sum();
+                    correctrate = N_Utils.getDoubleDivideAndMulitiply(uscore, pscore);
+                    pjzqrate = N_Utils.formatDouble(list2.stream().mapToDouble(ReportClasstypeVo::getZqrate).summaryStatistics().getAverage(), 2);
+                }
                 fbnum = num;
                 if (module.equals("preview")) {//预习
                     YearOnYearVo y = years.stream().filter(v -> v.getClassid().equals(type.getClassid()) && v.getSubjectid().equals(type.getSubjectid())).findFirst().orElse(null);
                     if (y != null) {
                         prerate = N_Utils.getIntegerDivideAndMulitiply(fbnum - y.getFbnum(), fbnum);
+                        tjprerate = N_Utils.formatDouble(commitrate - y.getTjrate(), 2);
                     }
                 } else if (module.equals("paper")) {//作业
                     YearOnYearVo y = years.stream().filter(v -> v.getClassid().equals(type.getClassid()) && v.getSubjectid().equals(type.getSubjectid())).findFirst().orElse(null);

sapi/src/main/resources/application.properties

@@ -100,4 +100,4 @@ cron.syncnum=100
 #每隔3s清除一下请求地址map
 cron.deleteUriMap=0/3 * * * * ?
 #版本号
-versionname=Test_v3.4.0
+versionname=Test_v3.4.1

sapi/src/main/resources/mapper/classreport/ClassReportMapper.xml

@@ -8,7 +8,7 @@
         and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=g.schoolid)classnum
         ,count(ggs.rgsid)xsnum
         ,sum(case when ggs.costtime!=0 then 1 else 0 end)tjnum
-        ,ifnull(round(sum(case when ggs.costtime!=0 then 1 else 0 end)*100/count(ggs.rgsid),2),0)numrate
+        ,ifnull(truncate(sum(case when ggs.costtime!=0 then 1 else 0 end)*100/count(ggs.rgsid),2),0)numrate
         ,from_unixtime(g.createtime,'%Y-%m-%d')begindate,count(distinct g.guideid)fbnum
         from t_guide g left join t_guide_group gg on g.guideid=gg.guideid
         left join t_guide_group_student ggs on ggs.guideid=gg.guideid and ggs.classid=gg.classid
@@ -51,7 +51,7 @@
         and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=r.schoolid)classnum
         ,r.classnum xsnum
         ,r.realstunum tjnum
-        ,ifnull(round(r.realstunum*100/r.classnum,2),0)numrate
+        ,ifnull(truncate(r.realstunum*100/r.classnum,2),0)numrate
         ,count(distinct case when rt.asktype between 30 and 33 then rt.asktid else null end)twnum
         ,count(distinct case when rt.asktype =40 then rt.asktid else null end)tcnum
         ,count(distinct case when rt.asktype =21 then rt.asktid else null end)dmnum
@@ -99,13 +99,13 @@
         and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=p.schoolid)classnum
         ,count(distinct case when pg.starttime<=UNIX_TIMESTAMP() then ps.psid else null end)xsnum
         ,sum(case when ps.psstate!=0 then 1 else 0 end)tjnum
-        ,ifnull(round(sum(case when ps.psstate!=0 then 1 else 0 end)*100/
+        ,ifnull(truncate(sum(case when ps.psstate!=0 then 1 else 0 end)*100/
         count(distinct case when pg.starttime<=UNIX_TIMESTAMP() then ps.psid else null end),2),0)numrate
         ,sum(case when ps.pschecked=1 then 1 else 0 end)pgnum
-        ,ifnull(round(sum(case when ps.pschecked=1 then 1 else 0 end)*100/sum(case when ps.psstate!=0 then 1 else 0 end),2),0)pgrate
+        ,ifnull(truncate(sum(case when ps.pschecked=1 then 1 else 0 end)*100/sum(case when ps.psstate!=0 then 1 else 0 end),2),0)pgrate
         ,sum(case when pg.starttime<=UNIX_TIMESTAMP() then ps.paperscore else 0 end)pscore
         ,sum(ps.userscore)uscore
-        ,ifnull(round(sum(ps.userscore)*100/sum(case when pg.starttime<=UNIX_TIMESTAMP() then ps.paperscore else 0 end),2),0)zqrate
+        ,ifnull(truncate(sum(ps.userscore)*100/sum(case when pg.starttime<=UNIX_TIMESTAMP() then ps.paperscore else 0 end),2),0)zqrate
         ,from_unixtime(p.createtime,'%Y-%m-%d')begindate,count(distinct p.paperid)fbnum
         from t_paper p left join t_paper_group pg on p.paperid=pg.paperid
         left join t_paper_student ps on ps.paperid=p.paperid and ps.classid=pg.classid
@@ -149,10 +149,10 @@
         and c1.classstate=1 and c1.classtype=c.classtype and c1.schoolid=r.schoolid)classnum
         ,count(rs.rsid)xsnum
         ,sum(case when rs.rsstate!=0 then 1 else 0 end)tjnum
-        ,ifnull(round(sum(case when rs.rsstate!=0 then 1 else 0 end)*100/count(rs.rsid),2),0)numrate
+        ,ifnull(truncate(sum(case when rs.rsstate!=0 then 1 else 0 end)*100/count(rs.rsid),2),0)numrate
         ,sum(case when rs.rsstate!=0 then 1 else 0 end)*100 pscore
         ,sum(rs.userscore)uscore
-        ,ifnull(round(sum(rs.userscore)*100/(sum(case when rs.rsstate!=0 then 1 else 0 end)*100),2),0)zqrate
+        ,ifnull(truncate(sum(rs.userscore)*100/(sum(case when rs.rsstate!=0 then 1 else 0 end)*100),2),0)zqrate
         ,from_unixtime(r.createtime,'%Y-%m-%d')begindate,count(distinct r.reciteid)fbnum
         from t_recite r left join t_recite_group rg on r.reciteid=rg.reciteid
         left join t_recite_student rs on rs.reciteid=r.reciteid and rs.classid=rg.classid
@@ -252,7 +252,7 @@
     <!--错题知识点-->
     <select id="listErrQuestionPoint" resultType="java.util.Map">
         select (select tp.pointname from t_point tp where tp.pointid=qp.pointid)pointname
-        ,qp.pointid,ifnull(round(sum(psq.stuscore)*100/sum(psq.qscore),2),0)numrate
+        ,qp.pointid,ifnull(truncate(sum(psq.stuscore)*100/sum(psq.qscore),2),0)numrate
         from t_question_class qc left join t_paper p on qc.paperid=p.paperid
         left join t_paper_student_question psq on psq.paperid=p.paperid and psq.classid=qc.classid
         left join t_question_point qp on psq.questionid=qp.questionid

sapi/src/main/resources/mapper/region/RegionAnalyzeMapper.xml

@@ -94,7 +94,7 @@
         count(distinct rs.rsid) stunum,
         count(distinct case when rs.rsstate!=0 then rs.rsid else null end) commitnum
         from t_recite_group rg right join t_school s on rg.schoolid=s.schoolid and rg.starttime between #{begintime} and #{endtime}
-        left join t_recite_student rs on rs.reciteid=rg.reciteid
+        left join t_recite_student rs on rs.reciteid=rg.reciteid and rs.classid=rg.classid
         left join t_class c on c.classid=rg.classid
         where s.schoolstate=1 and c.year=s.year
         group by s.schoolid,rg.reciteid order by s.schoolid

sstudy/src/main/java/com/xhkjedu/sstudy/controller/recite/ReciteStudentController.java

@@ -4,12 +4,11 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sstudy.model.recite.TReciteStudent;
 import com.xhkjedu.sstudy.service.recite.ReciteStudentService;
+import com.xhkjedu.sstudy.vo.recite.ReciteStudentVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
-import com.xhkjedu.sstudy.vo.recite.ReciteClassAnalyzeVo;
-import com.xhkjedu.sstudy.vo.recite.ReciteStudentVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName ReciteStudentController
@@ -97,7 +97,7 @@ public class ReciteStudentController {
     @PostMapping("/classanaly")
     public ResultVo listReciteClass(@RequestBody TReciteStudent reciteStudent){
         N_Utils.validation(new Object[]{reciteStudent.getReciteid(),"背诵id",1});
-        List<ReciteClassAnalyzeVo> list = reciteStudentService.listRecitesClassForAnalyze(reciteStudent.getReciteid(),reciteStudent.getClassid());
+        List<Map> list = reciteStudentService.listRecitesClassForAnalyze(reciteStudent.getReciteid(), reciteStudent.getClassid());
         return new ResultVo(0,"获取班级背诵情况成功",list);
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/recite/ReciteStudentMapper.java

@@ -2,12 +2,12 @@ package com.xhkjedu.sstudy.mapper.recite;
 
 import com.xhkjedu.sstudy.base.TkMapper;
 import com.xhkjedu.sstudy.model.recite.TReciteStudent;
-import com.xhkjedu.sstudy.vo.recite.ReciteClassAnalyzeVo;
 import com.xhkjedu.sstudy.vo.recite.ReciteStudentVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName ReciteStudentMapper
@@ -56,13 +56,14 @@ public interface ReciteStudentMapper extends TkMapper<TReciteStudent> {
     ReciteStudentVo getReciteStuByRsid(@Param("studentid") Integer studentid, @Param("reciteid") Integer reciteid);
 
     /**
-     *功能描述  获取阅读班级统计
+     * 功能描述  获取阅读班级统计
+     *
+     * @param * @param reciteid
+     * @return java.util.List<com.xhkjedu.vo.recite.ReciteClassAnalyzeVo>
      * @author WN
      * @date 2020/6/17
-     * @param  * @param reciteid
-     * @return java.util.List<com.xhkjedu.vo.recite.ReciteClassAnalyzeVo>
      */
-    List<ReciteClassAnalyzeVo> listRecitesClassForAnalyze(Integer reciteid, Integer classid);
+    List<Map> listRecitesClassForAnalyze(Integer reciteid, Integer classid);
 
     //////////////////////////////////////////////学生WEB端//////////////////////////////////////////////
     /**

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

@@ -111,7 +111,7 @@ public class PaperService {
                 //保存答题卡信息
                 savePaperScantronQtype(paper,qtypes);
                 //保存分析
-                savePaperScantronAnalyze(paperid,paper.getSchoolid());
+                //savePaperScantronAnalyze(paperid,paper.getSchoolid());
             }
 
         }catch (Exception e){
@@ -160,8 +160,8 @@ public class PaperService {
                 paperScantronQtypeMapper.deleteByPaperid(paper.getPaperid());   //保存答题卡信息
                 savePaperScantronQtype(paper, qtypes);
                 //删除分析信息
-                paperAnalyzeMapper.deleteByPaperid(paper.getPaperid());
-                savePaperScantronAnalyze(paper.getPaperid(), paper.getSchoolid());  //保存分析
+                //paperAnalyzeMapper.deleteByPaperid(paper.getPaperid());
+                //savePaperScantronAnalyze(paper.getPaperid(), paper.getSchoolid());  //保存分析
 
                 rtn = true;
             }
@@ -322,7 +322,7 @@ public class PaperService {
             paperMapper.updatePaper(paper);
             paperQtypeMapper.deleteByPaperid(paper.getPaperid());//删除作业题型信息
             savePaperQtype(paper, qtypes);//保存作业题型信息
-            paperAnalyzeMapper.deleteByPaperid(paper.getPaperid());//删除分析信息
+            //paperAnalyzeMapper.deleteByPaperid(paper.getPaperid());//删除分析信息
             //generatePaperAnalyze(paper.getPaperid(), paper.getSchoolid());//生成作业分析
             rtn = true;
         }catch (Exception e){

sstudy/src/main/java/com/xhkjedu/sstudy/service/recite/ReciteStudentService.java

@@ -4,13 +4,17 @@ import com.xhkjedu.sstudy.mapper.recite.ReciteGroupMapper;
 import com.xhkjedu.sstudy.mapper.recite.ReciteStudentMapper;
 import com.xhkjedu.sstudy.model.recite.TReciteGroup;
 import com.xhkjedu.sstudy.model.recite.TReciteStudent;
-import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.sstudy.vo.recite.ReciteClassAnalyzeVo;
 import com.xhkjedu.sstudy.vo.recite.ReciteStudentVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName ReciteStudentService
@@ -56,28 +60,58 @@ public class ReciteStudentService {
     }
 
     /**
-     *功能描述 详情--根据学生背诵id获取背诵内容
-     * @author WN
-     * @date 2020/6/10
-     * @param  * @param rsid
+     * 功能描述 详情--根据学生背诵id获取背诵内容
+     *
+     * @param *        @param rsid
      * @param reciteid
      * @return com.xhkjedu.vo.recite.ReciteStudentVo
+     * @author WN
+     * @date 2020/6/10
      */
-    public ReciteStudentVo getReciteStuByRsid(Integer studentid, Integer reciteid){
+    public ReciteStudentVo getReciteStuByRsid(Integer studentid, Integer reciteid) {
         return reciteStudentMapper.getReciteStuByRsid(studentid, reciteid);
     }
 
-    public List<ReciteClassAnalyzeVo> listRecitesClassForAnalyze(Integer reciteid,Integer classid){
-        return reciteStudentMapper.listRecitesClassForAnalyze(reciteid,classid);
+    public List<Map> listRecitesClassForAnalyze(Integer reciteid, Integer classid) {
+        List<Map> list = new ArrayList<>();
+        List<Map> students = reciteStudentMapper.listRecitesClassForAnalyze(reciteid, classid);
+        if (N_Utils.isListEmpty(students)) return list;
+        Map<Object, List<Map>> collect = students.stream().collect(Collectors.groupingBy(m -> m.get("classid")
+                , LinkedHashMap::new, Collectors.toList()));
+        for (Map.Entry<Object, List<Map>> entry : collect.entrySet()) {
+            Map cmap = new HashMap();//班级统计
+            List<Map> stulist = new ArrayList<>();//学生列表
+            students = entry.getValue();
+            for (int i = 0; i < students.size(); i++) {
+                Map s = students.get(i);
+                if (i == 0) {
+                    cmap.put("classid", s.get("classid"));
+                    cmap.put("classname", s.get("classname"));
+                    cmap.put("gradeid", s.get("gradeid"));
+                }
+                s.remove("classid");
+                s.remove("classname");
+                s.remove("gradeid");
+                stulist.add(s);
+            }
+            cmap.put("stunum", students.size());//学生人数
+            List<Map> commitStus = students.stream().filter(s -> (int) s.get("rsstate") > 0).collect(Collectors.toList());
+            cmap.put("commitnum", commitStus.size());//已提交人数
+            double avgscore = commitStus.stream().mapToInt(s -> (int) s.get("userscore")).summaryStatistics().getAverage();
+            cmap.put("avgscore", avgscore);//平均分
+            cmap.put("stulist", stulist);//学生列表
+            list.add(cmap);
+        }
+        return list;
     }
 
-
     /**
      * 背诵学生--网页--列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.recite.ReciteStudentVo>
      * @Param [student]
      * @Author ywx
      * @Date 2020/9/4 9:08
-     * @return java.util.List<com.xhkjedu.vo.recite.ReciteStudentVo>
      **/
     public List<ReciteStudentVo> listReciteStuWeb(TReciteStudent student) {
         return reciteStudentMapper.listReciteForStuWeb(student);

sstudy/src/main/resources/application.properties

@@ -107,4 +107,4 @@ file.showurl=http://schoolstatictest.xhkjedu.com/static/
 dbname=xhkjedu_school_test
 
 #版本号
-versionname=Test_v3.4.0
+versionname=Test_v3.4.1

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

@@ -3,8 +3,8 @@
 <mapper namespace="com.xhkjedu.sstudy.mapper.paper.PaperQtypeQuestionMapper">
     <!--上传试卷按题型统计(只统计母题)-->
     <select id="paperTypeAnalyze" resultType="java.util.Map">
-       SELECT pt.qtypeid,pt.qtypename,COUNT(1) AS num,IFNULL(ROUND(COUNT(1)/p.papernum,2),0) AS numrate,
-       SUM(ptq.ptqscore) AS score,IFNULL(ROUND(SUM(ptq.ptqscore)/p.paperscore,2),0) AS scorerate,
+       SELECT pt.qtypeid,pt.qtypename,COUNT(1) AS num,IFNULL(truncate(COUNT(1)/p.papernum,2),0) AS numrate,
+       SUM(ptq.ptqscore) AS score,IFNULL(truncate(SUM(ptq.ptqscore)/p.paperscore,2),0) AS scorerate,
        GROUP_CONCAT(ptq.ptqorder) AS orders
        FROM t_paper_qtype_question ptq LEFT JOIN t_paper_qtype pt ON ptq.ptid = pt.ptid
        LEFT JOIN t_paper p ON ptq.paperid = p.paperid LEFT JOIN t_question q ON ptq.questionid = q.questionid
@@ -12,7 +12,7 @@
     </select>
     <!--上传试卷按难易度统计(只统计母题)-->
     <select id="complexityRateAnalyze" resultType="java.util.Map">
-        SELECT q.complexity,COUNT(1) AS complexitynum,IFNULL(ROUND(COUNT(1)/p.papernum,2),0) AS complexityrate,
+        SELECT q.complexity,COUNT(1) AS complexitynum,IFNULL(truncate(COUNT(1)/p.papernum,2),0) AS complexityrate,
         GROUP_CONCAT(ptq.ptqorder) AS orders ,SUM(ptq.ptqscore) AS scoretotal
         FROM t_paper_qtype_question ptq
         LEFT JOIN t_paper p ON ptq.paperid = p.paperid LEFT JOIN t_question q ON ptq.questionid = q.questionid
@@ -21,7 +21,7 @@
     <!--上传试卷按知识点统计(只统计母题)-->
     <select id="pointRateAnalyze" resultType="java.util.Map">
         SELECT qp.pointid,tp.pointname,COUNT(1) AS pointnum,SUM(ptq.ptqscore) AS pointscore,
-        IFNULL(ROUND(SUM(ptq.ptqscore)/p.paperscore,2),0) AS pointscorerate,GROUP_CONCAT(ptq.ptqorder) AS orders
+        IFNULL(truncate(SUM(ptq.ptqscore)/p.paperscore,2),0) AS pointscorerate,GROUP_CONCAT(ptq.ptqorder) AS orders
         FROM t_paper_qtype_question ptq
         LEFT JOIN t_paper p ON ptq.paperid = p.paperid LEFT JOIN t_question q ON ptq.questionid = q.questionid
         LEFT JOIN t_question_point qp ON q.questionid = qp.questionid LEFT JOIN t_point tp ON qp.pointid = tp.pointid

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

@@ -4,8 +4,8 @@
 
     <!-- 答题卡试卷 题型 -->
     <select id="listQtypeAnalyze" resultType="java.util.Map">
-        SELECT psq.qtypeid,psq.qtypename,COUNT(1) AS num,IFNULL(ROUND(COUNT(1)/p.papernum,2),0) AS numrate,
-        psq.pstscore AS score,IFNULL(ROUND(SUM(psq.pstscore)/p.paperscore,2),0) AS scorerate,
+        SELECT psq.qtypeid,psq.qtypename,COUNT(1) AS num,IFNULL(truncate(COUNT(1)/p.papernum,2),0) AS numrate,
+        psq.pstscore AS score,IFNULL(truncate(SUM(psq.pstscore)/p.paperscore,2),0) AS scorerate,
         GROUP_CONCAT(ps.psorder) AS orders
         FROM t_paper_scantron_qtype psq LEFT JOIN t_paper_scantron ps ON psq.psqtypeid=ps.psqtypeid
         LEFT JOIN t_paper p ON  psq.paperid=p.paperid

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

@@ -5,7 +5,13 @@
     <select id="listByQuestionId" resultType="com.xhkjedu.sstudy.model.question.TQuestionExplain">
         select qe.*,u.username createname
         from t_question_explain qe left join t_user u on qe.createid=u.userid
-        where qe.questionid=#{questionid} and qe.qctype=#{qctype}
+        where qe.questionid=#{questionid}
+        <if test="qctype==2">
+            and qe.qctype=2
+        </if>
+        <if test="qctype!=2">
+            and qe.qctype!=2
+        </if>
         order by qe.createtime desc
     </select>
     <!--更新播放次数-->
@@ -31,7 +37,14 @@
         from t_question_explain qe left join t_user u on qe.createid=u.userid
         where
         <foreach collection="questions" item="question" index="index" separator="or">
-            (qe.questionid=#{question.questionid} and qe.qctype=${question.qctype})
+            (qe.questionid=#{question.questionid}
+            <if test="question.qctype==2">
+                and qe.qctype=2
+            </if>
+            <if test="question.qctype!=2">
+                and qe.qctype!=2
+            </if>
+            )
         </foreach>
         order by qe.createtime desc
     </select>

sstudy/src/main/resources/mapper/recite/ReciteGroupMapper.xml

@@ -4,7 +4,6 @@
     <!-- 背诵班级信息 -->
     <select id="findByRsId" resultType="com.xhkjedu.sstudy.model.recite.TReciteGroup">
         SELECT rg.* FROM t_recite_group rg
-        LEFT JOIN t_recite_student rs ON rg.reciteid=rs.reciteid and rg.classid=rs.classid
-        where rs.reciteid=#{reciteid} limit 1
+        where rg.reciteid=#{reciteid} limit 1
     </select>
 </mapper>

sstudy/src/main/resources/mapper/recite/ReciteMapper.xml

@@ -23,7 +23,7 @@
         ,r.createid,u.username AS createname,r.createtime,rg.starttime,rg.stoptime
         FROM t_recite r LEFT JOIN t_user u ON r.createid=u.userid
         LEFT JOIN t_recite_group rg ON rg.reciteid = r.reciteid
-        LEFT JOIN t_recite_student rs ON r.reciteid=rg.reciteid
+        LEFT JOIN t_recite_student rs ON rg.reciteid=rs.reciteid and rs.classid=rg.classid
         where r.createid=#{recite.createid}
         <if test="recite.recitestate==1">
             AND rg.stoptime<![CDATA[ >= ]]>UNIX_TIMESTAMP()

sstudy/src/main/resources/mapper/recite/ReciteStudentMapper.xml

@@ -47,44 +47,15 @@
     </select>
 
     <!-- 班级背诵统计 -->
-    <resultMap id="recitesClass" type="com.xhkjedu.sstudy.vo.recite.ReciteClassAnalyzeVo">
-        <result property="classid" column="classid"></result>
-        <result property="classname" column="classname"></result>
-        <result property="gradeid" column="gradeid"></result>
-        <result property="stunum" column="stunum"></result>
-        <result property="commitnum" column="commitnum"></result>
-        <result property="avgscore" column="avgscore"></result>
-        <collection property="stulist" ofType="com.xhkjedu.sstudy.vo.recite.ReciteStudentAnalyzeVo"
-                    javaType="java.util.List" select="listStudent" column="{reciteid=reciteid,classid=classid}">
-        </collection>
-    </resultMap>
-    <resultMap id="stuResult" type="com.xhkjedu.sstudy.vo.recite.ReciteStudentAnalyzeVo">
-        <result property="rsid" column="rsid"></result>
-        <result property="studentid" column="studentid"></result>
-        <result property="username" column="username"></result>
-        <result property="headpic" column="headpic"></result>
-        <result property="userscore" column="userscore"></result>
-        <result property="answerpath" column="answerpath"></result>
-        <result property="rsstate" column="rsstate"></result>
-        <result property="stoptime" column="stoptime"></result>
-        <result property="answertxt" column="answertxt"></result>
-    </resultMap>
-    <select id="listStudent" resultMap="stuResult">
-        SELECT rs.rsid,rs.studentid,u.username,u.headpic,rs.userscore,rs.answerpath,rs.rsstate,rs.stoptime,rs.answertxt
-        FROM t_recite_student rs LEFT JOIN t_user u ON rs.studentid=u.userid
-        WHERE reciteid=#{reciteid} and rs.classid=#{classid}
-        order by rs.userscore desc
-    </select>
-    <select id="listRecitesClassForAnalyze" resultMap="recitesClass">
-        SELECT rg.reciteid,rg.classid,c.classname,c.gradeid,
-        (SELECT COUNT(*) FROM t_recite_student rs1 WHERE rs1.reciteid=rg.reciteid AND rs1.classid=rg.classid) AS stunum,
-        (SELECT COUNT(*) FROM t_recite_student rs1 WHERE rs1.reciteid=rg.reciteid AND rs1.classid=rg.classid AND rs1.rsstate>0) AS commitnum,
-        (SELECT truncate(IFNULL(AVG(rs1.userscore),0),2) FROM t_recite_student rs1 WHERE rs1.reciteid=rg.reciteid
-        AND rs1.classid=rg.classid AND rs1.rsstate>0) AS avgscore
+    <select id="listRecitesClassForAnalyze" resultType="java.util.Map">
+        SELECT rg.classid,c.classname,c.gradeid,
+        rs.rsid,rs.studentid,u.username,u.headpic,rs.userscore,rs.answerpath,rs.rsstate,rs.stoptime,rs.answertxt
         FROM t_recite_group rg LEFT JOIN t_class c ON rg.classid=c.classid
+        LEFT JOIN t_recite_student rs ON rs.reciteid=rg.reciteid AND rs.classid=rg.classid
+        LEFT JOIN t_user u ON rs.studentid=u.userid
         WHERE rg.reciteid=#{reciteid}
          <if test="classid!=null"> and rg.classid=#{classid}</if>
-         order by c.gradeid,c.classtype,c.classorder
+         order by c.classtype,c.classorder,rs.userscore desc
     </select>
 
     <!--//////////////////////////////////////////////学生WEB端//////////////////////////////////////////////-->