1.0.4 优化联调bug

paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/DocManageMapper.java

@@ -18,7 +18,7 @@ public interface DocManageMapper {
 
     IPage<DocManageResult> pageData(@Param("page") Page<DocManageResult> page, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("orgIds") Set<Long> orgIds);
 
-    IPage<DocManageDetailResult> pageDetail(@Param("page") Page<DocManageDetailResult> page, @Param("paperScanTaskId") Long paperScanTaskId, @Param("collegeName") String collegeName, @Param("majorName") String majorName, @Param("className") String className, @Param("courseCode") String courseCode, @Param("teacher") String teacher, @Param("teachClass") String teachClass, @Param("isBind") Boolean isBind, @Param("param") String param, @Param("minScore") Double minScore, @Param("maxScore") Double maxScore, @Param("minBindCount") Integer minBindCount, @Param("maxBindCount") Integer maxBindCount);
+    IPage<DocManageDetailResult> pageDetail(@Param("page") Page<DocManageDetailResult> page, @Param("paperScanTaskId") Long paperScanTaskId, @Param("collegeName") String collegeName, @Param("majorName") String majorName, @Param("className") String className, @Param("examRoom") String examRoom, @Param("teacher") String teacher, @Param("teachClass") String teachClass, @Param("isBind") Boolean isBind, @Param("param") String param, @Param("minScore") Double minScore, @Param("maxScore") Double maxScore, @Param("minBindCount") Integer minBindCount, @Param("maxBindCount") Integer maxBindCount);
 
     List<DocManageDetailResult> pageDetail(@Param("paperScanTaskId") Long paperScanTaskId, @Param("collegeName") String collegeName, @Param("majorName") String majorName, @Param("className") String className, @Param("courseName") String courseName, @Param("teacher") String teacher, @Param("teachClass") String teachClass, @Param("isBind") Boolean isBind, @Param("param") String param, @Param("minScore") Double minScore, @Param("maxScore") Double maxScore, @Param("minBindCount") Integer minBindCount, @Param("maxBindCount") Integer maxBindCount);
 

paper-library-business/src/main/java/com/qmth/paper/library/business/service/DocManageService.java

@@ -17,7 +17,7 @@ public interface DocManageService {
 
     IPage<DocManageResult> pageData(Long examId, String courseCode, Integer pageNumber, Integer pageSize);
 
-    IPage<DocManageDetailResult> pageDetail(Long paperScanTaskId, String collegeName, String majorName, String className, String courseCode, String teacher, String teachClass, Boolean isBind, String param, Double minScore, Double maxScore, Integer minBindCount, Integer maxBindCount, Integer pageNumber, Integer pageSize);
+    IPage<DocManageDetailResult> pageDetail(Long paperScanTaskId, String collegeName, String majorName, String className, String examRoom, String teacher, String teachClass, Boolean isBind, String param, Double minScore, Double maxScore, Integer minBindCount, Integer maxBindCount, Integer pageNumber, Integer pageSize);
 
     List<DocManageDetailResult> listDetail(DownLoadPaperParams downLoadPaperParams);
 

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ClientServiceImpl.java

@@ -13,11 +13,12 @@ import com.qmth.paper.library.common.entity.BasicExam;
 import com.qmth.paper.library.common.entity.ExamStudent;
 import com.qmth.paper.library.common.entity.SysPrivilege;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
+import com.qmth.paper.library.common.enums.StoreTypeEnum;
 import com.qmth.paper.library.common.enums.UploadFileEnum;
+import com.qmth.paper.library.common.service.CommonCacheService;
 import com.qmth.paper.library.common.service.SysPrivilegeService;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -50,6 +51,8 @@ public class ClientServiceImpl implements ClientService {
     private BusinessCacheService businessCacheService;
     @Resource
     private BasicExamService basicExamService;
+    @Resource
+    private CommonCacheService commonCacheService;
 
     @Override
     public PaperScanTask pageScanTask(Long examId, String courseCode) {
@@ -109,6 +112,12 @@ public class ClientServiceImpl implements ClientService {
             if (examStudent == null) {
                 BasicExam basicExam = basicExamService.getById(paperScanTask.getExamId());
                 examStudent = new ExamStudent(schoolId, basicExam.getSemesterId(), basicExam.getId(), paperScanTask.getCourseCode(), paperScanTask.getCourseName(), recognitionVo.getBindResult(), studentCode, true, true);
+                if (StoreTypeEnum.ROOM.equals(paperScanTask.getStoreType())) {
+                    examStudent.setExamRoom(studentCode);
+                }
+                if (StoreTypeEnum.CLASS.equals(paperScanTask.getStoreType())) {
+                    examStudent.setClassName(studentCode);
+                }
                 examStudentService.save(examStudent);
             }
             paperLibrary.setStudentId(examStudent.getId());

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/DocManageServiceImpl.java

@@ -54,8 +54,8 @@ public class DocManageServiceImpl implements DocManageService {
     }
 
     @Override
-    public IPage<DocManageDetailResult> pageDetail(Long paperScanTaskId, String collegeName, String majorName, String className, String courseCode, String teacher, String teachClass, Boolean isBind, String param, Double minScore, Double maxScore, Integer minBindCount, Integer maxBindCount, Integer pageNumber, Integer pageSize) {
-        IPage<DocManageDetailResult> detailResultIPage = docManageMapper.pageDetail(new Page<>(pageNumber, pageSize), paperScanTaskId, collegeName, majorName, className, courseCode, teacher, teachClass, isBind, param, minScore, maxScore, minBindCount, maxBindCount);
+    public IPage<DocManageDetailResult> pageDetail(Long paperScanTaskId, String collegeName, String majorName, String className, String examRoom, String teacher, String teachClass, Boolean isBind, String param, Double minScore, Double maxScore, Integer minBindCount, Integer maxBindCount, Integer pageNumber, Integer pageSize) {
+        IPage<DocManageDetailResult> detailResultIPage = docManageMapper.pageDetail(new Page<>(pageNumber, pageSize), paperScanTaskId, collegeName, majorName, className, examRoom, teacher, teachClass, isBind, param, minScore, maxScore, minBindCount, maxBindCount);
         return detailResultIPage;
     }
 

paper-library-business/src/main/resources/mapper/DocManageMapper.xml

@@ -56,8 +56,8 @@
             <if test="className != null and className != ''">
                 and es.class_name like concat(#{className},'%')
             </if>
-            <if test="courseCode != null and courseCode != ''">
-                and es.course_code = #{courseCode}
+            <if test="examRoom != null and examRoom != ''">
+                and es.exam_room like concat(#{examRoom}, '%')
             </if>
             <if test="teacher != null and teacher != ''">
                 and es.teacher like concat(#{teacher},'%')

paper-library/src/main/java/com/qmth/paper/library/api/DocManageController.java

@@ -64,7 +64,7 @@ public class DocManageController {
                              @ApiParam(value = "学院") @RequestParam(required = false) String collegeName,
                              @ApiParam(value = "专业") @RequestParam(required = false) String majorName,
                              @ApiParam(value = "班级") @RequestParam(required = false) String className,
-                             @ApiParam(value = "课程") @RequestParam(required = false) String courseCode,
+                             @ApiParam(value = "考场") @RequestParam(required = false) String examRoom,
                              @ApiParam(value = "任课老师") @RequestParam(required = false) String teacher,
                              @ApiParam(value = "教学班") @RequestParam(required = false) String teachClass,
                              @ApiParam(value = "是否绑定") @RequestParam(required = false) Boolean isBind,
@@ -75,7 +75,7 @@ public class DocManageController {
                              @ApiParam(value = "绑定数量（大）") @RequestParam(required = false) Integer maxBindCount,
                              @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                              @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
-        return ResultUtil.ok(docManageService.pageDetail(paperScanTaskId, collegeName, majorName, className, courseCode, teacher, teachClass, isBind, param, minScore, maxScore, minBindCount, maxBindCount, pageNumber, pageSize));
+        return ResultUtil.ok(docManageService.pageDetail(paperScanTaskId, collegeName, majorName, className, examRoom, teacher, teachClass, isBind, param, minScore, maxScore, minBindCount, maxBindCount, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "批量下载")