完善主观题款选完成生成学生试卷

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentBlockMapper.java

@@ -30,4 +30,6 @@ public interface MsPaperStudentBlockMapper extends TkMapper<MsPaperStudentBlock>
 
     //清空教师未阅卷任务
     void updateByMpsbidsAndTeacherid(@Param("mpsbids") String mpsbids,@Param("teacherid") Integer teacherid);
+    //批量保存学生题块
+    void insertBatchStudentBlock(@Param("list") List<MsPaperStudentBlock> list);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/stupaper/MsPaperStudentQuestionMapper.java

@@ -62,6 +62,6 @@ public interface MsPaperStudentQuestionMapper extends TkMapper<MsPaperStudentQue
 
     //定时任务-获取学生答案待合并试题
     List<MsPaperStudentQuestion> listNoMergeStupic();
-
-
+    //批量保存学生试题
+    void saveBatchStuPaperQuestion(@Param("list") List<MsPaperStudentQuestion> list);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/system/UserMapper.java

@@ -12,6 +12,9 @@ public interface UserMapper {
 
     //获取考生-保存学生试卷用
     List<UserVo> listStuForExamByExamId(@Param("examid") Integer examid);
+
+    //获取考生-线下保存学生单科试卷用
+    List<Integer> listStuForExamByExamIdAndSubjectid(@Param("examid") Integer examid, @Param("subjectid") String subjectid);
     //获取考生-保存通知用
     List<UserVo> listStuForNoticeByExamId(@Param("examid") Integer examid);
 

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

@@ -16,7 +16,6 @@ import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.paper.MsPaperParams;
 import com.xhkjedu.smarking.vo.system.SchoolCloudVo;
 import com.xhkjedu.utils.N_Utils;
-import com.xhkjedu.vo.system.UserVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -278,16 +277,16 @@ public class MsTemplateService {
         Integer examid = paper.getExamid();
         String subjectid = paper.getSubjectid();
         //获取试卷中所有学生信息
-        List<UserVo> students = userMapper.listStuForExamByExamId(examid);
+        List<Integer> students = userMapper.listStuForExamByExamIdAndSubjectid(examid,subjectid);
         Integer timestamp = N_Utils.getSecondTimestamp();
         List<MsPaperStudent> savePaperStudents = new ArrayList<>();
-        for(UserVo student : students) {
+        for(Integer stuid : students) {
             MsPaperStudent es = new MsPaperStudent();
             es.setExamid(examid);
             es.setMsid(paper.getMsid());
             es.setMpid(mpid);
             es.setSubjectid(subjectid);
-            es.setStudentid(student.getUserid());
+            es.setStudentid(stuid);
             es.setSstate(0);
             es.setChecked(0);
             es.setPnum(paper.getPnum());
@@ -297,6 +296,8 @@ public class MsTemplateService {
             es.setCreatetime(timestamp);
             es.setHasbad(0);
             es.setStuscoretype(0);
+            es.setPagenum(0);
+            es.setSubmittype(0);
             savePaperStudents.add(es);
         }
         msPaperStudentMapper.insertList(savePaperStudents);//保存试卷学生信息
@@ -321,8 +322,6 @@ public class MsTemplateService {
                 psblock.setStudentid(studentid);
                 psblock.setMblockid(mblockid);
                 psblock.setMpsid(mpsid);
-                psblock.setConverted(0);
-                psblock.setChecked(0);
                 psblock.setCreatetime(timestamp);
                 savePaperStudentBlocks.add(psblock);
 
@@ -360,17 +359,12 @@ public class MsTemplateService {
                 psquestion.setQn(q.getQn());
                 psquestion.setQorder(q.getQorder());
                 psquestion.setQscore(q.getQscore());
-                psquestion.setStuscore(0.0);
-                psquestion.setAnswered(0);
-                psquestion.setAnswertype(0);
-                psquestion.setConverted(0);
-                psquestion.setChecked(0);
 
                 savePaperStudentQuestions.add(psquestion);
             }
         }
-        msPaperStudentBlockMapper.insertList(savePaperStudentBlocks);//保存试卷学生题块信息
-        msPaperStudentQuestionMapper.insertList(savePaperStudentQuestions);//保存试卷学生试题信息
+        msPaperStudentBlockMapper.insertBatchStudentBlock(savePaperStudentBlocks);//保存试卷学生题块信息
+        msPaperStudentQuestionMapper.saveBatchStuPaperQuestion(savePaperStudentQuestions);//保存试卷学生试题信息
 
     }
 

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

@@ -46,7 +46,7 @@
     </delete>
 
     <!--获取试卷中所有主观题题块ID-->
-    <select id="listSubjectiveBlockidsByMpid" resultType="java.util.List">
+    <select id="listSubjectiveBlockidsByMpid" resultType="java.lang.Integer">
         select mblockid from ms_paper_block where mpid = #{mpid} and blocktype = 2 order by mblockid
     </select>
 

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

@@ -97,4 +97,13 @@
           ,secondcid = (if(secondcid=#{secondcid},null,secondcid))
         where mpsbid in (${mpsbids})
     </update>
+
+    <!--批量保存学生题块-->
+    <insert id="insertBatchStudentBlock">
+        insert into ms_paper_student_block(examid,mpid,subjectid,mblockid,studentid,mpsid,createtime) values
+        <foreach collection="list" item="b" separator=",">
+            (#{b.examid},#{b.mpid},#{b.subjectid},#{b.mblockid},#{b.studentid},#{b.mpsid},#{b.createtime})
+        </foreach>
+    </insert>
+
 </mapper>

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

@@ -320,4 +320,12 @@
         select mpsqid,stuanswer,examid from ms_paper_student_question
         where answered=1 and answertype=2 and converted=1 order by mpsqid
     </select>
+
+    <!--批量保存学生试题-->
+    <insert id="saveBatchStuPaperQuestion">
+        insert into ms_paper_student_question(studentid,examid,subjectid,mpid,mpsid,mptqid,mblockid,ctype,questionid,qorder,qn,qscore) values
+        <foreach collection="list" item="q" separator=",">
+            (#{q.studentid},#{q.examid},#{q.subjectid},#{q.mpid},#{q.mpsid},#{q.mptqid},#{q.mblockid},#{q.ctype},#{q.questionid},#{q.qorder},#{q.qn},#{q.qscore})
+        </foreach>
+    </insert>
 </mapper>

smarking/src/main/resources/mapper/system/SchoolMapper.xml

@@ -13,7 +13,7 @@
 
     <!--获取考试对应区域码和学校id-->
     <select id="getSchoolCloudcode" resultType="com.xhkjedu.smarking.vo.system.SchoolCloudVo">
-        select e.schoolid,(select cloudcode from t_cloud order by cloudid limit 1) cloudcode from ms_paper p left join ms_exam e on p.examid=p.examid
-        where p.mpid=#{mpid}
+        select distinct e.schoolid,(select cloudcode from t_cloud order by cloudid limit 1) cloudcode from ms_paper p
+        left join ms_exam e on p.examid=e.examid where p.mpid=#{mpid}
     </select>
 </mapper>

smarking/src/main/resources/mapper/system/UserMapper.xml

@@ -15,6 +15,12 @@
         where cs.examid=#{examid}
         group by cs.studentid,cs.subjectid
     </select>
+    <!--获取考生-线下保存学生单科试卷用-->
+    <select id="listStuForExamByExamIdAndSubjectid" resultType="java.lang.Integer">
+        select cs.studentid from ms_class_student cs
+        where cs.examid=#{examid} and cs.subjectid=#{subjectid}
+        group by cs.studentid
+    </select>
     <select id="listStuForNoticeByExamId" resultType="com.xhkjedu.vo.system.UserVo">
         select cs.studentid as userid,cs.classid
         from ms_class_student cs