Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -1,6 +1,22 @@
 package com.xhkjedu.sexam.controller.report;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sexam.model.reportstu.ERstudent;
+import com.xhkjedu.sexam.service.report.EReportClassService;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ywx
@@ -8,6 +24,108 @@ import org.springframework.web.bind.annotation.RequestMapping;
  * @description 班级报告
  * @date 2022/8/8 9:44
  **/
+@RestController
 @RequestMapping("erc")
 public class EReportClassController {
+    @Resource
+    private EReportClassService eReportClassService;
+
+    /**
+     * 考试概况--科目
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/30 9:20
+     **/
+    @PostMapping("/list_xkcj")
+    public ResultVo listXkCj(@RequestBody ERankParamVo rank) {
+        Integer examid = rank.getExamid();
+        Integer classid = rank.getClassid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1, classid, "班级id", 1});
+        List<Map> list = eReportClassService.listXkCj(examid, classid);
+        return new ResultVo(0, "获取成功", list);
+    }
+
+    /**
+     * 成绩单
+     *
+     * @return com.xhkjedu.vo.ResultVo
+     * @Param [stu]
+     * @Author ywx
+     * @Date 2022/8/30 9:36
+     **/
+    @PostMapping("/list_cjd")
+    public ResultVo listCjd(@RequestBody ERstudent stu) {
+        Integer examid = stu.getExamid();
+        Integer page = stu.getPage();
+        Integer pageSize = stu.getPageSize();
+        N_Utils.validation(new Object[]{examid, "考试id", 1, stu.getClassid(), "班级id", 1});
+        if (N_Utils.isEmptyInteger(page)) {
+            List<Map> list = eReportClassService.listCjd(stu);
+            return new ResultVo(0, "获取成功", list);
+        } else {
+            PageHelper.startPage(page, pageSize);
+            List<Map> list = eReportClassService.listCjd(stu);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取成功", pageResult);
+        }
+    }
+
+    /*
+     * 成绩分析-搜索
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/30 9:55
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/cjfx_ss")
+    public ResultVo listCjFxForSearch(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1});
+        List<Map> map = eReportClassService.listCjFxForSearch(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 成绩分析-设置
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/30 10:07
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/cjfx_sz")
+    public ResultVo listCjFxForSet(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getCreateid(), "操作人id", 1, rank.getSubjectid(), "科目id", 2});
+        List<Map> map = eReportClassService.listCjFxForSet(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 单科概况
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/31 10:28
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_dkgk")
+    public ResultVo getDkGk(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1, rank.getSubjectid(), "科目id", 2});
+        Map map = eReportClassService.getDkGk(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 单科概况-需关注学生
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/31 18:02
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_gzxs")
+    public ResultVo listGzXs(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getClassid(), "班级id", 1
+                , rank.getSubjectid(), "科目id", 2, rank.getRanktype(), "类型", 1});
+        List<Map> list = eReportClassService.listGzXs(rank);
+        return new ResultVo(0, "获取成功", list);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportclass/ERclassMapper.java

@@ -11,4 +11,22 @@ import java.util.Map;
 public interface ERclassMapper extends TkMapper<ERclass> {
     //校级报告-成绩分析
     List<Map> listByExamId(@Param("rank") ERankParamVo rank);
+
+    //班级报告-成绩分析
+    List<Map> listByExamAndClassId(@Param("examid") Integer examid,@Param("classid") Integer classid);
+
+    //班级报告-单科概况-班级概况
+    Map findById(@Param("rank") ERankParamVo rank);
+
+    //班级报告-单科概况-平均分
+    List<Map> listPjf(@Param("rank") ERankParamVo rank);
+
+    //班级报告-单科概况-成绩等级分布
+    List<Map> listCjDj(@Param("rank") ERankParamVo rank);
+
+    //班级报告-单科概况-需关注学生
+    List<Map> listGzXs(@Param("rank") ERankParamVo rank);
+
+    //班级报告-单科概况-高频错题
+    List<Map> listGpCt(@Param("rank") ERankParamVo rank);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportclass/ERclassRankMapper.java

@@ -11,4 +11,7 @@ import java.util.Map;
 public interface ERclassRankMapper extends TkMapper<ERclassRank> {
     //校级报告-成绩分析
     List<Map> listByExamId(@Param("rank") ERankParamVo rank);
+
+    //班级报告-成绩分析
+    List<Map> listByExamAndClassId(@Param("rank") ERankParamVo rank);
 }

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

@@ -37,6 +37,9 @@ public class ERclass extends BaseBean {
     //班级平均分
     private Double classavgscore;
 
+    //班级平均分排名
+    private Integer classavgscorerank;
+
     //校最高分
     private Double schoolmaxscore;
 

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

@@ -1,6 +1,22 @@
 package com.xhkjedu.sexam.service.report;
 
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
+import com.xhkjedu.sexam.mapper.report.EReportSchoolMapper;
+import com.xhkjedu.sexam.mapper.reportclass.ERclassMapper;
+import com.xhkjedu.sexam.mapper.reportclass.ERclassRankMapper;
+import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
+import com.xhkjedu.sexam.model.reportstu.ERstudent;
+import com.xhkjedu.sexam.vo.report.ERPaperVo;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ywx
@@ -10,4 +26,118 @@ import org.springframework.stereotype.Service;
  **/
 @Service
 public class EReportClassService {
+    //@Resource
+    //private ERbaseMapper eRbaseMapper;
+    //@Resource
+    //private ERsubjectMapper eRsubjectMapper;
+    @Resource
+    private ERstudentMapper eRstudentMapper;
+    @Resource
+    private ERclassMapper eRclassMapper;
+    @Resource
+    private ERclassRankMapper eRclassRankMapper;
+    @Resource
+    private EReportGenerateService eReportGenerateService;
+    @Resource
+    private EReportSchoolMapper eReportSchoolMapper;
+    @Resource
+    private EPaperStudentMapper ePaperStudentMapper;
+
+    //考试概况-学科成绩
+    public List<Map> listXkCj(Integer examid, Integer classid) {
+        return eRclassMapper.listByExamAndClassId(examid, classid);
+    }
+
+    //成绩单
+    public List<Map> listCjd(ERstudent stu) {
+        return eRstudentMapper.listByExamId(stu);
+    }
+
+    //成绩分析-搜索
+    public List<Map> listCjFxForSearch(ERankParamVo rank) {
+        return eRclassRankMapper.listByExamAndClassId(rank);
+    }
+
+    //成绩分析-设置
+    @Transactional(rollbackFor = Exception.class)
+    public List<Map> listCjFxForSet(ERankParamVo rank) {
+        Integer examid = rank.getExamid();
+        String subjectid = rank.getSubjectid();
+        Integer createid = rank.getCreateid();
+        Integer ranktype = rank.getRanktype();
+        eReportSchoolMapper.delByExamAndSubjectId(examid, subjectid, ranktype);//删除考试等级报告
+        List<ERPaperVo> papers = eReportSchoolMapper.listByExamAndSubjectId(examid, subjectid);//考试试卷
+        List<ERstudent> students = ePaperStudentMapper.listByExamAndSubjectId(examid, subjectid);//考试试卷学生
+        eReportGenerateService.setClassGradeRank(examid, papers, students, rank.getRranks(), createid);//生成考试等级报告
+        return eRclassRankMapper.listByExamId(rank);//考试等级报告列表
+    }
+
+    //单科概况
+    public Map getDkGk(ERankParamVo rank) {
+        Map map = eRclassMapper.findById(rank);//班级概况
+        List<Map> pjfList = eRclassMapper.listPjf(rank);//平均分
+        map.put("pjfList", pjfList);
+        List<Map> cjdjList = eRclassMapper.listCjDj(rank);//成绩等级分布
+        map.put("cjdjList", cjdjList);
+        rank.setRanktype(1);//大幅进步
+        List<Map> gzxsList = eRclassMapper.listGzXs(rank);//需关注学生
+        map.put("gzxsList", gzxsList);
+        List<Map> gpctList = eRclassMapper.listGpCt(rank);//高频错题
+        for (Map ct : gpctList) {
+            //高频错误项
+            Integer ctype = (Integer) ct.get("ctype");
+            String gpcwx = "";
+            if (N_Utils.isObjectiveQuestion(ctype)) {
+                String answerjson = ct.get("answerjson").toString();//学生作答情况
+                String answer = JSON.parseArray(ct.get("answer").toString(), String.class).get(0);//正确答案
+                Map amap = JSON.parseObject(answerjson, Map.class);
+                List<Map<String, Integer>> list = new ArrayList<>();
+                Integer cwnum = 0;//作答错误学生数量
+                for (Object o : amap.keySet()) {
+                    List<Map> o1 = (List<Map>) amap.get(o);
+                    int answernum = o1.size();//作答学生数量
+                    String xx = o.toString();//选项
+                    if (!answer.equals(xx) && cwnum.compareTo(answernum) == -1) {
+                        cwnum = answernum;
+                        gpcwx = xx;
+                    }
+                }
+            }
+            ct.put("gpcwx", gpcwx);
+
+            //知识点
+            Object pointjson = ct.get("pointjson");
+
+            ct.remove("answerjson");
+            ct.remove("ctype");
+            ct.remove("answer");
+            ct.remove("pointjson");
+
+            List<String> pointnames = new ArrayList<>();
+            if (N_Utils.isNotEmpty(pointjson)) {
+                List<Map> list = JSON.parseArray(pointjson.toString(), Map.class);
+                Integer eptqid = (Integer) ct.get("eptqid");
+                for (Map p : list) {
+                    String ques = p.get("ques").toString();
+                    String pointname = p.get("pointname").toString();
+                    List<Map> qlist = JSON.parseArray(ques, Map.class);
+                    for (Map q : qlist) {
+                        List<Integer> eptqids = JSON.parseArray(q.get("eptqids").toString(), Integer.class);
+                        if (N_Utils.numInList(eptqid, eptqids)) {
+                            pointnames.add(pointname);
+                            break;
+                        }
+                    }
+                }
+            }
+            ct.put("pointnames", pointnames);
+        }
+        map.put("gpctList", gpctList);
+        return map;
+    }
+
+    //单科概况-需关注学生
+    public List<Map> listGzXs(ERankParamVo rank) {
+        return eRclassMapper.listGzXs(rank);
+    }
 }

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

@@ -265,6 +265,7 @@ public class EReportGenerateService {
             }
         }
 
+        setClassAvgRank(classList);//班级科目平均分排名
         eRclassMapper.insertList(classList);
         eRsubjectMapper.insertList(subjectList);
 
@@ -308,6 +309,27 @@ public class EReportGenerateService {
         setAction(examid, subjectMap);//行为分析
     }
 
+    //班级科目平均分排名
+    private void setClassAvgRank(List<ERclass> classList) {
+        Map<String, Integer> classSubRank = new HashMap<>();
+        Map<String, List<ERclass>> collect = classList.stream().collect(Collectors.groupingBy(c -> c.getSubjectid()));
+        for (Map.Entry<String, List<ERclass>> centry : collect.entrySet()) {
+            List<Map.Entry<Double, List<ERclass>>> gslist2 = centry.getValue().stream()
+                    .collect(Collectors.groupingBy(ERclass::getClassavgscore)).entrySet()
+                    .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
+            Integer index = 1;
+            for (Map.Entry<Double, List<ERclass>> entry : gslist2) {
+                for (ERclass rc : entry.getValue()) {
+                    classSubRank.put(rc.getClassid() + "_" + rc.getSubjectid(), index);
+                }
+                index = index + entry.getValue().size();
+            }
+        }
+        for (ERclass rc : classList) {
+            rc.setClassavgscorerank(classSubRank.get(rc.getClassid() + "_" + rc.getSubjectid()));
+        }
+    }
+
     //行为分析
     private void setAction(Integer examid, Map<String, String> subjectMap) {
         List<ERstudentAction> studentActions = new ArrayList<>();
@@ -492,7 +514,7 @@ public class EReportGenerateService {
                     rrank.setMinscore(minscore);
                     ERrank rrank1 = new ERrank();
                     BeanUtils.copyProperties(rrank, rrank1);
-                    rrankList.add(rrank1);
+
                     String rankrange = "[" + minscore + "," + maxscore;
                     if (rrank.getRankname().equals("A")) {
                         rankrange = rankrange + "]";
@@ -505,7 +527,11 @@ public class EReportGenerateService {
                         Integer classid = 0;
                         List<ERstudent> list = entry.getValue();
                         setDjTj(examid, userMap, rclassRankList, rrank, rankrange, subjectid, classid, list);
+                        IntSummaryStatistics statistics = list.stream().mapToInt(s -> s.getSchoolrank()).summaryStatistics();
+                        rrank1.setLinescore(statistics.getMax());
+                        rrank1.setFloatscore(statistics.getMin());
                     }
+                    rrankList.add(rrank1);
 
                     //班级科目统计
                     Map<Integer, List<ERstudent>> ccollect = students.stream().filter(s -> s.getSubjectid().equals(subjectid))
@@ -909,7 +935,7 @@ public class EReportGenerateService {
         cr.setStunum(stunum);
         cr.setSturate(N_Utils.getIntegerDivideAndMulitiply(stunum, gstunum));
         setStudentName(list2, userMap);
-        String stujson = list2.stream().map(s -> s.getStudentname()).sorted().collect(Collectors.joining("、"));
+        String stujson = list2.stream().map(s -> s.getStudentname()+"（"+s.getSchoolrank()+"名）").sorted().collect(Collectors.joining("、"));
         cr.setStujson(stujson);
         rclassRankList.add(cr);
     }
@@ -946,11 +972,9 @@ public class EReportGenerateService {
 
     //分数排名
     private void setRank(List<ERstudent> students, Map<String, Integer> rank, Integer code) {
-        students =
-                students.stream().sorted((s1, s2) -> -Double.compare(s1.getScore(), s2.getScore())).collect(Collectors.toList());
         List<Map.Entry<Double, List<ERstudent>>> gslist2 = students.stream()
-                                                                   .collect(Collectors.groupingBy(ERstudent::getScore)).entrySet()
-                                                                   .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
+                .collect(Collectors.groupingBy(ERstudent::getScore)).entrySet()
+                .stream().sorted((s1, s2) -> -Double.compare(s1.getKey(), s2.getKey())).collect(Collectors.toList());
         Integer index = 1;
         String key;
         for (Map.Entry<Double, List<ERstudent>> entry : gslist2) {

sexam/src/main/resources/mapper/exam/ESubjectBadstudentMapper.xml

@@ -3,8 +3,9 @@
 <mapper namespace="com.xhkjedu.sexam.mapper.exam.ESubjectBadstudentMapper">
     <!--试卷学生-->
     <select id="listStu" resultType="java.util.Map">
-        select es.classid,es.sstate,u.username,es.studentid
+        select es.classid,es.sstate,u.username,es.studentid,ec.classname
         from e_paper_student es left join t_user u on es.studentid = u.userid
+        left join e_class ec on es.examid = ec.examid and es.classid = ec.classid
         where es.esid=#{ei.esid}
         <if test="ei.sstate!=null">
             and es.sstate=#{ei.sstate}

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

@@ -12,4 +12,64 @@
             and er.classid=#{rank.classid}
         </if>
     </select>
+    <!--班级报告-学科成绩-->
+    <select id="listByExamAndClassId" resultType="java.util.Map">
+        select er.allscore,er.classmaxscore,er.classminscore,er.classavgscore,er.schoolmaxscore,er.schoolavgscore
+        ,er.stunum,er.missnum,er.yxrate,er.lhrate,er.jgrate,er.dfrate,er.bzc
+        ,er.classid,(case when er.classid=0 then '全部班级' else ec.classname end)classname
+        from e_rclass er left join e_class ec on er.examid = ec.examid and er.classid = ec.classid
+        where er.examid=#{rank.examid} and er.classid=#{rank.classid}
+    </select>
+    <!--班级报告-单科概况-班级概况-->
+    <select id="findById" resultType="java.util.Map">
+        select er.classmaxscore,er.classavgscore,er.classavgscorerank,er.schoolmaxscore,er.schoolavgscore
+        ,er.yxrate,er.jgrate
+        from e_rclass er
+        where er.examid=#{rank.examid} and er.classid=#{rank.classid} and er.subjectid=#{rank.subjectid}
+        limit 1
+    </select>
+    <!--班级报告-单科概况-平均分-->
+    <select id="listPjf" resultType="java.util.Map">
+        select er.classavgscore,ec.classname
+        from e_rclass er left join e_class ec on er.examid = ec.examid and er.classid = ec.classid
+        where er.examid=#{rank.examid} and er.classid=#{rank.classid} and er.subjectid=#{rank.subjectid}
+    </select>
+    <!--班级报告-单科概况-成绩等级分布-->
+    <select id="listCjDj" resultType="java.util.Map">
+        select er.rankname,concat(er.floatscore,'-',er.linescore)rankrange,err.stunum,err.stujson
+        from e_rrank er left join e_rclass_rank err on er.examid = err.examid and er.subjectid = err.subjectid
+        where er.examid=#{rank.examid} and err.classid=#{rank.classid}
+        and er.subjectid=#{rank.subjectid} and er.ranktype=1
+    </select>
+    <!--班级报告-单科概况-需关注学生-->
+    <select id="listGzXs" resultType="java.util.Map">
+        select u.username,er.score,er.classrank,er.classrankpre,er.goal
+        from e_rstudent er left join t_user u on er.studentid=u.userid
+        <if test="ranktype==3">
+            left join e_rsubject es on er.examid = es.examid and es.subjectid=er.subjectid
+        </if>
+        where er.examid=#{rank.examid} and er.classid=#{rank.classid} and er.subjectid=#{rank.subjectid}
+        <if test="ranktype==1">
+            and er.classrankpre>=5
+        </if>
+        <if test="ranktype==2">
+            and er.classrankpre&lt;=5
+        </if>
+        <if test="ranktype==3">
+            and es.score*0.6-er.score &lt;5
+        </if>
+        <if test="ranktype==4">
+            and abs(er.classrankpre)>=10
+        </if>
+    </select>
+    <!--班级报告-单科概况-高频错题-->
+    <select id="listGpCt" resultType="java.util.Map">
+        select erq.eptqid,erq.qn,erq.classsrate,erq.gradesrate,erq.answerjson
+        ,epq.eptname,epqq.ctype,epqq.answer,epa.pointjson
+        from e_rclass_question erq left join e_paper_qtype_question epqq on erq.eptqid = epqq.eptqid
+        left join e_paper_qtype epq on epqq.eptid = epq.eptid
+        left join e_paper_analyze epa on epq.epid = epa.epid
+        where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
+        and erq.subjectid=#{rank.subjectid} and erq.classsrate&lt;40
+    </select>
 </mapper>

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

@@ -14,4 +14,14 @@
             and err.ranktype=#{rank.ranktype}
         </if>
     </select>
+    <!--班级报告-成绩分析-->
+    <select id="listByExamAndClassId" resultType="java.util.Map">
+        select err.ranktype,err.rankname,err.rankrange,err.stunum,err.stujson,err.sturate
+        ,err.classid,(case when err.classid=0 then '全部班级' else ec.classname end)classname
+        from e_rclass_rank err left join e_class ec on err.examid = ec.examid and err.classid = ec.classid
+        where err.examid=#{rank.examid} and and err.classid=#{rank.classid}
+        <if test="rank.ranktype!=null and rank.ranktype!=0">
+            and err.ranktype=#{rank.ranktype}
+        </if>
+    </select>
 </mapper>