Эх сурвалжийг харах

数据检查和缺考校验导出验证

yin 8 сар өмнө
parent
commit
a3a5e36bf0

+ 6 - 0
src/main/java/cn/com/qmth/scancentral/controller/admin/CheckAbsentController.java

@@ -225,6 +225,9 @@ public class CheckAbsentController extends BaseController {
     @ApiOperation(value = "缺考校验按考生导出")
     @PostMapping(value = "exam-status/student/export")
     public void studentExport(@Validated AnswerQueryDomain query, HttpServletResponse response) throws IOException {
+        if(query.getExamStatus()!=null && query.getExamStatus().equals(ExamStatus.OK)){
+            throw new ParameterException("请重新选择缺考状态");
+        }
         String fileName = URLEncoder.encode("按考生导出", "UTF-8");
         response.setHeader("Content-Disposition", "inline; filename=" + fileName + ".xlsx");
         response.setContentType("application/vnd.ms-excel");
@@ -247,6 +250,9 @@ public class CheckAbsentController extends BaseController {
     @PostMapping(value = "exam-status/exam-room/export")
     public void studentExamRoomExport(@Validated AnswerQueryDomain query, HttpServletResponse response)
             throws IOException {
+        if(query.getExamStatus()!=null && query.getExamStatus().equals(ExamStatus.OK)){
+            throw new ParameterException("请重新选择缺考状态");
+        }
         String fileName = URLEncoder.encode("按考场导出", "UTF-8");
         response.setHeader("Content-Disposition", "inline; filename=" + fileName + ".xlsx");
         response.setContentType("application/vnd.ms-excel");

+ 0 - 5
src/main/resources/mapper/StudentMapper.xml

@@ -630,11 +630,8 @@
             resultType="cn.com.qmth.scancentral.vo.student.StudentVo">
         select
         t.*,
-        c.paper_count cardPaperCount,
         s.name subjectName
         from sc_student t
-        left join sc_answer_card c on t.exam_id=c.exam_id and
-        t.card_number=c.number
         left join sc_subject s on s.code=t.subject_code and s.exam_id=t.exam_id
         <include refid="queryWhereAndOrder"/>
         order by t.exam_number
@@ -645,8 +642,6 @@
         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
-        t.card_number=c.number
         left join sc_subject s on s.code=t.subject_code and s.exam_id=t.exam_id
         <include refid="queryWhereAndOrder"/>
         group by t.campus_code,t.exam_site,t.exam_room,s.code