pdf报告保存设置，暂未对接mq

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

@@ -460,8 +460,7 @@ public class EBaseController {
         Integer createid = eBase.getCreateid();
         N_Utils.validation(new Object[]{examid, "考试id", 1, createid, "操作人", 1});
         try {
-            eReportGenerateService.generateExamReport(examid, createid);
-            eBaseService.updateExamReport(examid);
+            eBaseService.generateExamReport(examid, createid);
             return new ResultVo(0, "生成成功");
         } catch (Exception e) {
             return new ResultVo(1, "生成失败");
@@ -500,19 +499,4 @@ public class EBaseController {
         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,14 +21,12 @@ 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);
+    //结束考试更改状态和报告状态
+    void updateExamStateAndReportState(@Param("examid") Integer examid, @Param("examstate") int examstate);
+    //修改报告pdf后
+    void updateExamReportSchoolState(@Param("examid") Integer examid, @Param("reportstate") int reportstate,@Param("reportschool")String reportschool);
+    //更改pdf报告生成状态
+    void updateExamReportState(@Param("examid") Integer examid, @Param("reportstate") int reportstate);
 
     //考试基本信息
     Map findById(@Param("examid") Integer examid);

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

@@ -44,4 +44,7 @@ public interface EClassMapper extends TkMapper<EClass> {
 
     //班级选择列表
     List<Map> listBj(@Param("schoolid") Integer schoolid, @Param("teacherid") Integer teacherid);
+
+    //批量更新班级pdf报告地址
+    void updateBatchReportpath(@Param("list")List<EClass> list);
 }

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

@@ -25,4 +25,7 @@ public interface EClassStudentMapper extends TkMapper<EClassStudent> {
 
     //更加考试id和学生id获取班级id
     Integer getClassidByStudentidAndExamid(@Param("examid")Integer examid,@Param("studentid")Integer studentid);
+
+    //批量生成学生pdf报告
+    void updateBatchReportstupath(@Param("list")List<EClassStudent> list);
 }

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

@@ -51,11 +51,11 @@ public class EBase extends BaseBean {
     //学校id
     private Integer schoolid;
 
-    private Integer reporttime;//生成报告时间（网页端）
+    //pdf报告状态0未生成1正在生成中2完成
+    private Integer reportstate;
 
-    private Integer reportneed;//是否需要生成报告（pdf）
-
-    private String reportpath;//报告地址
+    //学校报告地址
+    private String reportschool;
 
     @Transient
     //班级ids

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

@@ -24,4 +24,10 @@ public class EClass extends BaseBean {
 
     //班级名称
     private String classname;
+
+    //班级pdf报告地址
+    private String reportclass;
+
+    //班级学生报告地址
+    private String reportstu;
 }

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

@@ -23,6 +23,9 @@ public class EClassStudent extends BaseBean {
     //学生id
     private Integer studentid;
 
+    //学生pdf报告
+    private String reportstu;
+
     @Transient
     //学生姓名
     private String studentname;

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

@@ -67,7 +67,7 @@ public class EBaseService {
             //考试
             model.setExamstate(0);
             model.setDeleted(1);
-            model.setReportneed(0);
+            model.setReportstate(0);
             model.setCreatetime(N_Utils.getSecondTimestamp());
             eBaseMapper.insertUseGeneratedKeys(model);
             Integer examid = model.getId();
@@ -264,10 +264,9 @@ public class EBaseService {
         try {
             ePaperStudentMapper.updateStuscoreByExamId(eBase.getExamid());//更新未已提交未批阅完成学生得分
             eReportGenerateService.generateExamReport(eBase.getExamid(), eBase.getCreateid());
-            eBase.setReporttime(N_Utils.getSecondTimestamp());
-            eBase.setReportneed(1);
-            eBase.setExamstate(2);
-            eBaseMapper.updateExamStateAndReport(eBase);
+            eBaseMapper.updateExamState(eBase.getExamid(),2);
+//            eBaseMapper.updateExamStateAndReportState(eBase.getExamid(),2);
+            //结束考试时自动生成报告pdf，调用mq
         } catch (Exception e) {
             log.error("结束考试失败", e);
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -400,13 +399,23 @@ public class EBaseService {
         return eBaseMapper.getExamStateAnseredById(examid);
     }
 
-    //修改是否需要生成报告pdf
-    public void updateExamReport(Integer examid){
-        eBaseMapper.updateExamReport(examid,1);
+    //生成报告
+    public void generateExamReport(Integer examid,Integer createid) throws Exception{
+        eReportGenerateService.generateExamReport(examid, createid);
+        //生成网页报告后生成pdf报告,发送mq
+//        eBaseMapper.updateExamReportState(examid,1);
     }
 
-    //修改生成报告pdf地址
-    public void updateExamReportPath(Integer examid,String reportpath){
-        eBaseMapper.updateExamReportPath(examid,0,reportpath);
+    //修改生成的报告pdf地址
+    @Transactional(rollbackFor = Exception.class)
+    public void updateExamReportstate(Map map){
+        Integer converted = Integer.parseInt(map.get("converted").toString());
+        Integer examid = Integer.parseInt(map.get("examid").toString());
+        String reportschool = "";
+        if(converted == 2){
+            reportschool = map.get("reportschool").toString();
+            //更改班级报告、学生报告
+        }
+        eBaseMapper.updateExamReportSchoolState(examid,converted,reportschool);
     }
 }

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

@@ -40,17 +40,17 @@
     <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 id="updateExamStateAndReportState">
+        update e_base set examstate=#{examstate},reportstate=1 where examid=#{examid}
     </update>
-    <!--修改是否需要生成报告pdf-->
-    <update id="updateExamReport">
-        update e_base set reportneed=#{reportneed} where examid=#{examid}
+    <!--更改pdf报告生成状态-->
+    <update id="updateExamReportState">
+        update e_base set reportstate=#{reportstate} where examid=#{examid}
     </update>
-    <!--修改生成报告pdf地址-->
-    <update id="updateExamReportPath">
-        update e_base set reportpath=#{reportpath},reportneed=#{reportneed} where examid=#{examid}
+    <!--修改报告pdf后-->
+    <update id="updateExamReportSchoolState">
+        update e_base set reportstate=#{reportstate},reportschool=#{reportschool} where examid=#{examid}
     </update>
 
     <!--发布考试-->

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

@@ -105,4 +105,25 @@
         </if>
         order by c.gradeid,c.classtype,c.classorder,c.classid desc
     </select>
+
+    <!--批量更新班级pdf报告地址-->
+    <update id="updateBatchReportpath">
+        update e_class
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="reportclass = CASE " suffix="END,">
+                <foreach collection="list" index="index" item="item">
+                    when classid=#{item.classid} and examid=#{item.examid} then reportclass=#{item.reportclass}
+                </foreach>
+            </trim>
+            <trim prefix="reportstu = CASE " suffix="END,">
+                <foreach collection="list" index="index" item="item">
+                    when classid=#{item.classid} and examid=#{item.examid} then reportstu=#{item.reportstu}
+                </foreach>
+            </trim>
+        </trim>
+        where
+        <foreach collection="list" item="item" index="index" separator="or">
+            classid=#{item.classid} and examid=#{item.examid}
+        </foreach>
+    </update>
 </mapper>

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

@@ -52,4 +52,20 @@
     <select id="getClassidByStudentidAndExamid" resultType="java.lang.Integer">
         select classid from e_class_student where examid=#{examid} and studentid=#{studentid} limit 1
     </select>
+
+    <!--批量生成学生pdf报告-->
+    <update id="updateBatchReportstupath">
+        update e_class_student
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="reportstu = CASE " suffix="END,">
+                <foreach collection="list" index="index" item="item">
+                    when studentid=#{item.studentid} and examid=#{item.examid} then reportstu=#{item.reportstu}
+                </foreach>
+            </trim>
+        </trim>
+        where
+        <foreach collection="list" item="item" index="index" separator="or">
+            studentid=#{item.studentid} and examid=#{item.examid}
+        </foreach>
+    </update>
 </mapper>