机构版-2.1.0-增加小工具接口

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

@@ -68,6 +68,16 @@ 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-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/MarkTaskRepo.java

@@ -271,4 +271,6 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
 
     @Query(value = "select distinct cast(m.paper_id as char) paperId from mark_task m inner join paper p on m.paper_id = p.id and m.stage = ?3 where p.work_id = ?1 and p.subject = ?2 and m.manual_score = 1", nativeQuery = true)
     List<String> findByWorkIdAndSubjectAndStageAndManualScore(Long workId, String subject, int stage);
+
+    List<MarkTask> findByWorkIdAndSubjectAndSecretNumberAndTest(Long workId, Subject subject, String secretNumber, int id);
 }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/PaperRepo.java

@@ -398,5 +398,7 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
     @Query(value = "update paper p set p.level = case p.is_sample when true then p.level else null end,p.sort_num = case p.is_sample when true then p.sort_num else null end, p.redo_level = null, p.batch_no = null, p.is_active = false, p.is_arbitrated = false, p.is_rejected = false, p.is_tagged = false, p.mark_by_leader = false, p.is_one_click = false where p.work_id = ?1 and p.subject = ?2", nativeQuery = true)
     void updateLevelByWorkIdAndSubject(Long workId, String subject);
 
+    List<Paper> findByWorkIdAndSubjectAndSecretNumberAndTest(Long workId, Subject subject, String secretNumber, int id);
+
 //    List<Paper> findByWorkIdAndSubjectAndInspectRange(Long workId, Subject subject, Long inspectRange);
 }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/MarkTaskApi.java

@@ -28,7 +28,6 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -568,4 +567,19 @@ public class MarkTaskApi {
         }
         return list;
     }
+
+    /**
+     * 根据任务密号查询试卷
+     *
+     * @param workId
+     * @param subject
+     * @param secretNumber
+     * @return
+     */
+    @RequestMapping(value = "/get_by_secret_number", method = RequestMethod.GET)
+    public List<MarkTask> getBySecretNumber(@RequestParam Long workId,
+                                            @RequestParam Subject subject,
+                                            @RequestParam String secretNumber) {
+        return markTaskRepo.findByWorkIdAndSubjectAndSecretNumberAndTest(workId, subject, secretNumber, TrialEnum.DEFAULT.getId());
+    }
 }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/PaperApi.java

@@ -6,6 +6,7 @@ import cn.com.qmth.stmms.ms.core.domain.ExamQuestion;
 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.Paper;
+import cn.com.qmth.stmms.ms.core.domain.enums.TrialEnum;
 import cn.com.qmth.stmms.ms.core.domain.task.MarkTask;
 import cn.com.qmth.stmms.ms.core.repository.ExamQuestionRepo;
 import cn.com.qmth.stmms.ms.core.repository.MarkSubjectRepo;
@@ -17,7 +18,6 @@ import cn.com.qmth.stmms.ms.marking.assembler.PaperAssembler;
 import cn.com.qmth.stmms.ms.marking.dto.MarkTaskDTO;
 import cn.com.qmth.stmms.ms.marking.dto.PaperDTO;
 import cn.com.qmth.stmms.ms.marking.service.MarkingService;
-import javafx.beans.binding.ObjectExpression;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -697,4 +697,19 @@ public class PaperApi {
         }
         return mapList;
     }
+
+    /**
+     * 根据试卷密号查询试卷
+     *
+     * @param workId
+     * @param subject
+     * @param secretNumber
+     * @return
+     */
+    @RequestMapping(value = "/get_by_secret_number", method = RequestMethod.GET)
+    public List<Paper> getBySecretNumber(@RequestParam Long workId,
+                                         @RequestParam Subject subject,
+                                         @RequestParam String secretNumber) {
+        return paperRepo.findByWorkIdAndSubjectAndSecretNumberAndTest(workId, subject, secretNumber, TrialEnum.DEFAULT.getId());
+    }
 }