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

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

@@ -4,7 +4,9 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sexam.model.report.ERbase;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
+import com.xhkjedu.sexam.model.reportstu.ERstudentAction;
 import com.xhkjedu.sexam.service.report.EReportSchoolService;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -70,4 +72,102 @@ public class EReportSchoolController {
             return new ResultVo(0, "获取成功", pageResult);
         }
     }
+
+    /*
+     * 成绩分析
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/29 9:01
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_cjfx")
+    public ResultVo listCjFx(@RequestBody ERankParamVo rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getSubjectid(), "科目id", 2});
+        Map map = eReportSchoolService.listCjFx(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 成绩分析-搜索
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/29 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.getSubjectid(), "科目id", 2});
+        List<Map> map = eReportSchoolService.listCjFxForSearch(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 成绩分析-设置
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/29 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 = eReportSchoolService.listCjFxForSet(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 行为分析-班级
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/29 16:29
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_xw_bj")
+    public ResultVo listXwBj(@RequestBody ERstudentAction rank) {
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getActiontype(), "类型", 1});
+        List<Map> map = eReportSchoolService.listXwBj(rank);
+        return new ResultVo(0, "获取成功", map);
+    }
+
+    /*
+     * 行为分析-学生
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/29 16:45
+     * @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});
+        if(N_Utils.isEmptyInteger(page)){
+            List<Map> list = eReportSchoolService.listXwXs(rank);
+            return new ResultVo(0, "获取成功", list);
+        }else {
+            PageHelper.startPage(page, pageSize);
+            List<Map> list = eReportSchoolService.listXwXs(rank);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取成功", pageResult);
+        }
+    }
+
+    /*
+     * 违纪行为分析-详情
+     * @Param [rank]
+     * @Author ywx
+     * @Date 2022/8/29 16:54
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/xw_xq")
+    public ResultVo listWjXq(@RequestBody ERstudentAction rank) {
+        Integer page = rank.getPage();
+        Integer pageSize = rank.getPageSize();
+        N_Utils.validation(new Object[]{rank.getExamid(), "考试id", 1, rank.getActiontype(), "类型", 1
+                , rank.getStudentid(), "学生id", 1, page, "显示页码", 1, pageSize, "显示条数", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = eReportSchoolService.listWjXq(rank);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取成功", pageResult);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentMapper.java

@@ -82,4 +82,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
     //批量更新试卷学生试卷状态
     void batchUpdatePStuState(@Param("list") List<EPaperStudent> list);
+
+    //考试试卷学生
+    List<ERstudent> listByExamAndSubjectId(@Param("examid") Integer examid,@Param("subjectid") String subjectid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/report/EReportGenerateMapper.java

@@ -25,4 +25,10 @@ public interface EReportGenerateMapper {
 
     //学生上次考试排名及目标
     List<ERstudent> listStuRankAndGoal(@Param("examid") Integer examid);
+
+    //学生违纪行为
+    List<Map> listBadActionByExamId(@Param("examid") Integer examid);
+
+    //学生优秀行为
+    List<Map> listGoodActionByExamId(@Param("examid") Integer examid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/report/EReportSchoolMapper.java

@@ -0,0 +1,31 @@
+package com.xhkjedu.sexam.mapper.report;
+
+import com.xhkjedu.sexam.model.reportstu.ERstudentAction;
+import com.xhkjedu.sexam.vo.report.ERPaperVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @className EReportSchoolMapper
+ * @description 考试报告生成
+ * @date 2022/8/29 10:00
+ **/
+public interface EReportSchoolMapper {
+    //考试试卷
+    List<ERPaperVo> listByExamAndSubjectId(@Param("examid") Integer examid, @Param("subjectid") String subjectid);
+
+    //删除考试等级报告
+    void delByExamAndSubjectId(@Param("examid") Integer examid, @Param("subjectid") String subjectid, @Param("ranktype") Integer ranktype);
+
+    //行为分析-班级
+    List<Map> listXwBj(@Param("rank") ERstudentAction rank);
+
+    //行为分析-学生
+    List<Map> listXwXs(@Param("rank") ERstudentAction rank);
+
+    //违纪行为分析-详情
+    List<Map> listWjXq(@Param("rank") ERstudentAction rank);
+}

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

@@ -0,0 +1,14 @@
+package com.xhkjedu.sexam.mapper.reportclass;
+
+import com.xhkjedu.sexam.base.TkMapper;
+import com.xhkjedu.sexam.model.reportclass.ERclassAction;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ERclassActionMapper extends TkMapper<ERclassAction> {
+    //校级报告-行为分析
+    List<Map> listByExamId(@Param("rank") ERankParamVo rank);
+}

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

@@ -2,6 +2,13 @@ package com.xhkjedu.sexam.mapper.reportclass;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.reportclass.ERclass;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 public interface ERclassMapper extends TkMapper<ERclass> {
+    //校级报告-成绩分析
+    List<Map> listByExamId(@Param("rank") ERankParamVo rank);
 }

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

@@ -2,6 +2,13 @@ package com.xhkjedu.sexam.mapper.reportclass;
 
 import com.xhkjedu.sexam.base.TkMapper;
 import com.xhkjedu.sexam.model.reportclass.ERclassRank;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 public interface ERclassRankMapper extends TkMapper<ERclassRank> {
+    //校级报告-成绩分析
+    List<Map> listByExamId(@Param("rank") ERankParamVo rank);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/reportstu/ERstudentActionMapper.java

@@ -0,0 +1,14 @@
+package com.xhkjedu.sexam.mapper.reportstu;
+
+import com.xhkjedu.sexam.base.TkMapper;
+import com.xhkjedu.sexam.model.reportstu.ERstudentAction;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ERstudentActionMapper extends TkMapper<ERstudentAction> {
+    //校级报告-行为分析
+    List<Map> listByExamId(@Param("rank") ERankParamVo rank);
+}

sexam/src/main/java/com/xhkjedu/sexam/model/report/ERrank.java

@@ -16,6 +16,9 @@ public class ERrank extends BaseBean {
     //考试id
     private Integer examid;
 
+    //科目id
+    private String subjectid;
+
     //类型1等级2分数段3临界分4临界名次5优秀年级前6学困年级后
     private Integer ranktype;
 

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

@@ -0,0 +1,27 @@
+package com.xhkjedu.sexam.model.reportclass;
+
+import com.xhkjedu.sexam.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "e_rclass_action")
+@Data
+public class ERclassAction extends BaseBean {
+    @Id
+    //考试报告班级行为分析表
+    private Integer rcaid;
+
+    //班级id
+    private Integer classid;
+
+    //考试id
+    private Integer examid;
+
+    //类型1违纪2优秀
+    private Integer actiontype;
+
+    //科目信息
+    private String subjectjson;
+}

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

@@ -0,0 +1,30 @@
+package com.xhkjedu.sexam.model.reportstu;
+
+import com.xhkjedu.sexam.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "e_rstudent_action")
+@Data
+public class ERstudentAction extends BaseBean {
+    @Id
+    //考试报告学生行为分析表
+    private Integer rsaid;
+
+    //班级id
+    private Integer classid;
+
+    //学生id
+    private Integer studentid;
+
+    //考试id
+    private Integer examid;
+
+    //类型1违纪2优秀
+    private Integer actiontype;
+
+    //科目信息
+    private String subjectjson;
+}

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

@@ -10,31 +10,15 @@ import com.xhkjedu.sexam.mapper.report.ERbaseMapper;
 import com.xhkjedu.sexam.mapper.report.EReportGenerateMapper;
 import com.xhkjedu.sexam.mapper.report.ERrankMapper;
 import com.xhkjedu.sexam.mapper.report.ERsubjectMapper;
-import com.xhkjedu.sexam.mapper.reportclass.ERclassComplexityMapper;
-import com.xhkjedu.sexam.mapper.reportclass.ERclassMapper;
-import com.xhkjedu.sexam.mapper.reportclass.ERclassPointMapper;
-import com.xhkjedu.sexam.mapper.reportclass.ERclassQtypeMapper;
-import com.xhkjedu.sexam.mapper.reportclass.ERclassQuestionMapper;
-import com.xhkjedu.sexam.mapper.reportclass.ERclassRankMapper;
-import com.xhkjedu.sexam.mapper.reportstu.ERStudentComplexityMapper;
-import com.xhkjedu.sexam.mapper.reportstu.ERstudentMapper;
-import com.xhkjedu.sexam.mapper.reportstu.ERstudentPointMapper;
-import com.xhkjedu.sexam.mapper.reportstu.ERstudentQtypeMapper;
+import com.xhkjedu.sexam.mapper.reportclass.*;
+import com.xhkjedu.sexam.mapper.reportstu.*;
 import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
 import com.xhkjedu.sexam.model.report.ERbase;
 import com.xhkjedu.sexam.model.report.ERrank;
 import com.xhkjedu.sexam.model.report.ERsubject;
-import com.xhkjedu.sexam.model.reportclass.ERclass;
-import com.xhkjedu.sexam.model.reportclass.ERclassComplexity;
-import com.xhkjedu.sexam.model.reportclass.ERclassPoint;
-import com.xhkjedu.sexam.model.reportclass.ERclassQtype;
-import com.xhkjedu.sexam.model.reportclass.ERclassQuestion;
-import com.xhkjedu.sexam.model.reportclass.ERclassRank;
-import com.xhkjedu.sexam.model.reportstu.ERStudentComplexity;
-import com.xhkjedu.sexam.model.reportstu.ERStudentQtype;
-import com.xhkjedu.sexam.model.reportstu.ERstudent;
-import com.xhkjedu.sexam.model.reportstu.ERstudentPoint;
+import com.xhkjedu.sexam.model.reportclass.*;
+import com.xhkjedu.sexam.model.reportstu.*;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.paper.QuestionOrderVo;
 import com.xhkjedu.sexam.vo.paper.QuestionPointVo;
@@ -49,12 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.DoubleSummaryStatistics;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -106,6 +85,10 @@ public class EReportGenerateService {
     private ERrankMapper eRrankMapper;
     @Resource
     private ERclassRankMapper eRclassRankMapper;
+    @Resource
+    private ERclassActionMapper eRclassActionMapper;
+    @Resource
+    private ERstudentActionMapper eRstudentActionMapper;
 
     //生成考试报告
     @Transactional(rollbackFor = Exception.class)
@@ -322,6 +305,74 @@ public class EReportGenerateService {
 
         setClassQuestion(examid, subjects, classes);//题型试题
         setClassGradeRankAll(examid, papers, classSubjectStudents, createid);//班级等级分布
+        setAction(examid, subjectMap);//行为分析
+    }
+
+    //行为分析
+    private void setAction(Integer examid, Map<String, String> subjectMap) {
+        List<ERstudentAction> studentActions = new ArrayList<>();
+        List<ERclassAction> classActions = new ArrayList<>();
+        //违纪行为
+        List<Map> bads = eReportGenerateMapper.listBadActionByExamId(examid);
+        Integer actiontype = 1;
+        setActions(examid, subjectMap, studentActions, classActions, bads, actiontype);
+        List<Map> goods = eReportGenerateMapper.listGoodActionByExamId(examid);
+        actiontype = 2;
+        setActions(examid, subjectMap, studentActions, classActions, goods, actiontype);
+        if (N_Utils.isListEmpty(studentActions)) return;
+        eRstudentActionMapper.insertList(studentActions);
+        eRclassActionMapper.insertList(classActions);
+    }
+
+    //处理行为数据
+    private void setActions(Integer examid, Map<String, String> subjectMap
+            , List<ERstudentAction> studentActions, List<ERclassAction> classActions
+            , List<Map> actions, Integer actiontype) {
+        if (N_Utils.isListNotEmpty(actions)) {
+            for (Map action : actions) {
+                action.put("subjectname", subjectMap.get(action.get("subjectid")));
+            }
+            //学生行为分析
+            Map<Integer, List<Map>> collect = actions.stream().collect(Collectors.groupingBy(s -> (Integer) s.get("studentid")));
+            for (Map.Entry<Integer, List<Map>> entry : collect.entrySet()) {
+                List<Map> list = entry.getValue();
+                Map sq = list.get(0);
+                ERstudentAction sa = new ERstudentAction();
+                sa.setClassid((Integer) sq.get("classid"));
+                sa.setStudentid(entry.getKey());
+                sa.setExamid(examid);
+                sa.setActiontype(actiontype);
+                for (Map s : list) {
+                    s.remove("classid");
+                    s.remove("studentid");
+                }
+                String subjectjson = JSON.toJSONString(list);
+                sa.setSubjectjson(subjectjson);
+                studentActions.add(sa);
+            }
+
+            //班级行为分析
+            Map<Integer, List<Map>> ccollect = actions.stream().collect(Collectors.groupingBy(s -> (Integer) s.get("classid")));
+            for (Map.Entry<Integer, List<Map>> entry : ccollect.entrySet()) {
+                List<Map> subjects = new ArrayList<>();
+                Map<String, List<Map>> scollect = entry.getValue().stream().collect(Collectors.groupingBy(s -> s.get("subjectid").toString()));
+                for (Map.Entry<String, List<Map>> sentry : scollect.entrySet()) {
+                    List<Map> list = sentry.getValue();
+                    Map subject = new HashMap();
+                    subject.put("subjectid", sentry.getKey());
+                    subject.put("subjectname", list.get(0).get("subjectname"));
+                    subject.put("num", list.size());
+                    subjects.add(subject);
+                }
+                ERclassAction ca = new ERclassAction();
+                ca.setClassid(entry.getKey());
+                ca.setExamid(examid);
+                ca.setActiontype(actiontype);
+                String subjectjson = JSON.toJSONString(subjects);
+                ca.setSubjectjson(subjectjson);
+                classActions.add(ca);
+            }
+        }
     }
 
     //班级等级分布
@@ -404,22 +455,14 @@ public class EReportGenerateService {
     }
 
     //班级等级分布
-    private void setClassGradeRank(Integer examid, List<ERPaperVo> papers, List<ERstudent> students
+    public void setClassGradeRank(Integer examid, List<ERPaperVo> papers, List<ERstudent> students
             , List<ERrank> rranks, Integer createid) {
         List<Integer> userids = students.stream().map(ERstudent::getStudentid).distinct().collect(Collectors.toList());
         List<UserVo> users = userMapper.listNameByUserIds(userids);
         Map<Integer, String> userMap = users.stream().collect(Collectors.toMap(UserVo::getUserid, UserVo::getUsername));
 
-        Double zfscore = papers.stream().mapToDouble(p -> p.getPscore()).sum();//考试总分
         Map<String, Double> scoreMap = papers.stream().collect(Collectors.toMap(p -> p.getSubjectid(), p -> p.getPscore()));//考试总分
         Double pscore;//试卷总分
-        List<ERstudent> cstudents = new ArrayList<>();//班级学生
-        Map<String, List<ERstudent>> cscollect = students.stream().collect(
-                Collectors.groupingBy(s -> s.getClassid() + "_" + s.getStudentid()));
-        setStuScore(cscollect, cstudents);
-        //总分统计
-        Map<Integer, List<ERstudent>> zfcollect = cstudents.stream().collect(
-                Collectors.groupingBy(s -> s.getClassid()));
 
         List<ERstudent> sstudents = new ArrayList<>();//科目学生
         Map<String, List<ERstudent>> sscollect = students.stream().collect(
@@ -437,39 +480,21 @@ public class EReportGenerateService {
             for (ERrank rrank : rranks) {
                 Double maxrate = rrank.getMaxscore();
                 Double minrate = rrank.getMinscore();
-                //总分统计
-                double maxscore = ExamUtil.mul(maxrate, zfscore);
-                double minscore = ExamUtil.mul(minrate, zfscore);
-                rrank.setMaxscore(maxscore);
-                rrank.setMinscore(minscore);
-                rrankList.add(rrank);
-                String rankname = rrank.getRankname();
-                String rankrange = "[" + minscore + "," + maxscore;
-                if (rankname.equals("A")) {
-                    rankrange = rankrange + "]";
-                } else {
-                    rankrange = rankrange + ")";
-                }
-                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
-                    Integer classid = entry.getKey();
-                    String subjectid = "zf";
-                    List<ERstudent> list = entry.getValue();
-                    setDjTj(examid, userMap, rclassRankList, rrank, rankrange, subjectid, classid, list);
-                }
 
                 //分科统计
                 for (ERPaperVo paper : papers) {
                     String subjectid = paper.getSubjectid();
+                    rrank.setSubjectid(subjectid);
                     pscore = scoreMap.get(subjectid);
-                    maxscore = ExamUtil.mul(maxrate, pscore);
-                    minscore = ExamUtil.mul(minrate, pscore);
+                    double maxscore = ExamUtil.mul(maxrate, pscore);
+                    double minscore = ExamUtil.mul(minrate, pscore);
                     rrank.setMaxscore(maxscore);
                     rrank.setMinscore(minscore);
                     ERrank rrank1 = new ERrank();
                     BeanUtils.copyProperties(rrank, rrank1);
                     rrankList.add(rrank1);
-                    rankrange = "[" + minscore + "," + maxscore;
-                    if (rankname.equals("A")) {
+                    String rankrange = "[" + minscore + "," + maxscore;
+                    if (rrank.getRankname().equals("A")) {
                         rankrange = rankrange + "]";
                     } else {
                         rankrange = rankrange + ")";
@@ -494,34 +519,6 @@ public class EReportGenerateService {
             }
         } else if (ranktype == 2) {//分数段（10分/段）
             Integer linescore = eRrank.getLinescore();
-            //总分统计
-            Integer gnum = ExamUtil.divUp(zfscore, linescore);
-            for (Integer i = 1; i <= gnum; i++) {
-                ERrank rrank = new ERrank();
-                rrank.setRanktype(ranktype);
-                double maxscore = ExamUtil.mul(i, linescore);
-                double minscore = ExamUtil.mul(i - 1, linescore);
-                if (maxscore > zfscore) {
-                    maxscore = zfscore;
-                }
-                rrank.setMaxscore(maxscore);
-                rrank.setMinscore(minscore);
-                String rankrange = "[" + minscore + "," + maxscore;
-                if (i == gnum) {
-                    rankrange = rankrange + "]";
-                } else {
-                    rankrange = rankrange + ")";
-                }
-                rrank.setRankname(rankrange);
-                rrankList.add(rrank);
-
-                for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
-                    Integer classid = entry.getKey();
-                    String subjectid = "zf";
-                    List<ERstudent> list = entry.getValue();
-                    setFdTj(examid, userMap, rclassRankList, gnum, i, rrank, rankrange, classid, list);
-                }
-            }
 
             //分科统计
             for (ERPaperVo paper : papers) {
@@ -531,10 +528,11 @@ public class EReportGenerateService {
                 for (Integer i = 1; i <= cnum; i++) {
                     ERrank rrank = new ERrank();
                     rrank.setRanktype(ranktype);
+                    rrank.setSubjectid(subjectid);
                     double maxscore = ExamUtil.mul(i, linescore);
                     double minscore = ExamUtil.mul(i - 1, linescore);
-                    if (maxscore > zfscore) {
-                        maxscore = zfscore;
+                    if (maxscore > pscore) {
+                        maxscore = pscore;
                     }
                     rrank.setMaxscore(maxscore);
                     rrank.setMinscore(minscore);
@@ -567,47 +565,26 @@ public class EReportGenerateService {
                 }
             }
         } else if (ranktype == 3) {//临界分（临界分：总分*80%，浮动分：5分）
-            Integer linescore1 = eRrank.getLinescore();
-            Integer linescore = linescore1;
+            Integer linescore = eRrank.getLinescore();
             Integer floatscore = eRrank.getFloatscore();
-            if (N_Utils.isEmptyInteger(linescore)) linescore = (int) (ExamUtil.mul(zfscore, 0.8));
-            //总分统计
             ERrank rrank = new ERrank();
             rrank.setRanktype(ranktype);
-            double maxscore = ExamUtil.add(linescore, floatscore);
-            double minscore = ExamUtil.sub(linescore, floatscore);
-            if (maxscore > zfscore) maxscore = zfscore;
-            if (minscore < 0) minscore = 0;
-            rrank.setMaxscore(maxscore);
-            rrank.setMinscore(minscore);
-            rrank.setLinescore(linescore);
-            rrank.setFloatscore(floatscore);
-            String rankrange = "[" + minscore + "," + maxscore + "]";
-            rrank.setRankname(rankrange);
-            rrankList.add(rrank);
-
-            for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
-                Integer classid = entry.getKey();
-                String subjectid = "zf";
-                List<ERstudent> list = entry.getValue();
-                setLjfTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-            }
 
             //分科统计
             for (ERPaperVo paper : papers) {
                 String subjectid = paper.getSubjectid();
+                rrank.setSubjectid(subjectid);
                 pscore = scoreMap.get(subjectid);
-                linescore = linescore1;
                 if (N_Utils.isEmptyInteger(linescore)) linescore = (int) (ExamUtil.mul(pscore, 0.8));
-                maxscore = ExamUtil.add(linescore, floatscore);
-                minscore = ExamUtil.sub(linescore, floatscore);
+                double maxscore = ExamUtil.add(linescore, floatscore);
+                double minscore = ExamUtil.sub(linescore, floatscore);
                 if (maxscore > pscore) maxscore = pscore;
                 if (minscore < 0) minscore = 0;
                 rrank.setMaxscore(maxscore);
                 rrank.setMinscore(minscore);
                 rrank.setLinescore(linescore);
                 rrank.setFloatscore(floatscore);
-                rankrange = "[" + minscore + "," + maxscore + "]";
+                String rankrange = "[" + minscore + "," + maxscore + "]";
                 rrank.setRankname(rankrange);
                 ERrank rrank1 = new ERrank();
                 BeanUtils.copyProperties(rrank, rrank1);
@@ -632,42 +609,23 @@ public class EReportGenerateService {
         } else if (ranktype == 4) {//临界名次（临界名次10，浮动名次5）
             Integer linescore = eRrank.getLinescore();
             Integer floatscore = eRrank.getFloatscore();
-            //总分统计
             ERrank rrank = new ERrank();
             rrank.setRanktype(ranktype);
-            double maxscore = ExamUtil.sub(linescore, floatscore);//最高名次
-            double minscore = ExamUtil.add(linescore, floatscore);//最低名次
-            if (maxscore < 1) maxscore = 1;//最高名次为1
-            int stunum = (int) students.stream().map(s -> s.getStudentid()).distinct().count();//学生数量
-            if (minscore > stunum) minscore = stunum;//最低名次=学生数量
-            rrank.setMaxscore(maxscore);
-            rrank.setMinscore(minscore);
-            rrank.setLinescore(linescore);
-            rrank.setFloatscore(floatscore);
-            String rankrange = "[" + minscore + "," + maxscore + "]";
-            rrank.setRankname(rankrange);
-            rrankList.add(rrank);
-
-            for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
-                Integer classid = entry.getKey();
-                String subjectid = "zf";
-                List<ERstudent> list = entry.getValue();
-                setLjmcTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-            }
 
             //分科统计
             for (ERPaperVo paper : papers) {
                 String subjectid = paper.getSubjectid();
-                maxscore = ExamUtil.sub(linescore, floatscore);//最高名次
-                minscore = ExamUtil.add(linescore, floatscore);//最低名次
+                rrank.setSubjectid(subjectid);
+                double maxscore = ExamUtil.sub(linescore, floatscore);//最高名次
+                double minscore = ExamUtil.add(linescore, floatscore);//最低名次
                 if (maxscore < 1) maxscore = 1;//最高名次为1
-                stunum = students.size();//学生数量
+                Integer stunum = students.size();//学生数量
                 if (minscore > stunum) minscore = stunum;//最低名次=学生数量
                 rrank.setMaxscore(maxscore);
                 rrank.setMinscore(minscore);
                 rrank.setLinescore(linescore);
                 rrank.setFloatscore(floatscore);
-                rankrange = "[" + minscore + "," + maxscore + "]";
+                String rankrange = "[" + minscore + "," + maxscore + "]";
                 rrank.setRankname(rankrange);
                 ERrank rrank1 = new ERrank();
                 BeanUtils.copyProperties(rrank, rrank1);
@@ -691,25 +649,19 @@ public class EReportGenerateService {
             }
         } else if (ranktype == 5) {//优秀年级前（10名）
             Integer linescore = eRrank.getLinescore();
-            //总分统计
             ERrank rrank = new ERrank();
             rrank.setRanktype(ranktype);
             rrank.setLinescore(linescore);
             String rankrange = "年级前" + linescore + "名";
             rrank.setRankname(rankrange);
-            rrankList.add(rrank);
-
-            for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
-                Integer classid = entry.getKey();
-                String subjectid = "zf";
-                List<ERstudent> list = entry.getValue();
-                setNjqTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-            }
 
             //分科统计
             for (ERPaperVo paper : papers) {
                 String subjectid = paper.getSubjectid();
-
+                rrank.setSubjectid(subjectid);
+                ERrank rrank1 = new ERrank();
+                BeanUtils.copyProperties(rrank, rrank1);
+                rrankList.add(rrank1);
                 //全部班级统计
                 for (Map.Entry<String, List<ERstudent>> entry : qbbjcollect.entrySet()) {
                     Integer classid = 0;
@@ -728,26 +680,19 @@ public class EReportGenerateService {
             }
         } else if (ranktype == 6) {//学困年级后（10名）
             Integer linescore = eRrank.getLinescore();
-            //总分统计
             ERrank rrank = new ERrank();
             rrank.setRanktype(ranktype);
             rrank.setLinescore(linescore);
             String rankrange = "年级后" + linescore + "名";
             rrank.setRankname(rankrange);
-            rrankList.add(rrank);
-
-            for (Map.Entry<Integer, List<ERstudent>> entry : zfcollect.entrySet()) {
-                Integer classid = entry.getKey();
-                String subjectid = "zf";
-                List<ERstudent> list = entry.getValue();
-                rrank.setMaxscore(getMaxScore(list, linescore));
-                setNjhTj(examid, userMap, rclassRankList, rrank, rankrange, classid, subjectid, list);
-            }
 
             //分科统计
             for (ERPaperVo paper : papers) {
                 String subjectid = paper.getSubjectid();
-
+                rrank.setSubjectid(subjectid);
+                ERrank rrank1 = new ERrank();
+                BeanUtils.copyProperties(rrank, rrank1);
+                rrankList.add(rrank1);
                 //全部班级统计
                 for (Map.Entry<String, List<ERstudent>> entry : qbbjcollect.entrySet()) {
                     Integer classid = 0;

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

@@ -1,14 +1,24 @@
 package com.xhkjedu.sexam.service.report;
 
+import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.report.ERbaseMapper;
+import com.xhkjedu.sexam.mapper.report.EReportSchoolMapper;
 import com.xhkjedu.sexam.mapper.report.ERsubjectMapper;
+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.model.reportstu.ERstudentAction;
+import com.xhkjedu.sexam.vo.report.ERPaperVo;
+import com.xhkjedu.sexam.vo.report.ERankParamVo;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author ywx
@@ -24,6 +34,16 @@ public class EReportSchoolService {
     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 Map getKsGk(Integer examid) {
@@ -38,4 +58,59 @@ public class EReportSchoolService {
     public List<Map> listCjd(ERstudent stu) {
         return eRstudentMapper.listByExamId(stu);
     }
+
+    //成绩分析
+    public Map listCjFx(ERankParamVo rank) {
+        Map map = new HashMap();
+        List<Map> classes = eRclassMapper.listByExamId(rank);
+        List<Map> list = eRclassRankMapper.listByExamId(rank);
+        List<Map> djList = list.stream().filter(l -> "1".equals(l.get("ranktype").toString())).collect(Collectors.toList());
+        List<Map> fsdList = list.stream().filter(l -> "2".equals(l.get("ranktype").toString())).collect(Collectors.toList());
+        List<Map> ljfList = list.stream().filter(l -> "3".equals(l.get("ranktype").toString())).collect(Collectors.toList());
+        List<Map> ljmcList = list.stream().filter(l -> "4".equals(l.get("ranktype").toString())).collect(Collectors.toList());
+        List<Map> yxsList = list.stream().filter(l -> "5".equals(l.get("ranktype").toString())).collect(Collectors.toList());
+        List<Map> xksList = list.stream().filter(l -> "6".equals(l.get("ranktype").toString())).collect(Collectors.toList());
+        map.put("classes", classes);
+        map.put("djList", djList);
+        map.put("fsdList", fsdList);
+        map.put("ljfList", ljfList);
+        map.put("ljmcList", ljmcList);
+        map.put("yxsList", yxsList);
+        map.put("xksList", xksList);
+        return map;
+    }
+
+    //成绩分析-搜索
+    public List<Map> listCjFxForSearch(ERankParamVo rank) {
+        return eRclassRankMapper.listByExamId(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 List<Map> listXwBj(ERstudentAction rank) {
+        return eReportSchoolMapper.listXwBj(rank);
+    }
+
+    //行为分析-学生
+    public List<Map> listXwXs(ERstudentAction rank) {
+        return eReportSchoolMapper.listXwXs(rank);
+    }
+
+    //违纪行为分析-详情
+    public List<Map> listWjXq(ERstudentAction rank) {
+        return eReportSchoolMapper.listWjXq(rank);
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/report/ERankParamVo.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.sexam.vo.report;
+
+import com.xhkjedu.sexam.model.report.ERrank;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description 考试报告等级信息
+ * @Author ywx
+ * Date 2022/8/29 10:57
+ **/
+@Data
+public class ERankParamVo {
+
+    private Integer examid;//开始id
+
+    private Integer createid;//操作人id
+
+    private String subjectid;//科目id
+
+    private Integer classid;//班级id
+
+    //类型1等级2分数段3临界分4临界名次5优秀年级前6学困年级后
+    private Integer ranktype;
+
+    private List<ERrank> rranks;//等级
+}

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -195,6 +195,11 @@
         select classid,examid,subjectid,studentid,stuscore score,sstate
         from e_paper_student where examid=#{examid} and sstate!=0
     </select>
+    <!--考试试卷学生-->
+    <select id="listByExamAndSubjectId" resultType="com.xhkjedu.sexam.model.reportstu.ERstudent">
+        select classid,examid,subjectid,studentid,stuscore score,sstate
+        from e_paper_student where examid=#{examid} and subjectid=#{subjectid} and sstate!=0
+    </select>
 
     <!--更改单个学生试卷分值-->
     <update id="updateStuPaperscoreEpsid">

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sexam.mapper.reportclass.ERclassMapper">
+    <!--校级报告-成绩分析-->
+    <select id="listByExamId" 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.subjectid=#{rank.subjectid}
+        <if test="rank.classid!=null and rank.classid!=0">
+            and er.classid=#{rank.classid}
+        </if>
+    </select>
+</mapper>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sexam.mapper.reportclass.ERclassRankMapper">
+    <!--校级报告-成绩分析-->
+    <select id="listByExamId" 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 err.subjectid=#{rank.subjectid}
+        <if test="rank.classid!=null and rank.classid!=0">
+            and err.classid=#{rank.classid}
+        </if>
+        <if test="rank.ranktype!=null and rank.ranktype!=0">
+            and err.ranktype=#{rank.ranktype}
+        </if>
+    </select>
+</mapper>

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

@@ -33,4 +33,20 @@
         where ecs.examid=#{examid} and ecs.examid!=er.examid and er.rsid is not null group by er.studentid,er.subjectid)a
         left join e_rstudent er on a.rsid=er.rsid
     </select>
+    <!--学生违纪行为-->
+    <select id="listBadActionByExamId" resultType="java.util.Map">
+        select studentid,classid,subjectid
+        ,count(case when bad=1 then epsqid else null end)num
+        from e_paper_student_question
+        where examid=#{examid} and bad=1
+        group by studentid, subjectid, bad
+    </select>
+    <!--学生优秀行为-->
+    <select id="listGoodActionByExamId" resultType="java.util.Map">
+        select studentid,classid,subjectid
+        ,count(case when good=1 then epsqid else null end)num
+        from e_paper_student_question
+        where examid=#{examid} and good=1
+        group by studentid, subjectid, good
+    </select>
 </mapper>

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sexam.mapper.report.EReportSchoolMapper">
+    <!--考试试卷-->
+    <select id="listByExamAndSubjectId" resultType="com.xhkjedu.sexam.vo.report.ERPaperVo">
+        select ep.subjectid,ep.pscore from e_paper ep where ep.examid=#{examid} and subjectid=#{subjectid}
+    </select>
+    <!--删除考试等级报告-->
+    <delete id="delByExamAndSubjectId">
+        delete from e_rclass_rank where examid=#{examid} and subjectid=#{subjectid} and ranktype=#{ranktype};
+        delete from e_rrank where examid=#{examid} and subjectid=#{subjectid} and ranktype=#{ranktype};
+    </delete>
+    <!--行为分析-班级-->
+    <select id="listXwBj" resultType="java.util.Map">
+        select ec.classname,ca.classid,ca.subjectjson
+        from e_rclass_action ca left join e_class ec on ca.examid = ec.examid and ca.classid = ec.classid
+        where ca.examid=#{rank.examid} and ca.actiontype=#{rank.actiontype}
+        <if test="rank.classid!=null and rank.classid!=0">
+            and ca.classid=#{rank.classid}
+        </if>
+    </select>
+    <!--行为分析-学生-->
+    <select id="listXwXs" resultType="java.util.Map">
+        select ec.classname,sa.classid,sa.studentid,sa.subjectjson,u.username,u.loginname
+        from e_rstudent_action sa left join e_class ec on sa.examid = ec.examid and sa.classid = ec.classid
+        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="listWjXq" resultType="java.util.Map">
+        select s.subjectname,sb.badtype,sb.picpath,sb.createtime
+        from e_subject_badstudent sb left join e_subject s on sb.esid=s.esid
+        where sb.examid=#{rank.examid} and sb.studentid=#{rank.studentid}
+        order by sb.esbsid
+    </select>
+</mapper>