试卷模板完善

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

@@ -37,6 +37,8 @@ public interface MsSubjectMapper extends TkMapper<MsSubject> {
     int updatePtstateByMpid(@Param("mpid")Integer mpid,@Param("ptstate")Integer ptstate);
     //更改科目试卷题块设置状
     int updatePbstateByMpid(@Param("mpid")Integer mpid,@Param("pbstate")Integer pbstate);
+    //重置试卷模板和题块状态
+    int updateTempAndBlockStateByMpid(@Param("mpid")Integer mpid);
 
     //获取考试下所有科目名称
     List<Map<String,String>> listSubjectNameByExamId(@Param("examid") Integer examid);

smarking/src/main/java/com/xhkjedu/smarking/mapper/paper/MsTemplateMapper.java

@@ -26,6 +26,8 @@ public interface MsTemplateMapper extends TkMapper<MsTemplate> {
 
     //修改模板题块框选状态
     int updateTemplateTbstate(@Param("mtid")Integer mtid, @Param("tbstate")Integer tbstate);
+    //恢复模板状态
+    int updateTemplateAllState(@Param("mtid")Integer mtid);
 
     //获取试卷未框选主观题模板数量
     int getUnSelTemplateCount(@Param("mpid")Integer mpid);

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

@@ -49,6 +49,8 @@ public class MsTemplate extends BaseBean {
     private String misscoor;
     //违规标记坐标
     private String violatecoor;
+    //考号类型1涂卡 2条形码 3手写1 4手写2
+    private Integer enumtype;
     //考号定位坐标
     private String examnocoor;
     //涂卡数字坐标列表

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

@@ -123,8 +123,14 @@ public class MsTemplateService {
 
         //根据模板ID获取模板信息
         MsTemplate oldTemplate = msTemplateMapper.selectByPrimaryKey(msTemplate.getMtid());
-        if(!msTemplate.getCurrstep().equals(oldTemplate.getCurrstep())) throw new ServiceException("请按顺序操作");
 
+        if(msTemplate.getCurrstep() < 6 && oldTemplate.getTstate() == 1){
+            msTemplateMapper.updateTemplateAllState(msTemplate.getMtid());
+            //当模板当前步骤不是6选择答题区7选择违纪区时，需要清空所有题块和模板框选
+            msTemplateBlockMapper.deleteByMtidAndMtype(msTemplate.getMtid(),null);
+            msPaperBlockMapper.deleteObjByMpidAndBlocktype(oldTemplate.getMpid(),null);
+            msSubjectMapper.updateTempAndBlockStateByMpid(oldTemplate.getMpid());
+        }
         //定位区选择
         if(msTemplate.getCurrstep() == 3){
             SchoolCloudVo school = schoolMapper.getSchoolCloudcode(msTemplate.getMpid());
@@ -168,9 +174,9 @@ public class MsTemplateService {
         Integer timestamp = N_Utils.getSecondTimestamp();
         Integer createid = msTemplate.getCreateid();
 
-        //保存之前先清除已保存的信息试卷客观题题块、模板题块
-        msTemplateBlockMapper.deleteByMtidAndMtype(msTemplate.getMtid(),1);
-        msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,1);
+        // //保存之前先清除已保存的信息试卷客观题题块、模板题块
+        // msTemplateBlockMapper.deleteByMtidAndMtype(msTemplate.getMtid(),1);
+        // msPaperBlockMapper.deleteObjByMpidAndBlocktype(mpid,1);
         //获取试卷中所有试题信息
         List<MsPaperQtypeQuestion> questions = msPaperQtypeQuestionMapper.listQuestionsByMpid(mpid);
         List<MsPaperQtypeQuestion> objQuestions = questions.stream().filter(q -> q.getQtype() == 1).collect(Collectors.toList());//客观题试题信息

smarking/src/main/java/com/xhkjedu/smarking/service/scan/MsScanbatchPaperService.java

@@ -29,7 +29,6 @@ import com.xhkjedu.smarking.vo.stupaper.PaperStudentWebVo;
 import com.xhkjedu.smarking.vo.system.SchoolCloudVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
-import org.opencv.core.Core;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -72,9 +71,9 @@ public class MsScanbatchPaperService {
     @Resource
     private MsExamMapper msExamMapper;
 
-    static {
-        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
-    }
+    // static {
+    //     System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+    // }
 
     /*
      * @Description 扫描记录-查看原卷

smarking/src/main/java/com/xhkjedu/smarking/service/stupaper/MsPaperStudentScoreService.java

@@ -174,7 +174,7 @@ public class MsPaperStudentScoreService {
         }
         //获取考试的所有科目
         List<ESubjectVo> subjects = msPaperStudentScoreMapper.listSubjectsByExamid(mpstuScore.getExamid());
-        Map<String,ESubjectVo> subjectMap = subjects.stream().collect(HashMap::new, (m,v)->m.put(v.getSubjectid(),v), HashMap::putAll);
+        Map<String,ESubjectVo> subjectMap = subjects.stream().collect(HashMap::new, (m,v)->m.put(v.getSubjectname(),v), HashMap::putAll);
         //考试班级
         List<MsClass> classes = msPaperStudentScoreMapper.listClassesByExamid(mpstuScore.getExamid());
         List<String> classNames = classes.stream().map(MsClass::getClassname).collect(ArrayList::new, ArrayList::add, ArrayList::addAll);

smarking/src/main/java/com/xhkjedu/smarking/utils/ImportUtil.java

@@ -152,7 +152,7 @@ public class ImportUtil {
             }
 
         } catch (Exception e) {
-            log.error("读取Excel文件失败", e.getMessage());
+            log.error("读取Excel文件失败 ：" + e.getMessage());
             throw new Exception("读取Excel文件失败");
         }
         return rtnList;

smarking/src/main/java/com/xhkjedu/smarking/vo/scan/TemplateBlockQuestionVo.java

@@ -13,6 +13,10 @@ public class TemplateBlockQuestionVo {
     private Integer mtbqid;
     //题号
     private String qn;
+
+    //处理题型1单选题2多选题3主观题4判断对错5判断√×6判断TF7完形填空8阅读理解10任务型阅读11复合题
+    // 12听力题13填空题14作文(语文）15作文（英语）16完形填空、阅读理解 17任务型阅读（符合）
+    private Integer ctype;
     //试卷试题ID
     private Integer mptqid;
     //定位坐标

smarking/src/main/java/com/xhkjedu/smarking/vo/scan/TemplateVo.java

@@ -43,6 +43,8 @@ public class TemplateVo {
     private String misscoor;
     //违规标记坐标
     private String violatecoor;
+    //考号类型1涂卡 2条形码 3手写1 4手写2
+    private Integer enumtype;
     //考号定位坐标
     private String examnocoor;
     //涂卡数字坐标列表

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

@@ -85,6 +85,11 @@
     <update id="updatePbstateByMpid">
         update ms_subject s,ms_paper p set s.pbstate=#{pbstate} where s.msid=p.msid and p.mpid=#{mpid}
     </update>
+    <!--重置试卷模板和题块状态-->
+    <update id="updateTempAndBlockStateByMpid">
+        update ms_subject s,ms_paper p set s.ptstate=0 s.pbstate=0 where s.msid=p.msid and p.mpid=#{mpid}
+    </update>
+
     <!--更改考试科目监考设置状态-->
     <update id="updateInvigilateStateByMsId">
         update ms_subject set invigilatestate=#{invigilatestate} where msid=#{msid}

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

@@ -44,6 +44,10 @@
     <update id="updateTemplateTbstate">
         update ms_template set tbstate=#{tbstate} where mtid=#{mtid}
     </update>
+    <!--恢复模板状态-->
+    <update id="updateTemplateAllState">
+        update ms_template set tstate=0, tbstate=0 where mtid=#{mtid}
+    </update>
 
     <!--获取试卷未框选主观题模板数量-->
     <select id="getUnSelTemplateCount" resultType="java.lang.Integer">
@@ -68,6 +72,7 @@
         <result property="dwtback" column="dwtback"/>
         <result property="misscoor" column="misscoor"/>
         <result property="violatecoor" column="violatecoor"/>
+        <result property="enumtype" column="enumtype"/>
         <result property="examnocoor" column="examnocoor"/>
         <result property="cardcoor" column="cardcoor"/>
         <collection property="tblocks" ofType="com.xhkjedu.smarking.vo.scan.TemplateBlockVo" javaType="java.util.ArrayList">
@@ -82,6 +87,7 @@
                 <result property="mtbqid" column="mtbqid"/>
                 <result property="qn" column="qn"/>
                 <result property="mptqid" column="mptqid"/>
+                <result property="ctype" column="ctype"></result>
                 <result property="qlocalcoor" column="qlocalcoor"/>
                 <result property="mtbqorder" column="mtbqorder"/>
             </collection>
@@ -89,12 +95,13 @@
     </resultMap>
     <select id="listTemplateBlockQueByMpid" resultMap="paperTemplate">
         select t.mtid,t.mpid,t.tsize,t.twidth,t.theight,t.tfront,t.tback,t.blankindex,t.anglefront,t.angleback,t.coorfront,t.coorback,
-        t.dwtfront,t.dwtback,t.misscoor,t.violatecoor,t.examnocoor,t.cardcoor
+        t.dwtfront,t.dwtback,t.misscoor,t.violatecoor,t.enumtype,t.examnocoor,t.cardcoor
         ,tb.mtbid,tb.mblockid,tb.mttype,tb.mtborder,tb.localcoor,tb.extendcoor,tb.scorecoor
-        ,q.mtbqid,q.qn,q.mptqid,q.qlocalcoor,q.mtbqorder
+        ,q.mtbqid,q.qn,q.mptqid,q.qlocalcoor,q.mtbqorder,tq.ctype
         from ms_template t left join ms_template_block tb on t.mtid=tb.mtid
         left join ms_template_block_question q on tb.mtbid=q.mtbid
-        where t.mpid=#{mpid} order by t.mtid,tb.mtborder,q.mtbqorder
+        left join ms_paper_qtype_question tq on q.mptqid=tq.mptqid
+        where t.mpid=#{mpid} order by t.mtid,tb.mttype,tb.mtborder,q.mtbqorder
     </select>
 
     <!--获取模版详情和考试id-->

smarking/src/main/resources/mapper/stupaper/MsPaperStudentMapper.xml

@@ -270,12 +270,12 @@
 
     <!--补录成绩-补录单科-->
     <update id="updateStuScoreForFillScore">
-        update ms_paper_student set stuscore=#{psc.fillscore},stuscoretype=2 where mpsid=#{psc.mpsid} and stuscoretype=0
+        update ms_paper_student set stuscore=#{psc.fillscore},stuscoretype=2 where mpsid=#{psc.mpsid} and stuscoretype!=1
     </update>
     <!--补录成绩-补录多科-->
     <update id="updateBatchStuScoreForFillScore">
         <foreach collection="list" item="p" separator=";">
-            update ms_paper_student set stuscore=#{p.fillscore},stuscoretype=2 where mpsid=#{p.mpsid} and stuscoretype=0
+            update ms_paper_student set stuscore=#{p.fillscore},stuscoretype=2 where mpsid=#{p.mpsid} and stuscoretype!=1
         </foreach>
     </update>
     <!--补录成绩-清空学生补录分数-->