Browse Source

3.3.0 fix

xiaofei 1 year ago
parent
commit
5a83c71c21

+ 1 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkStudentController.java

@@ -76,7 +76,7 @@ public class MarkStudentController {
      * 客观题检查任务保存
      */
     @ApiOperation(value = "客观题检查任务保存")
-    @RequestMapping(value = "/check/objective/getTask", method = RequestMethod.POST)
+    @RequestMapping(value = "/check/objective/saveTask", method = RequestMethod.POST)
     public Result saveCheckObjectiveTask(@ApiParam(value = "考生ID", required = true) @RequestParam Long studentId,
                                          @ApiParam(value = "客观题答案", required = true) @RequestParam String answers) {
         return ResultUtil.ok(markStudentService.saveCheckObjectiveTask(studentId, answers));

+ 3 - 0
teachcloud-mark/src/main/resources/mapper/MarkStudentMapper.xml

@@ -9,6 +9,7 @@
         <result column="course_code" property="courseCode" />
         <result column="course_name" property="courseName" />
         <result column="paper_number" property="paperNumber" />
+        <result column="course_paper_id" property="coursePaperId" />
         <result column="secret_number" property="secretNumber" />
         <result column="student_code" property="studentCode" />
         <result column="student_name" property="studentName" />
@@ -35,11 +36,13 @@
         <result column="class_name" property="className" />
         <result column="teacher" property="teacher" />
         <result column="scan_status" property="scanStatus" />
+        <result column="omr_absent_checked" property="omrAbsentChecked" />
         <result column="question_filled" property="questionFilled" />
         <result column="assigned" property="assigned" />
         <result column="absent_suspect" property="absentSuspect" />
         <result column="incomplete" property="incomplete" />
         <result column="breach_code" property="breachCode" />
+        <result column="card_number" property="cardNumber" />
     </resultMap>
     <select id="pageStudentScore" resultType="com.qmth.teachcloud.mark.dto.mark.score.StudentScoreDetailDto">
         SELECT

+ 1 - 0
teachcloud-mark/src/main/resources/mapper/ScanAnswerCardMapper.xml

@@ -9,6 +9,7 @@
         <result column="course_paper_id" property="coursePaperId" />
         <result column="number" property="number" />
         <result column="source" property="source" />
+        <result column="uri" property="uri" />
         <result column="md5" property="md5" />
         <result column="parameter" property="parameter" />
         <result column="remark" property="remark" />

+ 1 - 1
teachcloud-mark/src/main/resources/mapper/ScanOmrTaskMapper.xml

@@ -21,7 +21,7 @@
 			typeHandler="com.qmth.teachcloud.mark.handle.OmrTaskPageListTypeHandler" />
     </resultMap>
     
-    <select id="findUnMarked" resultMap="custMap">
+    <select id="findUnMarked" resultMap="BaseResultMap">
 		select *
 		from scan_omr_task t
 		where t.exam_id=#{examId}

+ 4 - 4
teachcloud-mark/src/main/resources/mapper/ScanPaperPageMapper.xml

@@ -6,10 +6,10 @@
     <resultMap id="BaseResultMap" type="com.qmth.teachcloud.mark.entity.ScanPaperPage">
         <id column="paper_id" property="paperId" />
         <result column="page_index" property="pageIndex" />
-        <result column="absent" property="absent" />
-        <result column="breach" property="breach" />
-        <result column="question" property="question" />
-        <result column="selective" property="selective" />
+        <result column="absent" property="absent" jdbcType="BLOB" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result column="breach" property="breach" jdbcType="BLOB" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
+        <result column="question" property="question"  jdbcType="BLOB" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result column="selective" property="selective"  jdbcType="BLOB" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result column="sheet_path" property="sheetPath" />
         <result column="recog_data" property="recogData" />
         <result column="creator_id" property="creatorId" />