xiatian 9 tháng trước cách đây
mục cha
commit
188438e771

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/bean/omredit/OmrFieldEditDomain.java

@@ -33,7 +33,7 @@ public class OmrFieldEditDomain {
 
     @Valid
     @NotBlank(message = "value不能为空")
-    private Object value;
+    private String value;
 
     public Long getExamId() {
         return examId;
@@ -83,11 +83,11 @@ public class OmrFieldEditDomain {
         this.field = field;
     }
 
-    public Object getValue() {
+    public String getValue() {
         return value;
     }
 
-    public void setValue(Object value) {
+    public void setValue(String value) {
         this.value = value;
     }
 

+ 4 - 5
src/main/resources/mapper/BatchMapper.xml

@@ -245,7 +245,7 @@
             resultType="cn.com.qmth.scancentral.vo.device.DeviceVo">
         select distinct b.device,d.device_name
         from sc_batch b 
-        left join sc_device d on b.device=d.device
+        left join sc_scanner d on b.device=d.device
         where b.exam_id = #{req.examId}
         and b.subject_code=#{req.subjectCode}
         <if test="req.startTime != null">
@@ -260,7 +260,6 @@
             resultType="cn.com.qmth.scancentral.vo.batch.BatchVo">
         select distinct b.id batchId,b.create_time
         from sc_batch b 
-        left join sc_device d on b.device=d.device
         where b.exam_id = #{req.examId}
         and b.subject_code=#{req.subjectCode}
         and b.device=#{req.device}
@@ -272,12 +271,12 @@
         </if>
         order by b.create_time
     </select> 
-    <select id="batchList"
+    <select id="studentList"
             resultType="cn.com.qmth.scancentral.vo.batch.BatchStudentSimpleVo">
-        select s.id studentId,s.name studentName,s.examNumber
+        select s.id studentId,s.name studentName,s.exam_number
         from sc_batch_paper b 
         left join sc_student s on b.student_id=s.id
         where b.batch_id = #{batchId}
-        order by s.examNumber
+        order by s.exam_number
     </select>      
 </mapper>

+ 2 - 2
src/main/resources/mapper/StudentMapper.xml

@@ -619,8 +619,8 @@
     </select>
     <select id="studentExamRoomExport"
             resultType="cn.com.qmth.scancentral.vo.student.StudentExamRoomVo">
-        select tm.* from (select t.campus_code,t.exam_site,t.exam_room
-        s.code subject_code
+        select tm.* from (select t.campus_code,t.exam_site,t.exam_room,
+        s.code subject_code,
         s.name subject_name
         from sc_student t
         left join sc_answer_card c on t.exam_id=c.exam_id and