考试添加年份

sapi/src/main/resources/mapper/region/RRoomAnalyzeMapper.xml

@@ -24,13 +24,8 @@
         left join t_classroom_paper p on p.paperid=rt.paperid
         left join t_classroom_paper_student ps on p.paperid=ps.paperid
         left join t_classroom_paper_student_scantron pss on ps.psid=pss.psid
-        where s.schoollevel=#{param.level} and s.schoolstate=1 and r.roomstate=2 and r.endtime is not null
-        <if test="param.year!=null and param.year!=0">
-            and s.year=#{param.year}
-        </if>
-        <if test="param.year==null || param.year==0">
-            and c.year=s.year
-        </if>
+        where s.schoollevel=#{param.level} and s.schoolstate=1 and r.roomstate=2
+        and r.year=#{param.year} and r.endtime is not null
         <if test="param.begintime!=null and param.begintime!=0">
             and r.createtime between #{param.begintime} and #{param.endtime}
         </if>

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

@@ -210,7 +210,7 @@ public class EBaseController {
         if (exam.getExamstate() != 0) return new ResultVo(0, "发布成功");
 
         List<UserVo> students = eBaseService.listStuByExamId(examid);//获取考生
-        Integer code = eBaseService.updateExamStateStart(examid, examcomm, students, exam.getExammode());//发布考试
+        Integer code = eBaseService.updateExamStateStart(examid, examcomm, students, exam.getExammode(),schoolid);//发布考试
         if (code == 1) return new ResultVo(1, "发布考试失败");
 
         if (notice == 2 && msg == 2) return new ResultVo(0, "发布成功");

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

@@ -38,7 +38,7 @@ public interface EBaseMapper extends TkMapper<EBase> {
     String getNameByExamId(@Param("examid") Integer examid);
 
     //发布考试
-    void postExam(@Param("examid") Integer examid, @Param("examcomm") String examcomm);
+    void postExam(@Param("examid") Integer examid, @Param("examcomm") String examcomm,@Param("year") Integer year);
 
     //根据考试id获取考试状态信息
     EBaseVo getExamStateById(@Param("examid") Integer examid);
@@ -72,4 +72,7 @@ public interface EBaseMapper extends TkMapper<EBase> {
 
     //清空考试报告
     void clearExamPdf(@Param("examid") Integer examid);
+
+    //获取学校当前年份
+    Integer getYearBySchoolid(@Param("schoolid") Integer schoolid);
 }

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

@@ -63,6 +63,9 @@ public class EBase extends BaseBean {
     //学校报告地址
     private String reportschool;
 
+    //发布学年
+    private Integer year;
+
     @Transient
     //班级ids
     private List<Integer> classids;

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

@@ -221,7 +221,7 @@ public class EBaseService {
     }
 
     //发布考试
-    public Integer updateExamStateStart(Integer examid, String examcomm, List<UserVo> students,Integer exammode) {
+    public Integer updateExamStateStart(Integer examid, String examcomm, List<UserVo> students,Integer exammode,Integer schoolid) {
         try {
             //发布考试，获取考试试卷题量和分值
             List<EPaper> papers = ePaperMapper.listNumAndScoreByExamId(examid);
@@ -240,8 +240,10 @@ public class EBaseService {
                     }
                 }).start();
             }
+
+            int year=eBaseMapper.getYearBySchoolid(schoolid);
             //更改考试状态
-            eBaseMapper.postExam(examid, examcomm);
+            eBaseMapper.postExam(examid, examcomm,year);
         } catch (Exception e) {
             log.error("发布考试失败："+e.getMessage());
             return 1;

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

@@ -57,7 +57,7 @@
 
     <!--发布考试-->
     <update id="postExam">
-        update e_base set examcomm=#{examcomm},examstate=1 where examid=#{examid}
+        update e_base set examcomm=#{examcomm},examstate=1,`year`=#{year} where examid=#{examid}
     </update>
     <!--考试基本信息-->
     <select id="findById" resultType="java.util.Map">
@@ -145,4 +145,9 @@
         SET b.reportstate=1,b.reportschool=NULL,c.reportclass=NULL,c.reportstu=NULL,s.reportstu=NULL,ecs.reporturl=NULL
         WHERE b.examid=#{examid}
     </update>
+
+    <!--获取学校当前年份-->
+    <select id="getYearBySchoolid" resultType="java.lang.Integer">
+        select `year` from t_school where schoolid=#{schoolid}
+    </select>
 </mapper>