联考版-v2.1.0

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/StudentApi.java

@@ -5,6 +5,7 @@ import cn.com.qmth.stmms.ms.commons.utils.specification.PagingAndSortingDTO;
 import cn.com.qmth.stmms.ms.core.domain.MarkStage;
 import cn.com.qmth.stmms.ms.core.domain.MarkSubject;
 import cn.com.qmth.stmms.ms.core.domain.Student;
+import cn.com.qmth.stmms.ms.core.domain.enums.TrialEnum;
 import cn.com.qmth.stmms.ms.core.repository.MarkSubjectRepo;
 import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
 import cn.com.qmth.stmms.ms.core.repository.StudentRepo;
@@ -53,7 +54,7 @@ public class StudentApi {
     }
 
     /**
-     * 单个考生
+     * 单个考生（根据ID）
      *
      * @param domain 考生id
      * @return
@@ -63,6 +64,17 @@ public class StudentApi {
         return domain;
     }
 
+
+    /**
+     * 单个考生（根据workId + 准考证号）
+     *
+     * @return
+     */
+    @RequestMapping(value = "get_one", method = RequestMethod.GET)
+    public Student getOneByExamNumber(@RequestParam("workId") Long workId, @RequestParam("examNumber") String examNumber) {
+        return studentRepo.findByWorkIdAndExamNumberAndTest(workId, examNumber, String.valueOf(TrialEnum.DEFAULT.getId()));
+    }
+
     /**
      * 删除
      *

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/exporter/PaperExporter.java

@@ -109,8 +109,8 @@ public class PaperExporter {
                 oneClickExpDTO.setLevel(markLog.getOperDataAfter());
                 oneClickExpDTOS.add(oneClickExpDTO);
             }
-            ExportUtils.exportEXCEL("专家复评导出", OneClickExpDTO.class, oneClickExpDTOS, response);
         }
+        ExportUtils.exportEXCEL("专家复评导出", OneClickExpDTO.class, oneClickExpDTOS, response);
     }
 
     /**