Merge remote-tracking branch 'origin/master' into ywx

sexam/src/main/java/com/xhkjedu/sexam/controller/exam/EBaseController.java

@@ -285,7 +285,7 @@ public class EBaseController {
         if (1 == exammode && 2 != vo.getAnswered()) return new ResultVo(1, "还有考试试卷未结束");
         if (1 != vo.getExamstate()) return new ResultVo(0, "结束成功");
         try {
-            eBaseService.updateExamStateEnd(examid, createid);
+            eBaseService.updateExamStateEnd(eBase);
             return new ResultVo(0, "结束成功");
         } catch (Exception e) {
             return new ResultVo(1, "结束失败");
@@ -461,6 +461,7 @@ public class EBaseController {
         N_Utils.validation(new Object[]{examid, "考试id", 1, createid, "操作人", 1});
         try {
             eReportGenerateService.generateExamReport(examid, createid);
+            eBaseService.updateExamReport(examid);
             return new ResultVo(0, "生成成功");
         } catch (Exception e) {
             return new ResultVo(1, "生成失败");
@@ -498,4 +499,20 @@ public class EBaseController {
         Integer examstate = eBaseService.getExamState(examid);
         return new ResultVo(0, "获取考试状态成功", examstate);
     }
+
+    /**
+     * @Description  生成报告pdf
+     * @Param [eBase]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/10/8 11:29
+     **/
+    @PostMapping("/srep")
+    public ResultVo saveReportPath(@RequestBody EBase eBase) {
+        Integer examid = eBase.getExamid();
+        String reportpath = eBase.getReportpath();
+        N_Utils.validation(new Object[]{examid, "考试id", 1,reportpath,"报告地址",2});
+        eBaseService.updateExamReportPath(examid,reportpath);
+        return new ResultVo(0, "保存报告成功");
+    }
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/exam/EBaseMapper.java

@@ -21,6 +21,15 @@ public interface EBaseMapper extends TkMapper<EBase> {
     //修改考试状态
     void updateExamState(@Param("examid") Integer examid, @Param("examstate") int examstate);
 
+    //修改考试状态和报告时间
+    void updateExamStateAndReport(@Param("e")EBase e);
+
+    //修改是否需要生成报告pdf
+    void updateExamReport(@Param("examid") Integer examid, @Param("reportneed") int reportneed);
+
+    //修改生成报告pdf地址
+    void updateExamReportPath(@Param("examid") Integer examid, @Param("reportneed") int reportneed,@Param("reportpath") String reportpath);
+
     //考试基本信息
     Map findById(@Param("examid") Integer examid);
 

sexam/src/main/java/com/xhkjedu/sexam/model/exam/EBase.java

@@ -51,6 +51,12 @@ public class EBase extends BaseBean {
     //学校id
     private Integer schoolid;
 
+    private Integer reporttime;//生成报告时间（网页端）
+
+    private Integer reportneed;//是否需要生成报告（pdf）
+
+    private String reportpath;//报告地址
+
     @Transient
     //班级ids
     private List<Integer> classids;

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

@@ -57,7 +57,7 @@ public class ERclassQuestion extends BaseBean {
     //班级得分率
     private Double classsrate;
 
-    //得分率分组：1优秀率≥85%2良好率≥70%3合格率≥60%4低分率≥40%
+    //得分率分组：1优秀率≥85%2良好率≥70%3合格率≥60%5低分率≥40%
     private Integer classratetype;
 
     //年级得分

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -67,6 +67,7 @@ public class EBaseService {
             //考试
             model.setExamstate(0);
             model.setDeleted(1);
+            model.setReportneed(0);
             model.setCreatetime(N_Utils.getSecondTimestamp());
             eBaseMapper.insertUseGeneratedKeys(model);
             Integer examid = model.getId();
@@ -259,11 +260,14 @@ public class EBaseService {
 
     //结束考试
     @Transactional(rollbackFor = Exception.class)
-    public void updateExamStateEnd(Integer examid, Integer createid) throws Exception {
+    public void updateExamStateEnd(EBase eBase) throws Exception {
         try {
-            ePaperStudentMapper.updateStuscoreByExamId(examid);//更新未已提交未批阅完成学生得分
-            eReportGenerateService.generateExamReport(examid, createid);
-            eBaseMapper.updateExamState(examid, 2);
+            ePaperStudentMapper.updateStuscoreByExamId(eBase.getExamid());//更新未已提交未批阅完成学生得分
+            eReportGenerateService.generateExamReport(eBase.getExamid(), eBase.getCreateid());
+            eBase.setReporttime(N_Utils.getSecondTimestamp());
+            eBase.setReportneed(1);
+            eBase.setExamstate(2);
+            eBaseMapper.updateExamStateAndReport(eBase);
         } catch (Exception e) {
             log.error("结束考试失败", e);
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -395,4 +399,14 @@ public class EBaseService {
     public EBaseVo getExamStateAnseredById(Integer examid) {
         return eBaseMapper.getExamStateAnseredById(examid);
     }
+
+    //修改是否需要生成报告pdf
+    public void updateExamReport(Integer examid){
+        eBaseMapper.updateExamState(examid,1);
+    }
+
+    //修改生成报告pdf地址
+    public void updateExamReportPath(Integer examid,String reportpath){
+        eBaseMapper.updateExamReportPath(examid,0,reportpath);
+    }
 }

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

@@ -1397,7 +1397,7 @@ public class EReportGenerateService {
 
         Integer rank = rrank.getLinescore();//年级前rank名
         Double maxscore = rrank.getMaxscore();//年级后rank名最高分
-        System.out.println(classid + ";" + subjectid + ";" + rank + ";" + maxscore);
+
         List<ERstudent> list2 = list.stream().filter(s -> s.getSchoolrank().compareTo(rank) != 1).collect(Collectors.toList());
         List<ERstudent> list3 = list.stream().filter(s -> s.getScore().compareTo(maxscore) != 1).collect(Collectors.toList());
 

sexam/src/main/java/com/xhkjedu/sexam/utils/ExamUtil.java

@@ -320,7 +320,7 @@ public class ExamUtil {
     }
 
     /**
-     * @Description 得分率分组：1优秀率≥85%2良好率≥70%3合格率≥60%4低分率≥40%
+     * @Description 得分率分组：1优秀率≥85%2良好率≥70%3合格率≥60%5低分率≥40%
      * @Param [scorerate]
      * @Return java.lang.Integer
      * @Author wn
@@ -335,8 +335,10 @@ public class ExamUtil {
                 ratetype = 2;
             } else if (scorerate < 70 && scorerate >= 60) {
                 ratetype = 3;
-            } else if (scorerate <= 40) {
+            }else if(scorerate < 60 && scorerate > 40){
                 ratetype = 4;
+            } else if (scorerate <= 40) {
+                ratetype = 5;
             }
         }
         return ratetype;

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

@@ -40,6 +40,19 @@
     <update id="updateExamState">
         update e_base set examstate=#{examstate} where examid=#{examid}
     </update>
+    <!--修改考试状态和报告时间-->
+    <update id="updateExamStateAndReport">
+        update e_base set examstate=#{e.examstate},reporttime=#{e.reporttime},reportneed=#{e.reportneed} where examid=#{e.examid}
+    </update>
+    <!--修改是否需要生成报告pdf-->
+    <update id="updateExamReport">
+        update e_base set reportneed=#{reportneed} where examid=#{examid}
+    </update>
+    <!--修改生成报告pdf地址-->
+    <update id="updateExamReportPath">
+        update e_base set reportpath=#{reportpath},reportneed=#{reportneed} where examid=#{examid}
+    </update>
+
     <!--发布考试-->
     <update id="postExam">
         update e_base set examcomm=#{examcomm},examstate=1 where examid=#{examid}