评卷分组获取评卷区配置

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -354,6 +354,6 @@ public interface ExamStudentDao extends JpaRepository<ExamStudent, Integer>, Jpa
 
     @Query("select max(s.sheetCount) from ExamStudent s where s.examId=?1")
     public Integer findMaxSheetCountByExamId(Integer examId);
-    @Query("select max(s.sheetCount) from ExamStudent s where s.examId=?1 and s.subjectCode=?2 ")
-    Integer findMaxSheetCountByExamIdAndSubjectCode(Integer examId, String subejctCode);
+    @Query("select max(s.sliceCount) from ExamStudent s where s.examId=?1 and s.subjectCode=?2 ")
+    Integer findMaxSliceCountByExamIdAndSubjectCode(Integer examId, String subejctCode);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/query/ExamStudentSearchQuery.java

@@ -137,6 +137,8 @@ public class ExamStudentSearchQuery extends BaseQuery<ExamStudent> {
 
     private Integer sheetCount;
 
+    private Integer sliceCount;
+
     // 是否已复核
     private Boolean inspected;
 
@@ -641,4 +643,11 @@ public class ExamStudentSearchQuery extends BaseQuery<ExamStudent> {
         this.examSites = examSites;
     }
 
+    public Integer getSliceCount() {
+        return sliceCount;
+    }
+
+    public void setSliceCount(Integer sliceCount) {
+        this.sliceCount = sliceCount;
+    }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ExamStudentService.java

@@ -254,5 +254,5 @@ public interface ExamStudentService {
 
     Integer findMaxSheetCountByExamId(Integer examId);
 
-    Integer findMaxSheetCountByExamIdAndSubjectCode(Integer examId, String subejctCode);
+    Integer findMaxSliceCountByExamIdAndSubjectCode(Integer examId, String subejctCode);
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -810,6 +810,9 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
                 if (query.getSheetCount() != null) {
                     predicates.add(cb.equal(root.get("sheetCount"), query.getSheetCount()));
                 }
+                if (query.getSheetCount() != null) {
+                    predicates.add(cb.equal(root.get("sliceCount"), query.getSliceCount()));
+                }
                 return predicates.isEmpty() ? cb.conjunction()
                         : cb.and(predicates.toArray(new Predicate[predicates.size()]));
             }
@@ -1848,7 +1851,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
     }
 
     @Override
-    public Integer findMaxSheetCountByExamIdAndSubjectCode(Integer examId, String subejctCode) {
-        return studentDao.findMaxSheetCountByExamIdAndSubjectCode(examId,subejctCode);
+    public Integer findMaxSliceCountByExamIdAndSubjectCode(Integer examId, String subejctCode) {
+        return studentDao.findMaxSliceCountByExamIdAndSubjectCode(examId,subejctCode);
     }
 }

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/admin/MarkGroupController.java

@@ -627,10 +627,10 @@ public class MarkGroupController extends BaseApiController {
         return array;
     }
 
-    @ApiOperation(value = "获取考试原图遮盖配置")
-    @RequestMapping(value = "/sheetConfig", method = RequestMethod.POST)
+    @ApiOperation(value = "获取评卷分组评卷区配置")
+    @RequestMapping(value = "/sliceConfig", method = RequestMethod.POST)
     @ResponseBody
-    public PictureConfigVo version(@RequestParam Integer examId,@RequestParam String subejctCode,@RequestParam Integer groupNumber) {
+    public PictureConfigVo sliceConfig(@RequestParam Integer examId,@RequestParam String subejctCode,@RequestParam Integer groupNumber) {
         PictureConfigVo vo = new PictureConfigVo();
         MarkGroup group = groupService.findOne(examId,subejctCode,groupNumber);
         if (group == null) {
@@ -638,16 +638,16 @@ public class MarkGroupController extends BaseApiController {
         }
         List<PictureConfigItem> list = PictureConfigItem.parse(group.getPicList());
         vo.setPictureConfigItemList(list);
-        Integer sheetCount = studentService.findMaxSheetCountByExamIdAndSubjectCode(examId,subejctCode);
+        Integer sliceCount = studentService.findMaxSliceCountByExamIdAndSubjectCode(examId,subejctCode);
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
         query.setExamId(examId);
         query.setUpload(true);
-        query.setSheetCount(sheetCount/2);
+        query.setSliceCount(sliceCount);
         List<ExamStudent> examStudents = studentService.findByQuery(query).getResult();
         if (examStudents.size() > 0) {
             ExamStudent student = examStudents.get(0);
-            List<String> sheetUris= fileService.getSheetUris(student.getExamId(), student.getExamNumber(), 1, sheetCount);
-            vo.setStudentUrl(sheetUris);
+            List<String> sliceUrl= fileService.getSheetUris(student.getExamId(), student.getExamNumber(), 1, sliceCount);
+            vo.setStudentUrl(sliceUrl);
             return vo;
         }else{
             throw new StatusException("没有已上传的考生");