报告试题知识点，修改学生得分

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentQuestionHistoryController.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.sexam.controller.paperstudent;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestionHistory;
+import com.xhkjedu.sexam.service.paperstudent.EPaperStudentQuestionHistoryService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+@RestController
+@RequestMapping("/psqh")
+@Slf4j
+public class EPaperStudentQuestionHistoryController {
+    @Resource
+    private EPaperStudentQuestionHistoryService ePaperStudentQuestionHistoryService;
+
+    //更改学生试题得分
+    @PostMapping("/upstus")
+    public ResultVo updateQuestionStuscore(@RequestBody EPaperStudentQuestionHistory psh) {
+        try {
+            N_Utils.validation(new Object[]{psh.getEpsqid(), "试题id", 1, psh.getTeacherid(),"教师id",1});
+            ePaperStudentQuestionHistoryService.updateQuestionStuscore(psh);
+            return new ResultVo(0, "成功保存学生试题得分");
+        } catch (Exception e) {
+            log.error("保存学生试题得分失败：" + e.getMessage());
+            return new ResultVo(1, "保存学生试题得分失败");
+        }
+    }
+
+    //修改分值历史
+    @PostMapping("/list")
+    public ResultVo listHistorys(@RequestBody EPaperStudentQuestionHistory psh) {
+        Integer page = psh.getPage();
+        Integer pageSize = psh.getPageSize();
+        N_Utils.validation(new Object[]{psh.getExamid(), "考试id", 1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> rtnlst = ePaperStudentQuestionHistoryService.listExamStuQuestionHistory(psh.getExamid(),psh.getSubjectid());
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
+        return new ResultVo(0, "成功获取修改分值历史信息",pageResult);
+    }
+
+}

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

@@ -57,4 +57,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
     EPaperStudent getPaperStudentByStuidAndEpid(@Param("epid") Integer epid, @Param("studentid") Integer studentid);
 
     List<ERstudent> listByExamId(@Param("examid") Integer examid);
+
+    //更改单个学生试卷分值
+    void updateStuPaperscoreEpsid(@Param("epsid")Integer epsid);
 }

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

@@ -0,0 +1,16 @@
+package com.xhkjedu.sexam.mapper.paperstudent;
+
+import com.xhkjedu.sexam.base.TkMapper;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestionHistory;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface EPaperStudentQuestionHistoryMapper extends TkMapper<EPaperStudentQuestionHistory> {
+    //修改分值历史
+    List<Map> listExamStuQuestionHistory(@Param("examid")Integer examid, @Param("subjectid")String subjectid);
+
+}

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

@@ -51,4 +51,10 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
     //报告生成-学生试卷
     List<EPaperStudentQuestion> listExamStudentsAnswer(@Param("examid")Integer examid);
 
+    //修改学生得分
+    void updateStuScoreByepsqid(@Param("stuscore")Double stuscore,@Param("epsqid")Integer epsqid);
+
+    //根据试题id获取考试信息
+    EPaperStudentQuestion getExamPaperStudntQuestionbyEpsqid(@Param("epsqid")Integer epsqid);
+
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPaperStudentQuestion.java

@@ -85,4 +85,10 @@ public class EPaperStudentQuestion extends BaseBean {
     @Transient
     private String stuname;//学生姓名
 
+    @Transient
+    private Integer examid;
+
+    @Transient
+    private String subjectid;
+
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPaperStudentQuestionHistory.java

@@ -0,0 +1,51 @@
+package com.xhkjedu.sexam.model.paperstudent;
+
+import com.xhkjedu.sexam.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 修改学生试卷分值记录表
+ */
+@Data
+@Table(name = "e_paper_student_question_history")
+public class EPaperStudentQuestionHistory extends BaseBean {
+    //试卷学生分修改记录表
+    @Id
+    private Integer epsqhid;
+
+    //考试id
+    private Integer examid;
+
+    //试卷id
+    private Integer epid;
+
+    //科目id
+    private String subjectid;
+
+    //班级id
+    private Integer classid;
+
+    //学生id
+    private Integer studentid;
+
+    //学生作答试题id
+    private Integer epsqid;
+
+    //修改试题题号
+    private String qn;
+
+    //学生原得分
+    private Double stuscore;
+
+    //修改后分值
+    private Double upscore;
+
+    //修改考试
+    private Integer teacherid;
+
+    //修改时间
+    private Integer createtime;
+}

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

@@ -19,6 +19,9 @@ public class ERclassQuestionPoint extends BaseBean {
     //班级id
     private Integer classid;
 
+    //试卷id
+    private Integer epid;
+
     //科目id
     private String subjectid;
 
@@ -35,13 +38,13 @@ public class ERclassQuestionPoint extends BaseBean {
     private Double gradeavgscore;
 
     //年级得分率占比
-    private Double gradeavgrate;
+    private Double gradesrate;
 
     //班级平均分
     private Double classavgscore;
 
     //平均分占比
-    private Double classavgrate;
+    private Double classsrate;
 
     //知识点关联试题题号
     private String qns;

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -315,10 +315,11 @@ public class EPaperQtypeService {
             double cscore = pvo.stream().collect(Collectors.summingDouble(EPaperQPointVo:: getScore));
             double scorerate = N_Utils.getDoubleDivideAndMulitiply(cscore, ePaper.getPscore());
             List<Integer> thlist = pvo.stream().map(EPaperQPointVo :: getQorder).collect(Collectors.toList());
+            thlist = thlist.stream().distinct().collect(Collectors.toList());
             pm.put("pointname",pvo.get(0).getPointname());
             pm.put("score",cscore);
             pm.put("srate",scorerate);
-            pm.put("order",thlist.stream().distinct().collect(Collectors.toList()));
+            pm.put("order",JSON.toJSONString(thlist));
             pointlist.add(pm);
         }
 

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentQuestionHistoryService.java

@@ -0,0 +1,65 @@
+package com.xhkjedu.sexam.service.paperstudent;
+
+import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
+import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionHistoryMapper;
+import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion;
+import com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestionHistory;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class EPaperStudentQuestionHistoryService {
+
+    @Resource
+    private EPaperStudentMapper ePaperStudentMapper;
+    @Resource
+    private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
+    @Resource
+    private EPaperStudentQuestionHistoryMapper ePaperStudentQuestionHistoryMapper;
+
+
+    /**
+     * @Description 更改学生试题得分
+     * @Param [sqh]
+     * @Return void
+     * @Author wn
+     * @Date 2022/8/10 16:17
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void updateQuestionStuscore(EPaperStudentQuestionHistory sqh){
+        //学生试题详情
+        EPaperStudentQuestion q = ePaperStudentQuestionMapper.getExamPaperStudntQuestionbyEpsqid(sqh.getEpsqid());
+        sqh.setExamid(q.getExamid());
+        sqh.setSubjectid(q.getSubjectid());
+        sqh.setEpid(q.getEpid());
+        sqh.setClassid(q.getClassid());
+        sqh.setStudentid(q.getStudentid());
+        sqh.setCreatetime(N_Utils.getSecondTimestamp());
+        sqh.setStuscore(q.getStuscore());
+        sqh.setQn(q.getQn());
+
+        //修改学生单个试题得分
+        ePaperStudentQuestionMapper.updateStuScoreByepsqid(sqh.getUpscore(),sqh.getEpsqid());
+        //修改学生试卷分值
+        ePaperStudentMapper.updateStuPaperscoreEpsid(q.getEpsid());
+        //保存更改学生分值记录
+        ePaperStudentQuestionHistoryMapper.insertSelective(sqh);
+    }
+
+    /**
+     * @Description 更改学生试题得分
+     * @Param [sqh]
+     * @Return void
+     * @Author wn
+     * @Date 2022/8/10 15:07
+     **/
+    public List<Map> listExamStuQuestionHistory(Integer examid, String subjectid){
+        return ePaperStudentQuestionHistoryMapper.listExamStuQuestionHistory(examid,subjectid);
+    }
+}

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

@@ -2,6 +2,7 @@ package com.xhkjedu.sexam.service.report;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
+import com.xhkjedu.sexam.mapper.paper.EPaperAnalyzeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
@@ -19,6 +20,7 @@ import com.xhkjedu.sexam.model.report.ERsubject;
 import com.xhkjedu.sexam.model.reportclass.ERclass;
 import com.xhkjedu.sexam.model.reportclass.ERclassQtype;
 import com.xhkjedu.sexam.model.reportclass.ERclassQuestion;
+import com.xhkjedu.sexam.model.reportclass.ERclassQuestionPoint;
 import com.xhkjedu.sexam.model.reportstu.ERstudent;
 import com.xhkjedu.sexam.utils.ExamUtil;
 import com.xhkjedu.sexam.vo.paper.EPaperQPointVo;
@@ -27,6 +29,7 @@ import com.xhkjedu.sexam.vo.paper.EPaperQtypeVo;
 import com.xhkjedu.sexam.vo.report.ERClassScoreVo;
 import com.xhkjedu.sexam.vo.report.ERPaperVo;
 import com.xhkjedu.utils.N_Utils;
+import org.bouncycastle.operator.AADProcessor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,6 +61,8 @@ public class EReportGenerateService {
     private EPaperQtypeMapper ePaperQtypeMapper;
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
+    @Resource
+    private EPaperAnalyzeMapper ePaperAnalyzeMapper;
 
 
     @Resource
@@ -335,13 +340,14 @@ public class EReportGenerateService {
         }
     }
 
-    //题型试题
+    //题型、试题、知识点
     private void setClassQuestion(Integer examid,List<Map> subjects,List<Map> classes){
         //考试所有学生提交试卷情况
         List<EPaperStudentQuestion> stulist = ePaperStudentQuestionMapper.listExamStudentsAnswer(examid);
 
         List<ERclassQtype> rtypelist = new ArrayList<>();
         List<ERclassQuestion> rqlist = new ArrayList<>();
+        List<ERclassQuestionPoint> rpointlist = new ArrayList<>();
 
         for(Map map : subjects){
             String subjectid = map.get("subjectid").toString();
@@ -431,12 +437,9 @@ public class EReportGenerateService {
                             erClassScoreVo.setTcscore(ExamUtil.add(erClassScoreVo.getTcscore(), qallstu));
                             tcmap.put(classid,erClassScoreVo);
                         }
-
                     }
-
                 }
 
-
                 Double tgavescore = N_Utils.getDoubleDivideAndMulitiply(tgscore,stunum);//题型下年级平均分
                 Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgscore,eptscore * stunum);//年级得分率
 
@@ -461,9 +464,58 @@ public class EReportGenerateService {
                     rtypelist.add(eRclassQtype);
                 }
             }
+
+            //仅有题库试卷有知识点
+            if(ptype == 1){
+                //获取试卷只是分析
+                Map epa = ePaperAnalyzeMapper.getPaperAnalzyeByEpid(epid);
+                String pointjson = epa.get("pointjson").toString();
+                List<Map> pointlist = JSON.parseArray(pointjson,Map.class);
+                //遍历知识点处理年级班级知识点情况
+                for(int j=0;j<pointlist.size();j++){
+                    Map pointmap = pointlist.get(j);
+                    String pointname = pointmap.get("pointname").toString();
+                    Double score = Double.parseDouble(pointmap.get("score").toString());
+                    Double scorerate = Double.parseDouble(pointmap.get("scorerate").toString());
+                    String qnstr = pointmap.get("order").toString();
+
+                    List<String> qnlst = JSON.parseArray(qnstr,String.class);//题号集合
+                    List<EPaperStudentQuestion> gstus = stulist.stream().filter(o -> o.getEpid().equals(epid) && qnlst.contains(o.getQn())).collect(Collectors.toList());
+                    Double gstuscore = gstus.stream().mapToDouble(EPaperStudentQuestion :: getStuscore).sum();
+                    Double gscore = gstus.stream().mapToDouble(EPaperStudentQuestion :: getQscore).sum();
+                    Double gavgscore = N_Utils.getDoubleDivideAndMulitiply(gstuscore,gstus.size());//平均分分
+                    Double gsrate = N_Utils.getDoubleDivideAndMulitiply(gstuscore,gscore);//得分率
+                    for(Map classm : classes){
+                        Integer classid = Integer.parseInt(classm.get("classid").toString());
+                        List<EPaperStudentQuestion> cstus = gstus.stream().filter( o -> o.getClassid().equals(classid)).collect(Collectors.toList());
+                        Double cstuscore = cstus.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                        Double cscore = cstus.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                        Double cavgscore = N_Utils.getDoubleDivideAndMulitiply(cstuscore,cstus.size());//平均分分
+                        Double csrate = N_Utils.getDoubleDivideAndMulitiply(cstuscore,cscore);//得分率
+
+                        ERclassQuestionPoint pointvo = new ERclassQuestionPoint();
+                        pointvo.setExamid(examid);
+                        pointvo.setClassid(classid);
+                        pointvo.setEpid(epid);
+                        pointvo.setSubjectid(subjectid);
+                        pointvo.setPointname(pointname);
+                        pointvo.setScore(score);
+                        pointvo.setSrate(scorerate);
+                        pointvo.setQns(qnstr);
+                        pointvo.setGradeavgscore(gavgscore);
+                        pointvo.setGradesrate(gsrate);
+                        pointvo.setClassavgscore(cavgscore);
+                        pointvo.setClasssrate(csrate);
+                        rpointlist.add(pointvo);
+                    }
+
+                }
+
+            }
         }
         eRclassQtypeMapper.insertList(rtypelist);
         eRclassQuestionMapper.insertList(rqlist);
+        eRclassQuestionPointMapper.insertList(rpointlist);
     }
     //处理题库试卷中子母题
     private void setEPaperQtypeForQues(List<EPaperQtypeVo> fjtypelist){

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

@@ -192,4 +192,10 @@
         select classid,examid,subjectid,studentid,stuscore score,sstate
         from e_paper_student where examid=#{examid} and sstate!=0
     </select>
+
+    <!--更改单个学生试卷分值-->
+    <update id="updateStuPaperscoreEpsid">
+        update e_paper_student ps set ps.stuscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM e_paper_student_question q
+          WHERE q.epsid=#{epsid} ) where ps.epsid=#{epsid}
+    </update>
 </mapper>

sexam/src/main/resources/mapper/paperstudent/EPaperStudentQuestionHistoryMapper.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.paperstudent.EPaperStudentQuestionHistoryMapper">
+
+    <!--修改历史-->
+    <select id="listExamStuQuestionHistory" resultType="java.util.Map">
+        select h.*,u.username stuname,u.loginname,s.subjectname
+        from e_paper_student_question_history h left join t_user u on h.studentid=u.userid
+                                                left join t_subject s on h.subjectid=s.subjectid
+        where h.examid=#{examid}
+        <if test="subjectid!=null and subjectid!='' and subjectid!='0'">
+            and h.subjectid=#{subjectid}
+        </if>
+        order by h.createtime desc
+    </select>
+
+</mapper>

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

@@ -142,4 +142,14 @@
         left join t_user u on q.studentid=u.userid where s.examid=#{examid} and s.sstate=2 group by q.epsqid
     </select>
 
+    <!--修改学生得分-->
+    <update id="updateStuScoreByepsqid">
+        update e_paper_student_question set stuscore=#{stuscore} where epsqid=#{epsqid}
+    </update>
+    <!---根据试题id获取考试信息-->
+    <select id="getExamPaperStudntQuestionbyEpsqid" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
+        select q.*,s.examid,s.subjectid from e_paper_student_question q left join e_paper_student s on s.epsid=q.epsid
+        where q.epsqid=#{epsqid}
+    </select>
+
 </mapper>