线下试卷完善

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

@@ -1239,6 +1239,8 @@ public class MsPaperQtypeService {
             } else {
                 que.setQtype(2);
             }
+            if(que.getScoreset() == null) que.setScoreset(0);
+            if(que.getLoseoption() == null) que.setLoseoption(0.0);
         }
         msPaperQtypeQuestionMapper.insertList(qtypeQuestions);
 
@@ -1303,9 +1305,9 @@ public class MsPaperQtypeService {
         // 保存题型
         msPaperQtypeMapper.updateByPrimaryKeySelective(paperQtype);
         // 删除题型下原有试题
-        msPaperQtypeQuestionMapper.deleteByMptid(paperQtype.getId());
+        msPaperQtypeQuestionMapper.deleteByMptid(paperQtype.getMptid());
 
-        Integer mptid = paperQtype.getId();
+        Integer mptid = paperQtype.getMptid();
         List<MsPaperQtypeQuestion> qtypeQuestions = paperQtype.getQuestions();
         for (MsPaperQtypeQuestion que : qtypeQuestions) {
             que.setMptid(mptid);
@@ -1316,6 +1318,8 @@ public class MsPaperQtypeService {
             } else {
                 que.setQtype(2);
             }
+            if(que.getScoreset() == null) que.setScoreset(0);
+            if(que.getLoseoption() == null) que.setLoseoption(0.0);
         }
         msPaperQtypeQuestionMapper.insertList(qtypeQuestions);
 
@@ -1445,10 +1449,13 @@ public class MsPaperQtypeService {
             movevalue = 1;// 在原来基础上加一
             bmovevalue = -1;
         }
-        params.setMovevalue(1);
+        params.setMovevalue(movevalue);
         moveQtype.setMptorder(movevalue);
         // 被交换位置的试题
         MsPaperQtype qtype = msPaperQtypeMapper.getQtypeForMoverOrder(params);
+        if(qtype == null){
+            throw new RuntimeException("请检查移动是否合理");
+        }
         qtype.setMptorder(bmovevalue);
 
         List<MsPaperQtype> changeQuestions = new ArrayList<>();
@@ -1559,10 +1566,13 @@ public class MsPaperQtypeService {
             movevalue = 1;// 在原来基础上加一
             bmovevalue = -1;
         }
-        params.setMovevalue(1);
+        params.setMovevalue(movevalue);
         moveQuestion.setQorder(movevalue);
         // 被交换位置的试题
         MsPaperQtypeQuestion question = msPaperQtypeQuestionMapper.getQuestionForMoverOrder(params);
+        if(question == null){
+            throw new RuntimeException("请检查移动是否合理");
+        }
         question.setQorder(bmovevalue);
 
         List<MsPaperQtypeQuestion> changeQuestions = new ArrayList<>();

smarking/src/main/resources/application.properties

@@ -3,8 +3,8 @@ server.port=8090
 spring.application.name=smarking
 #\u6CE8\u518C\u5230\u6211\u4EEC\u672C\u5730\u7684eureka\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u7AEF\u53E38081
 eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@127.0.0.1:8081/eureka/
-eureka.client.register-with-eureka=false
-eureka.client.fetch-registry=false
+eureka.client.register-with-eureka=true
+eureka.client.fetch-registry=true
 #\u8BBE\u7F6Eeureka\u8F93\u51FA\u65E5\u5FD7\u7EA7\u522B
 logging.level.com.netflix=error
 

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

@@ -38,7 +38,7 @@
     <!--删除试卷对应模板、题块、批阅设置-->
     <delete id="deleteTemplageBlockByMpid">
         delete from ms_template where mpid=#{mpid};
-        delete from ms_paper_block where mpid=#{mpid};
+        delete from ms_paper_block where mpid=#{mpid}
     </delete>
 
     <!--获取考试试卷题量和分值-->

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

@@ -170,13 +170,13 @@
     <!--修改题型分，修改试卷分-->
     <update id="updateQtypeScore">
         update ms_paper_qtype set mptscore =
-            (select sum(qscore) from ms_paper_qtype_question where mptid = #{mptid}) where mptid = #{mptid},
+            (select sum(qscore) from ms_paper_qtype_question where mptid = #{mptid}) where mptid = #{mptid};
         update ms_paper set pscore = (select sum(qscore) from ms_paper_qtype_question where mpid = #{mpid}) where mpid = #{mpid}
     </update>
     <!--修改题型分和试题数量，修改试卷分和试题数量-->
     <update id="updateQtypeScoreAndNum">
         update ms_paper_qtype set mptnum=mptnum-1, mptscore =
-        (select sum(qscore) from ms_paper_qtype_question where mptid = #{mptid}) where mptid = #{mptid},
+        (select sum(qscore) from ms_paper_qtype_question where mptid = #{mptid}) where mptid = #{mptid};
         update ms_paper set pnum=pnum-1, pscore = (select sum(qscore) from ms_paper_qtype_question where mpid = #{mpid}) where mpid = #{mpid}
     </update>
 
@@ -210,13 +210,13 @@
     </select>
     <!--批量修改题型排序-线下-->
     <update id="updateBatchQtypeOrder">
-        <foreach collection="list" item="q" separator=",">
+        <foreach collection="list" item="t" separator=";">
             update ms_paper_qtype set mptorder=#{t.mptorder} where mptid=#{t.mptid}
         </foreach>
     </update>
     <!--批量修改题型排序-移动-线下-->
     <update id="updateBatchMoveQtypeOrder">
-        <foreach collection="list" item="q" separator=",">
+        <foreach collection="list" item="t" separator=";">
             update ms_paper_qtype set mptorder=mptorder + (#{t.mptorder}) where mptid=#{t.mptid}
         </foreach>
     </update>

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

@@ -81,20 +81,20 @@
 
     <!--批量修改试题信息-线下-->
     <update id="updateBatchQuestionInfo">
-        <foreach collection="list" item="q" separator=",">
+        <foreach collection="list" item="q" separator=";">
             update ms_paper_qtype_question set ctype=#{q.ctype},qtypename=#{q.qtypename},qn=#{q.qn},qscore=#{q.qscore},qorder=#{q.qorder}
             ,optionnum=#{q.optionnum},loseoption=#{q.loseoption},scoreset=#{q.scoreset} where mptqid=#{q.mptqid}
         </foreach>
     </update>
     <!--批量修改试题排序-线下-->
     <update id="updateBatchQuestionOrder">
-        <foreach collection="list" item="q" separator=",">
+        <foreach collection="list" item="q" separator=";">
             update ms_paper_qtype_question set qorder=#{q.qorder} where mptqid=#{q.mptqid}
         </foreach>
     </update>
     <!--批量修改试题排序-移动-线下-->
     <update id="updateBatchMoveQuestionOrder">
-        <foreach collection="list" item="q" separator=",">
+        <foreach collection="list" item="q" separator=";">
             update ms_paper_qtype_question set qorder=qorder + (#{q.qorder}) where mptqid=#{q.mptqid}
         </foreach>
     </update>
@@ -126,7 +126,7 @@
 
     <!--批量设置试题切割坐标-->
     <update id="updateBatchQuestionCoor">
-        <foreach collection="list" item="q" separator=",">
+        <foreach collection="list" item="q" separator=";">
             update ms_paper_qtype_question set pagenum=#{q.pagenum},stemcoor=#{q.stemcoor},quecoor=#{q.quecoor} where mptqid=#{q.mptqid}
         </foreach>
     </update>