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

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

@@ -178,6 +178,7 @@ public class EBaseController {
         String examname = exam.getExamname();
         Integer schoolid = exam.getSchoolid();
         if (exam.getWwcnum() != 0) return new ResultVo(1, "还有考试试卷未设置完成");
+        if (exam.getAnswered() == 0) return new ResultVo(1, "还有考试试卷未设置正确答案");
         if (exam.getExamstate() != 0) return new ResultVo(0, "发布成功");
 
         List<UserVo> students = eBaseService.listStuByExamId(examid);//获取考生

sexam/src/main/java/com/xhkjedu/sexam/vo/exam/EBaseVo.java

@@ -34,6 +34,9 @@ public class EBaseVo {
     //试卷未设置完成数量
     private Integer wwcnum;
 
+    //是否设置正确答案0未设置1已设置
+    private Integer answered;
+
     //考试开始时间
     private Integer begintime;
 }

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

@@ -62,9 +62,10 @@
     <!--根据考试id获取考试状态-->
     <select id="getExamStateById" resultType="com.xhkjedu.sexam.vo.exam.EBaseVo">
         select eb.examid,eb.examname,eb.gradeid,eb.examstate,eb.schoolid
-        ,count(case when es.esstate!=1 then es.esid else null end)wwcnum
+        ,count(case when es.esstate!=1 then es.esid else null end)wwcnum,min(ep.answered)answered
         ,min(ifnull(UNIX_TIMESTAMP(concat(es.sdate,' ',es.begintime)),0))begintime
         from e_base eb left join e_subject es on eb.examid = es.examid
+        left join e_paper ep on es.esid = ep.esid
         where eb.examid=#{examid}
     </select>
     <!--考试设置状态-->