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

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

@@ -3,6 +3,7 @@ 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.model.reportstu.ERstudentAction;
 import com.xhkjedu.sexam.service.report.EReportClassService;
 import com.xhkjedu.sexam.vo.report.ERankParamVo;
 import com.xhkjedu.utils.N_Utils;
@@ -158,4 +159,58 @@ public class EReportClassController {
         Map map = eReportClassService.getSjFx(rank);
         return new ResultVo(0, "获取成功", map);
     }
+
+    /*
+     * 行为分析-科目
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/9/2 11:36
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_xw_km")
+    public ResultVo listXwKm(@RequestBody ERstudentAction rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getActiontype(), "类型", 1
+                , rank.getClassid(), "班级id", 1});
+        List<Map> map = eReportClassService.listXwKm(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 行为分析-学生
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/9/2 13:43
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_xw_xs")
+    public ResultVo listXwXs(@RequestBody ERstudentAction rank) {
+        Integer page = rank.getPage();
+        Integer pageSize = rank.getPageSize();
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getActiontype(), "类型", 1
+                , rank.getClassid(), "班级id", 1});
+        if (N_Utils.isEmptyInteger(page)) {
+            List<Map> list = eReportClassService.listXwXs(rank);
+            return new ResultVo(0, "获取成功", list);
+        } else {
+            PageHelper.startPage(page, pageSize);
+            List<Map> list = eReportClassService.listXwXs(rank);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取成功", pageResult);
+        }
+    }
+
+    /*
+     * 优秀试卷分析-详情
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/9/2 13:52
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/get_sjxq")
+    public ResultVo getSjXq(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1
+                , rank.getSubjectid(), "科目id", 2, rank.getCreateid(), "学生id", 1});
+        Map map = eReportClassService.getSjXq(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.xhkjedu.sexam.mapper.reportclass;
 
+import com.xhkjedu.sexam.model.reportstu.ERstudentAction;
 import com.xhkjedu.sexam.vo.report.ERankParamVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,13 @@ public interface EReportClassMapper {
 
     //试卷分析-知识点分析
     List<Map> listPoint(@Param("rank") ERankParamVo rank);
+
+    //行为分析-科目
+    String getSubjectJson(@Param("rank") ERstudentAction rank);
+
+    //行为分析-学生
+    List<Map> listXwXs(@Param("rank") ERstudentAction rank);
+
+    //学生试卷基础信息
+    Map getStuPaperInfo(@Param("rank") ERankParamVo rank);
 }

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

@@ -8,7 +8,9 @@ import com.xhkjedu.sexam.mapper.reportclass.ERclassRankMapper;
 import com.xhkjedu.sexam.mapper.reportclass.EReportClassMapper;
 import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
+import com.xhkjedu.sexam.model.paper.EPaperQtype;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
+import com.xhkjedu.sexam.model.reportstu.ERstudentAction;
 import com.xhkjedu.sexam.vo.report.ERPaperVo;
 import com.xhkjedu.sexam.vo.report.ERankParamVo;
 import com.xhkjedu.sexam.vo.system.UserVo;
@@ -184,4 +186,32 @@ public class EReportClassService {
         map.put("points", points);
         return map;
     }
+
+    //行为分析-科目
+    public List<Map> listXwKm(ERstudentAction rank) {
+        String subjectjson = eReportClassMapper.getSubjectJson(rank);
+        List<Map> list = JSON.parseArray(subjectjson, Map.class);
+        return list;
+    }
+
+    //行为分析-学生
+    public List<Map> listXwXs(ERstudentAction rank) {
+        return eReportClassMapper.listXwXs(rank);
+    }
+
+    //优秀试卷分析-详情
+    public Map getSjXq(ERankParamVo rank) {
+        Map map = eReportClassMapper.getStuPaperInfo(rank);//学生试卷基础信息
+        List<EPaperQtype> questions;//试题详情
+        Integer ptype = (Integer) map.get("ptype");
+        Integer epsid = (Integer) map.get("epsid");
+        if (ptype == 1) {
+            //题库试卷试题
+            questions = ePaperStudentMapper.listStuPaperQuestionsForWeb(epsid);
+        } else {
+            questions = ePaperStudentMapper.listStuPaperFjQuestionsForWeb(epsid);
+        }
+        map.put("questions", questions);
+        return map;
+    }
 }

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

@@ -138,6 +138,7 @@ public class EReportGenerateService {
             Map<Integer, List<ERstudent>> sCollect = studentList.stream().collect(Collectors.groupingBy(s -> s.getStudentid()));
             for (Map.Entry<Integer, List<ERstudent>> csEntry : sCollect.entrySet()) {
                 ERstudent cs = new ERstudent();
+                cs.setExamid(examid);
                 cs.setClassid(classid);
                 cs.setStudentid(csEntry.getKey());
                 cs.setSubjectid(subjectid);

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

@@ -18,7 +18,7 @@
         ,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}
+        where er.examid=#{examid} and er.classid=#{classid}
     </select>
     <!--班级报告-单科概况-班级概况-->
     <select id="findById" resultType="java.util.Map">
@@ -45,20 +45,20 @@
     <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">
+        <if test="rank.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">
+        <if test="rank.ranktype==1">
             and er.classrankpre>=5
         </if>
-        <if test="ranktype==2">
+        <if test="rank.ranktype==2">
             and er.classrankpre&lt;=5
         </if>
-        <if test="ranktype==3">
+        <if test="rank.ranktype==3">
             and es.score*0.6-er.score &lt;5
         </if>
-        <if test="ranktype==4">
+        <if test="rank.ranktype==4">
             and abs(er.classrankpre)>=10
         </if>
     </select>

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

@@ -3,10 +3,10 @@
 <mapper namespace="com.xhkjedu.sexam.mapper.reportclass.EReportClassMapper">
     <!--试卷基本信息-->
     <select id="getPaperByExamSubjectId" resultType="java.util.Map">
-        select epid,ptype,eb.examname,epa.pointjson
+        select ep.epid,ep.ptype,eb.examname,epa.pointjson
         from e_paper ep left join e_base eb on ep.examid = eb.examid
         left join e_paper_analyze epa on ep.epid = epa.epid
-        where examid=#{rank.examid} and subjectid=#{rank.subjectid} limit 1
+        where ep.examid=#{rank.examid} and ep.subjectid=#{rank.subjectid} limit 1
     </select>
     <!--试卷概况-题库-->
     <select id="listTkSjGk" resultType="java.util.Map">
@@ -17,8 +17,8 @@
         left join t_question q on epqq.questionid = q.questionid
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}
-        <if test="ranktype==1">order by erq.qorder</if>
-        <if test="ranktype==2">order by erq.classscore</if>
+        <if test="rank.ranktype==1">order by erq.qorder</if>
+        <if test="rank.ranktype==2">order by erq.classscore</if>
     </select>
     <!--试卷概况-附件-->
     <select id="listFjSjGk" resultType="java.util.Map">
@@ -28,8 +28,8 @@
         from e_rclass_question erq left join e_paper_qtype_question epqq on erq.eptqid = epqq.eptqid
         where erq.examid=#{rank.examid} and erq.classid=#{rank.classid}
         and erq.subjectid=#{rank.subjectid}
-        <if test="ranktype==1">order by erq.qorder</if>
-        <if test="ranktype==2">order by erq.classscore</if>
+        <if test="rank.ranktype==1">order by erq.qorder</if>
+        <if test="rank.ranktype==2">order by erq.classscore</if>
     </select>
     <!--试卷分析-大题分析-->
     <select id="listType" resultType="java.util.Map">
@@ -55,4 +55,28 @@
         where erp.examid=#{rank.examid} and erp.classid=#{rank.classid}
         and erp.subjectid=#{rank.subjectid}
     </select>
+    <!--行为分析-科目-->
+    <select id="getSubjectJson" resultType="java.lang.String">
+        select ca.subjectjson from e_rclass_action ca
+        where ca.examid=#{rank.examid} and ca.actiontype=#{rank.actiontype} and ca.classid=#{rank.classid} limit 1
+    </select>
+    <!--行为分析-学生-->
+    <select id="listXwXs" resultType="java.util.Map">
+        select sa.classid,sa.studentid,sa.subjectjson,u.username,u.loginname
+        from e_rstudent_action sa left join t_user u on sa.studentid=u.userid
+        where sa.examid=#{rank.examid} and sa.actiontype=#{rank.actiontype}
+        <if test="rank.classid!=null and rank.classid!=0">
+            and sa.classid=#{rank.classid}
+        </if>
+        <if test="rank.createname!=null and rank.createname!=''">
+            and (u.username like '%${rank.createname}%' or u.loginname like '%${rank.createname}%')
+        </if>
+    </select>
+    <!--学生试卷基础信息-->
+    <select id="getStuPaperInfo" resultType="java.util.Map">
+        select ep.pnum,ep.pscore,ep.ptype,er.score,er.classrank,er.schoolrank,eps.epsid
+        from e_rstudent er left join e_paper ep on er.examid = ep.examid and er.subjectid=ep.subjectid
+        left join e_paper_student eps on ep.epid = eps.epid and eps.studentid=er.studentid
+        where er.examid=#{rank.examid} and er.subjectid=#{rank.subjectid} and er.studentid=#{rank.createid}
+    </select>
 </mapper>