完善编辑试卷时科目状态以及删除垃圾数据

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsSubjectMapper.java

@@ -48,6 +48,8 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
 
     //更改考试科目阅卷设置状态
     void updateCheckSetByMsId(@Param("msid") Integer msid, @Param("checkset") Integer checkset,@Param("correcttype") Integer correcttype);
+    //更改阅卷设置状态
+    void updateCheckSetByMpId(@Param("mpid") Integer mpid, @Param("checkset") Integer checkset);
 
     //试监控-考试基本信息
     Map<String,Object> getExamSubjectByMsid(@Param("msid") Integer msid);
@@ -63,4 +65,7 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
 
     //获取考试科目信息
     List<Map<String,Object>> listByExamId(@Param("examid") Integer examid);
+
+    //修改试卷结构后更改后续操作状态
+    int updatePaperFollowup(@Param("mpid")Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/papercheck/MsPaperCheckTeacherMapper.java

@@ -31,4 +31,7 @@ public interface MsPaperCheckTeacherMapper extends TkMapper<MsPaperCheckTeacher>
 
     //题块阅卷教师列表（复制用）
     List<MsPaperCheckTeacher> listCheckTeacher2(@Param("mpid") Integer mpid,@Param("mblockid") Integer mblockid);
+
+    //根据试卷ID删除阅卷教师
+    int deleteByMpid(@Param("mpid") Integer mpid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsPaperQtype.java

@@ -21,6 +21,8 @@ public class MsPaperQtype extends BaseBean {
     private Integer mptid;
     //试卷id
     private Integer mpid;
+    //处理题型
+    private Integer ctype;
     //题型名称
     private String mptname;
     //题型下试题数量

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperQtypeService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.xhkjedu.exception.MissingParametersException;
 import com.xhkjedu.smarking.mapper.exam.MsSubjectMapper;
 import com.xhkjedu.smarking.mapper.paper.*;
+import com.xhkjedu.smarking.mapper.papercheck.MsPaperCheckTeacherMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentQuestionMapper;
 import com.xhkjedu.smarking.mapper.system.SchoolMapper;
@@ -54,6 +55,12 @@ public class MsPaperQtypeService {
     private MsPaperStudentQuestionMapper msPaperStudentQuestionMapper;
     @Resource
     private MsPaperStudentMapper msPaperStudentMapper;
+    @Resource
+    private MsPaperCheckTeacherMapper msPaperCheckTeacherMapper;
+    @Resource
+    private MsPaperBlockMapper msPaperBlockMapper;
+    @Resource
+    private MsTemplateMapper msTemplateMapper;
     private final ConvertUtil convertUtil;
 
     public MsPaperQtypeService(ConvertUtil convertUtil) {
@@ -75,16 +82,18 @@ public class MsPaperQtypeService {
         PExamSubjectVo exam = msPaperMapper.getExamSubjectForPaper(mpid);
         //线下考试，发布成绩（生成报告）之前可以修改试卷结构
         if(exam.getExammode() < 3 && exam.getExamstate() > 2){
-            throw new MissingParametersException("考试已结束禁止操作");
+            throw new MissingParametersException("考试统分禁止操作");
         }
 
-        if(exam.getExammode() == 3 && exam.getExamstate() > 0){
-            throw new MissingParametersException("考试已开始禁止操作");
+        if(exam.getExammode() == 3 && exam.getPstate() == 2){
+            throw new MissingParametersException("试卷已提交禁止操作");
         }
 
          //先删除原有题型、分析
         msPaperQtypeMapper.deleteByMpId(mpid);
         msPaperAnalyzeMapper.deleteByMpId(mpid);
+
+
         //根据考试类型（线上和线下），是否删除文件
         if(paper.getPtype() == 2){
             msPaperFileMapper.deleteByMpid(mpid);
@@ -117,10 +126,14 @@ public class MsPaperQtypeService {
             userBasketMapper.deleteByUseridAndSubjectid(paper.getCreateid(),exam.getSubjectid());
         }
 
+        msPaperCheckTeacherMapper.deleteByMpid(mpid);//删除批阅教师
         if(exam.getExammode() < 3){
-            //如果是线下考试更改了试卷结构，则清空后续所有操作
+            //如果是线下考试更改了试卷结构，则清空题块、试卷模板
             msPaperMapper.deleteTemplageBlockByMpid(mpid);
             msPaperStudentMapper.deletePaperStuByMpid(mpid);
+            msSubjectMapper.updatePaperFollowup(mpid);
+        }else{
+            msSubjectMapper.updateCheckSetByMpId(mpid,0);
         }
 
         if(N_Utils.isListNotEmpty(imgs) && imgs.size()>1){
@@ -195,7 +208,7 @@ public class MsPaperQtypeService {
     }
 
     //保存试卷分析--题库
-    public void savePaperAnalyzeForQuestion(MsPaper paper){
+    private void savePaperAnalyzeForQuestion(MsPaper paper){
         Integer mpid = paper.getMpid();
         //保存之前先清除之前的试卷分析
         msPaperAnalyzeMapper.deleteByMpId(paper.getMpid());
@@ -1150,6 +1163,7 @@ public class MsPaperQtypeService {
                 questionMap.put("loseoption",questionVo.getLoseoption());
                 questionMap.put("scoreset",questionVo.getScoreset());
                 questionMap.put("complexity",questionVo.getComplexity());
+                questionMap.put("optionnum",questionVo.getOptionnum());
                 questionMap.put("points",questionVo.getPoints());
                 questionsList.add(questionMap);
             }
@@ -1160,6 +1174,7 @@ public class MsPaperQtypeService {
             typeMap.put("mptorder",qtypeVo.getMptorder());
             typeMap.put("mptnum",qtypeVo.getMptnum());
             typeMap.put("mptscore",qtypeVo.getMptscore());
+            typeMap.put("ctype",qtypeVo.getCtype());
             typeMap.put("questions",questionsList);
             qtypes.add(typeMap);
         }

smarking/src/main/java/com/xhkjedu/smarking/vo/paper/MsPaperQtypeVo.java

@@ -16,6 +16,8 @@ public class MsPaperQtypeVo {
     //考试试卷题型表
     private Integer mptid;
 
+    private Integer ctype;
+
     //题型名称
     private String mptname;
 

smarking/src/main/java/com/xhkjedu/smarking/vo/paper/PExamSubjectVo.java

@@ -26,4 +26,6 @@ public class PExamSubjectVo {
     //单科状态0未开始1进行中2已结束
     private Integer msstate;
 
+    private Integer pstate;//试卷设置状态0未开始1设置中2已完成3退回
+
 }

smarking/src/main/resources/mapper/exam/MsSubjectMapper.xml

@@ -12,8 +12,8 @@
     <!--考试进度总览-->
     <select id="examOverview" resultType="java.util.Map">
         select s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,s.pstate,s.ptstate,
-        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,s.teacherid,
-        u.username as teachername,p.mpid,p.hasfile,e.exammode,s.leaderid,u2.username as leadername
+        s.pbstate,s.checkset,s.checkstate,s.invigilatestate,p.answered,p.ptype,s.teacherid,
+        u.username as teachername,p.mpid,p.hasfile,e.exammode,e.examstate,s.leaderid,u2.username as leadername
         ,if(ps.batchid is not null,ps.mpsid,null) scannum,count(ps.mpsid) stunum
         from ms_subject s left join t_user u on s.teacherid=u.userid
         left join t_user u2 on s.leaderid=u2.userid
@@ -94,6 +94,11 @@
         set s.checkset=#{checkset},p.correcttype=#{correcttype}
         where s.msid=#{msid}
     </update>
+    <!--更改阅卷设置状态-->
+    <update id="updateCheckSetByMpId">
+        update ms_subject s inner join ms_paper p on s.msid=p.msid
+            set s.checkset=#{checkset} where p.mpid=#{mpid}
+    </update>
 
     <!--考试监控-考试基本信息-->
     <select id="getExamSubjectByMsid" resultType="java.util.Map">
@@ -142,5 +147,10 @@
         where ms.msstate=1 and ms.msid in
         <foreach collection="msids" item="msid" separator="," open="(" close=")">#{msid}</foreach>
     </update>
+    <!--修改试卷结构后更改后续操作状态-->
+    <update id="updatePaperFollowup">
+        update ms_subject s inner join ms_paper p on s.msid=p.msid
+            set s.ptstate=0,s.pbstate=0,s.checkset=0 where p.mpid=#{mpid}
+    </update>
 
 </mapper>

smarking/src/main/resources/mapper/paper/MsPaperMapper.xml

@@ -16,7 +16,7 @@
 
     <!--获取试卷详细信息-->
     <select id="getPaperInfoByMsid" resultType="java.util.Map">
-        select s.examid,s.msid,s.subjectname,s.sdate,s.begintime,s.endtime,e.gradeid,e.examtype,p.mpid,
+        select s.examid,s.msid,s.subjectid,s.subjectname,s.sdate,s.begintime,s.endtime,e.gradeid,e.examtype,p.mpid,
         p.ptype,p.pnum,p.pscore,u.username as teachername,u.username as handlename
         from ms_subject s left join ms_paper p on s.msid=p.msid
         left join ms_exam e on s.examid=e.examid
@@ -28,7 +28,7 @@
 
     <!--获取考试科目对应考试状态信息-->
     <select id="getExamSubjectForPaper" resultType="com.xhkjedu.smarking.vo.paper.PExamSubjectVo">
-        select s.subjectid,e.exammode,e.examstate
+        select s.subjectid,s.pstate,e.exammode,e.examstate
         from ms_subject s left join ms_exam e on s.examid=e.examid
         left join ms_paper p on s.msid = p.msid
         where p.mpid=#{mpid}
@@ -38,7 +38,6 @@
     <delete id="deleteTemplageBlockByMpid">
         delete from ms_template where mpid=#{mpid};
         delete from ms_paper_block where mpid=#{mpid};
-        delete from ms_paper_check where mpid=#{mpid};
     </delete>
 
     <!--获取考试试卷题量和分值-->

smarking/src/main/resources/mapper/paper/MsPaperQtypeMapper.xml

@@ -91,6 +91,7 @@
         <result column="mptnum" property="mptnum"></result>
         <result column="mptorder" property="mptorder"></result>
         <result column="mptscore" property="mptscore"></result>
+        <result column="mptctype" property="ctype"></result>
         <collection property="questions" ofType="com.xhkjedu.smarking.vo.paper.MsPaperQtypeQuestionVo" javaType="java.util.List">
             <result column="mptqid" property="mptqid"></result>
             <result column="mptid" property="mptid"></result>
@@ -113,8 +114,8 @@
         </collection>
     </resultMap>
     <select id="listPaperQtypeQuesitonsForFj" resultMap="fjtypeQuestions">
-        select  t.mptid,t.mpid,t.mptname,t.mptnum,t.mptorder,t.mptscore,q.mptqid,q.qtypeid,q.qtypename,
-                q.ctype,q.qscore,q.qn,q.qorder,q.qanswer,q.optionnum,q.complexity,q.loseoption,q.scoreset
+        select  t.mptid,t.mpid,t.ctype as mptctype,t.mptname,t.mptnum,t.mptorder,t.mptscore,q.mptqid,q.qtypeid,q.qtypename,
+                q.ctype,q.qscore,q.qn,q.qorder,q.optionnum,q.qanswer,q.optionnum,q.complexity,q.loseoption,q.scoreset
         from ms_paper_qtype_question q left join ms_paper_qtype t on t.mptid=q.mptid
         where t.mpid=#{mpid} order by t.mptorder,q.qorder
     </select>

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherMapper.xml

@@ -41,4 +41,9 @@
     <select id="listCheckTeacher2" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheckTeacher">
         select * from ms_paper_check_teacher where mpid = #{mpid} and mblockid = #{mblockid}
     </select>
+
+    <!--根据试卷ID删除阅卷教师-->
+    <delete id="deleteByMpid">
+        delete from ms_paper_check_teacher where mpid = #{mpid}
+    </delete>
 </mapper>