添加学校问题，考试状态

sapi/src/main/java/com/xhkjedu/sapi/model/system/TUser.java

@@ -63,6 +63,9 @@ public class TUser extends BaseBean {
     //有效期
     private String usertime;
 
+    //考号
+    private String examno;
+
     //创建人id
     private Integer createid;
 

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -87,11 +87,11 @@ public class SchoolService {
             //添加角色模块
             roleModuleMapper.insertList(roleModules);
         } catch (DuplicateKeyException e) {
-            log.error("添加学校失败",e.getMessage());
+            log.error("添加学校失败:" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new Exception("该管理员账号已存在");
         } catch (Exception e) {
-            log.error("添加学校失败",e.getMessage());
+            log.error("添加学校失败:" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new Exception("添加学校失败");
         }

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

@@ -286,6 +286,7 @@ public class EBaseController {
         if (1 != vo.getExamstate()) return new ResultVo(0, "结束成功");
         try {
             eBaseService.updateExamStateEnd(eBase);
+            eReportGenerateService.generateExamReport(eBase.getExamid(), eBase.getCreateid());
             return new ResultVo(0, "结束成功");
         } catch (Exception e) {
             return new ResultVo(1, "结束失败");

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

@@ -33,7 +33,7 @@ public class EBase extends BaseBean {
     //是否启用监控0未启用1启用
     private Integer monitored;
 
-    //考试状态0未开始1已开始2已结束
+    //考试状态0未开始1已开始2已结束3已生成报告
     private Integer examstate;
 
     //考试公告

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

@@ -265,7 +265,6 @@ public class EBaseService {
     public void updateExamStateEnd(EBase eBase) throws Exception {
         try {
             ePaperStudentMapper.updateStuscoreByExamId(eBase.getExamid());//更新未已提交未批阅完成学生得分
-            eReportGenerateService.generateExamReport(eBase.getExamid(), eBase.getCreateid());
             eBaseMapper.updateExamState(eBase.getExamid(),2);
 //            eBaseMapper.updateExamStateAndReportState(eBase.getExamid(),2);
             //结束考试时自动生成报告pdf，调用mq

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

@@ -1,6 +1,7 @@
 package com.xhkjedu.sexam.service.report;
 
 import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sexam.mapper.exam.EBaseMapper;
 import com.xhkjedu.sexam.mapper.exam.EClassMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperAnalyzeMapper;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
@@ -56,7 +57,8 @@ public class EReportGenerateService {
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
     @Resource
     private EPaperAnalyzeMapper ePaperAnalyzeMapper;
-
+    @Resource
+    private EBaseMapper eBaseMapper;
     @Resource
     private ERbaseMapper eRbaseMapper;
     @Resource
@@ -280,6 +282,7 @@ public class EReportGenerateService {
         }
         setClassGradeRankAll(examid, stunum, papers, classSubjectStudents, createid, userMap);//班级等级分布
         setAction(examid, userMap);//行为分析
+        eBaseMapper.updateExamState(examid,3);
     }
 
     //科目统计