批次

src/main/java/cn/com/qmth/scancentral/controller/admin/BatchController.java

@@ -0,0 +1,35 @@
+package cn.com.qmth.scancentral.controller.admin;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.constant.ApiConstant;
+
+import cn.com.qmth.scancentral.controller.BaseController;
+import cn.com.qmth.scancentral.service.BatchService;
+import cn.com.qmth.scancentral.vo.SubjectVo;
+import cn.com.qmth.scancentral.vo.batch.BatchSubjectQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@Api(tags = "批次接口")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/batch")
+@Aac(strict = false, auth = true)
+public class BatchController extends BaseController {
+
+    @Autowired
+    private BatchService batchService;
+
+    @ApiOperation(value = "获取扫描批次科目列表")
+    @PostMapping("subject/list")
+    public List<SubjectVo> subjectList(BatchSubjectQuery req) {
+        return batchService.subjectList(req);
+    }
+
+}

src/main/java/cn/com/qmth/scancentral/service/BatchService.java

@@ -1,5 +1,13 @@
 package cn.com.qmth.scancentral.service;
 
+import java.util.List;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.boot.core.collection.PageResult;
+
 import cn.com.qmth.scancentral.bean.BatchCreateDomain;
 import cn.com.qmth.scancentral.bean.BatchQueryDomain;
 import cn.com.qmth.scancentral.bean.User;
@@ -9,19 +17,20 @@ import cn.com.qmth.scancentral.entity.BatchEntity;
 import cn.com.qmth.scancentral.enums.BatchStatus;
 import cn.com.qmth.scancentral.enums.CheckStatus;
 import cn.com.qmth.scancentral.enums.VerifyStatus;
-import cn.com.qmth.scancentral.vo.*;
+import cn.com.qmth.scancentral.vo.BatchFinishVo;
+import cn.com.qmth.scancentral.vo.BatchQueryVo;
+import cn.com.qmth.scancentral.vo.BatchVerifyVo;
+import cn.com.qmth.scancentral.vo.ScannerWorkloadVo;
+import cn.com.qmth.scancentral.vo.SheetUploadVo;
+import cn.com.qmth.scancentral.vo.SliceUploadVo;
+import cn.com.qmth.scancentral.vo.SubjectVo;
 import cn.com.qmth.scancentral.vo.batch.AnswerSaveVo;
 import cn.com.qmth.scancentral.vo.batch.BatchCreateVo;
+import cn.com.qmth.scancentral.vo.batch.BatchSubjectQuery;
 import cn.com.qmth.scancentral.vo.batchdetail.BatchDetailVo;
 import cn.com.qmth.scancentral.vo.checkimage.CheckImageSubmitVo;
 import cn.com.qmth.scancentral.vo.task.TaskStatusVo;
 import cn.com.qmth.scancentral.vo.verify.VerifyTaskVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.boot.core.collection.PageResult;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 public interface BatchService extends IService<BatchEntity> {
 
@@ -32,10 +41,10 @@ public interface BatchService extends IService<BatchEntity> {
     int getVerifyCount(Long examId);
 
     SheetUploadVo sheetUpload(Long batchId, String examNumber, Integer paperNumber, Integer pageIndex,
-                              MultipartFile multipartFile, String md5);
+            MultipartFile multipartFile, String md5);
 
     SliceUploadVo sliceUpload(Long batchId, String examNumber, Integer paperNumber, Integer pageIndex, Integer index,
-                              MultipartFile multipartFile, String md5);
+            MultipartFile multipartFile, String md5);
 
     AnswerSaveVo batchSave(AnswerDomain domain, User user);
 
@@ -97,7 +106,9 @@ public interface BatchService extends IService<BatchEntity> {
 
     IPage<BatchEntity> findUnCheck(Long examId, int pageNumber, int pageSize, BatchStatus b, CheckStatus status);
 
-    void batchVerifyCancel(User user,Long examId);
+    void batchVerifyCancel(User user, Long examId);
 
     void updateBatchCount();
+
+    List<SubjectVo> subjectList(BatchSubjectQuery req);
 }

src/main/java/cn/com/qmth/scancentral/service/impl/BatchServiceImpl.java

@@ -1,6 +1,12 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.math.RandomUtils;
@@ -27,17 +33,47 @@ import cn.com.qmth.scancentral.bean.WorkloadDomain;
 import cn.com.qmth.scancentral.bean.answersave.AnswerDomain;
 import cn.com.qmth.scancentral.bean.answersave.AnswerPaper;
 import cn.com.qmth.scancentral.dao.BatchDao;
-import cn.com.qmth.scancentral.entity.*;
-import cn.com.qmth.scancentral.enums.*;
+import cn.com.qmth.scancentral.entity.AnswerCardEntity;
+import cn.com.qmth.scancentral.entity.BatchEntity;
+import cn.com.qmth.scancentral.entity.BatchPaperEntity;
+import cn.com.qmth.scancentral.entity.ExamEntity;
+import cn.com.qmth.scancentral.entity.PaperEntity;
+import cn.com.qmth.scancentral.entity.PaperPageEntity;
+import cn.com.qmth.scancentral.entity.StudentEntity;
+import cn.com.qmth.scancentral.entity.StudentPaperEntity;
+import cn.com.qmth.scancentral.entity.SubjectEntity;
+import cn.com.qmth.scancentral.enums.BatchStatus;
+import cn.com.qmth.scancentral.enums.CheckStatus;
+import cn.com.qmth.scancentral.enums.LockType;
+import cn.com.qmth.scancentral.enums.Role;
+import cn.com.qmth.scancentral.enums.VerifyStatus;
 import cn.com.qmth.scancentral.exception.NotFoundExceptions;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
-import cn.com.qmth.scancentral.service.*;
+import cn.com.qmth.scancentral.service.AnswerCardService;
+import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
+import cn.com.qmth.scancentral.service.AssignedCheckHistoryService;
+import cn.com.qmth.scancentral.service.BatchPaperService;
+import cn.com.qmth.scancentral.service.BatchService;
+import cn.com.qmth.scancentral.service.ExamService;
+import cn.com.qmth.scancentral.service.FilePropertyService;
+import cn.com.qmth.scancentral.service.FileService;
+import cn.com.qmth.scancentral.service.PaperPageService;
+import cn.com.qmth.scancentral.service.PaperService;
+import cn.com.qmth.scancentral.service.StudentService;
+import cn.com.qmth.scancentral.service.SubjectService;
 import cn.com.qmth.scancentral.support.TaskLock;
 import cn.com.qmth.scancentral.support.TaskLockUtil;
 import cn.com.qmth.scancentral.util.PageUtil;
-import cn.com.qmth.scancentral.vo.*;
+import cn.com.qmth.scancentral.vo.BatchFinishVo;
+import cn.com.qmth.scancentral.vo.BatchQueryVo;
+import cn.com.qmth.scancentral.vo.BatchVerifyVo;
+import cn.com.qmth.scancentral.vo.ScannerWorkloadVo;
+import cn.com.qmth.scancentral.vo.SheetUploadVo;
+import cn.com.qmth.scancentral.vo.SliceUploadVo;
+import cn.com.qmth.scancentral.vo.SubjectVo;
 import cn.com.qmth.scancentral.vo.batch.AnswerSaveVo;
 import cn.com.qmth.scancentral.vo.batch.BatchCreateVo;
+import cn.com.qmth.scancentral.vo.batch.BatchSubjectQuery;
 import cn.com.qmth.scancentral.vo.batch.Paper;
 import cn.com.qmth.scancentral.vo.batch.Rescan;
 import cn.com.qmth.scancentral.vo.batchdetail.BatchDetailDO;
@@ -838,4 +874,13 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
             updateScanCount(batch.getId());
         }
     }
+
+    @Override
+    public List<SubjectVo> subjectList(BatchSubjectQuery req) {
+        if (req.getExamId() == null) {
+            throw new ParameterException("考试id不能为空");
+        }
+        // return this.baseMapper.subjectList(req);
+        return null;
+    }
 }

src/main/java/cn/com/qmth/scancentral/vo/batch/BatchSubjectQuery.java

@@ -0,0 +1,35 @@
+package cn.com.qmth.scancentral.vo.batch;
+
+public class BatchSubjectQuery {
+
+    private Long examId;
+
+    private Long startTime;
+
+    private Long endTime;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
+
+}