bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ClientService.java

@@ -13,31 +13,31 @@ import java.util.Map;
  * @Date: 2021/4/20.
  */
 public interface ClientService {
-    IPage<ClientExamTaskDto> listTryTask(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass, Integer pageNumber, Integer pageSize);
+    IPage<ClientExamTaskDto> listTryTask(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass, Integer pageNumber, Integer pageSize);
 
-    Map<String, String>  getUrl(Long schoolId, Long examTaskId);
+    Map<String, String> getUrl(Long examTaskId);
 
-    Boolean tagPass(Long schoolId, String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId);
+    Boolean tagPass(String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId);
 
-    Boolean updatePrintProgress(Long schoolId, Long examDetailId, Integer printProgress);
+    Boolean updatePrintProgress(Long examDetailId, Integer printProgress);
 
-    IPage<ClientExamStudentDto> listStudent(Long schoolId, Long examDetailId, String ticketNumber, String studentName, String courseCode, Integer pageNumber, Integer pageSize);
+    IPage<ClientExamStudentDto> listStudent(Long examDetailId, String ticketNumber, String studentName, String courseCode, Integer pageNumber, Integer pageSize);
 
-    Map<String, Object> getReprintData(Long schoolId, Long examDetailId, String ticketNumber, String type);
+    Map<String, Object> getReprintData(Long examDetailId, String ticketNumber, String type);
 
-    IPage<ClientPrintTaskDto> listClientPrintTask(Long schoolId, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate, Integer pageNumber, Integer pageSize);
+    IPage<ClientPrintTaskDto> listClientPrintTask(Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate, Integer pageNumber, Integer pageSize);
 
-    Map<String, Object> getPrintData(Long schoolId, Long examDetailId, String machineCode, Boolean isPrint, String printUser);
+    Map<String, Object> getPrintData(Long examDetailId, String machineCode, Boolean isPrint, String printUser);
 
-    List<Map<String, Object>> getPrintDataBatch(Long schoolId, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate);
+    List<Map<String, Object>> getPrintDataBatch(Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate);
 
-    Map<String, String> getUrlByExamDetailId(Long schoolId, Long examDetailId);
+    Map<String, String> getUrlByExamDetailId(Long examDetailId);
 
-    Boolean updateDownload(Long schoolId, Long examDetailId, String machineCode, Boolean isDownload);
+    Boolean updateDownload(Long examDetailId, String machineCode, Boolean isDownload);
 
-    Boolean validateData(Long schoolId, Long examDetailId, String packageCode, String lastCode);
+    Boolean validateData(Long examDetailId, String packageCode, String lastCode);
 
-    List<Map<String, String>> getBatchUrl(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass);
+    List<Map<String, String>> getBatchUrl(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass);
 
-    void exportClientPrintTask(HttpServletResponse response, Long schoolId, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate) throws Exception;
+    void exportClientPrintTask(HttpServletResponse response, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate) throws Exception;
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamDetailCourseService.java

@@ -27,7 +27,7 @@ public interface ExamDetailCourseService extends IService<ExamDetailCourse> {
 
     List<ExamDetailCourse> listDetailCourseByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
 
-    void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber);
+    void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber, String relatePaperType);
 
     List<ExamDetailCourse> listByExamDetailIdAndStatus(Long examDetailId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamTaskPaperLogService.java

@@ -13,4 +13,5 @@ import com.qmth.distributed.print.business.entity.ExamTaskPaperLog;
  */
 public interface ExamTaskPaperLogService extends IService<ExamTaskPaperLog> {
 
+    ExamTaskPaperLog getByExamTaskIdAndReview(Long examTaskId, boolean review);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ClientServiceImpl.java

@@ -10,6 +10,7 @@ import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.ExcelUtil;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
@@ -58,33 +59,39 @@ public class ClientServiceImpl implements ClientService {
     private ExamStudentService examStudentService;
 
     @Override
-    public IPage<ClientExamTaskDto> listTryTask(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass, Integer pageNumber, Integer pageSize) {
+    public IPage<ClientExamTaskDto> listTryTask(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return examTaskService.listTryTask(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass, pageNumber, pageSize);
     }
 
     @Override
-    public Map<String, String> getUrl(Long schoolId, Long examTaskId) {
+    public Map<String, String> getUrl(Long examTaskId) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return examTaskDetailService.getUrl(schoolId, examTaskId);
     }
 
     @Override
-    public Boolean tagPass(Long schoolId, String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId) {
+    public Boolean tagPass(String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return clientStatusService.tagPass(schoolId, courseCode, courseName, paperNumber, machineCode, isPass, userId);
     }
 
     @Override
-    public Boolean updatePrintProgress(Long schoolId, Long examDetailId, Integer printProgress) {
+    public Boolean updatePrintProgress(Long examDetailId, Integer printProgress) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return examDetailService.updatePrintProgress(schoolId, examDetailId, printProgress);
     }
 
     @Override
-    public IPage<ClientExamStudentDto> listStudent(Long schoolId, Long examDetailId, String ticketNumber, String studentName, String courseCode, Integer pageNumber, Integer pageSize) {
+    public IPage<ClientExamStudentDto> listStudent(Long examDetailId, String ticketNumber, String studentName, String courseCode, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return examDetailService.listStudent(schoolId, examDetailId, ticketNumber, studentName, courseCode, pageNumber, pageSize);
     }
 
 
     @Override
-    public Map<String, Object> getReprintData(Long schoolId, Long examDetailId, String ticketNumber, String type) {
+    public Map<String, Object> getReprintData(Long examDetailId, String ticketNumber, String type) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Map<String, Object> finalMap = new HashMap<>();
         // 取试卷
         List<Map<String, Object>> examDetailCourses = examDetailCourseService.listByExamDetailId(examDetailId);
@@ -123,7 +130,8 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public IPage<ClientPrintTaskDto> listClientPrintTask(Long schoolId, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate, Integer pageNumber, Integer pageSize) {
+    public IPage<ClientPrintTaskDto> listClientPrintTask(Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<ClientPrintTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ClientPrintTaskDto> pirntTaskDtoIPage = examPrintPlanService.listClientPrintTask(page, schoolId, machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, orgIds);
@@ -132,7 +140,8 @@ public class ClientServiceImpl implements ClientService {
 
     @Transactional
     @Override
-    public Map<String, Object> getPrintData(Long schoolId, Long examDetailId, String machineCode, Boolean isPrint, String printUser) {
+    public Map<String, Object> getPrintData(Long examDetailId, String machineCode, Boolean isPrint, String printUser) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<Map<String, Object>> examDetailCourses = examDetailCourseService.listByExamDetailId(examDetailId);
         Map<String, Object> finalMap = new HashMap<>();
         // 2.取生成的完整的pdf
@@ -284,12 +293,13 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public List<Map<String, Object>> getPrintDataBatch(Long schoolId, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate) {
+    public List<Map<String, Object>> getPrintDataBatch(Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = commonService.listSubOrgIds(null);
         List<ClientPrintTaskDto> pirntTaskDtoList = examPrintPlanService.listClientPrintTask(schoolId, machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, orgIds);
         List<Map<String, Object>> finalList = new ArrayList<>();
         for (ClientPrintTaskDto clientPrintTaskDto : pirntTaskDtoList) {
-            Map<String, Object> map = getPrintData(schoolId, Long.valueOf(clientPrintTaskDto.getExamDetailId()), null, false, null);
+            Map<String, Object> map = getPrintData(Long.valueOf(clientPrintTaskDto.getExamDetailId()), null, false, null);
             map.put("examDetailId", clientPrintTaskDto.getExamDetailId());
             finalList.add(map);
         }
@@ -297,14 +307,16 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public Map<String, String> getUrlByExamDetailId(Long schoolId, Long examDetailId) {
+    public Map<String, String> getUrlByExamDetailId(Long examDetailId) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         ExamDetail examDetail = examDetailService.getById(examDetailId);
         BasicAttachment attachment = basicAttachmentService.getById(examDetail.getAttachmentId());
         return attachment == null ? null : commonService.filePreviewByAttachmentId(attachment.getId(), false);
     }
 
     @Override
-    public Boolean updateDownload(Long schoolId, Long examDetailId, String machineCode, Boolean isDownload) {
+    public Boolean updateDownload(Long examDetailId, String machineCode, Boolean isDownload) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<ExamDetailCourse> examDetailCourseQueryWrapper = new QueryWrapper<>();
         examDetailCourseQueryWrapper.lambda().eq(ExamDetailCourse::getSchoolId, schoolId).eq(ExamDetailCourse::getExamDetailId, examDetailId);
         List<ExamDetailCourse> examDetailCourses = examDetailCourseService.list(examDetailCourseQueryWrapper);
@@ -333,7 +345,8 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public Boolean validateData(Long schoolId, Long examDetailId, String packageCode, String lastCode) {
+    public Boolean validateData(Long examDetailId, String packageCode, String lastCode) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         ExamDetail examDetail = examDetailService.getById(examDetailId);
         if (examDetail == null) {
             throw ExceptionResultEnum.ERROR.exception("考场数据有误");
@@ -398,7 +411,8 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public List<Map<String, String>> getBatchUrl(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass) {
+    public List<Map<String, String>> getBatchUrl(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<ClientExamTaskDto> clientExamTaskDtos = examTaskService.listTryTask(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
         List<Map<String, String>> list = new ArrayList<>();
         for (ClientExamTaskDto clientExamTaskDto : clientExamTaskDtos) {
@@ -414,7 +428,8 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public void exportClientPrintTask(HttpServletResponse response, Long schoolId, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate) throws Exception {
+    public void exportClientPrintTask(HttpServletResponse response, Long machineCode, String orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate) throws Exception {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = commonService.listSubOrgIds(null);
         List<ClientPrintTaskDto> printTaskDtoIList = examPrintPlanService.listClientPrintTask(schoolId, machineCode, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, orgIds);
         ExcelUtil.excelExport("印刷管理", ClientPrintTaskDto.class, printTaskDtoIList, response);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailCourseServiceImpl.java

@@ -48,10 +48,12 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
     }
 
     @Override
-    public void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber) {
+    public void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber, String relatePaperType) {
         List<Long> examDetailCourseIds = examDetailCourses.stream().map(m->m.getId()).collect(Collectors.toList());
         UpdateWrapper<ExamDetailCourse> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().set(ExamDetailCourse::getPaperNumber, paperNumber).in(ExamDetailCourse::getId, examDetailCourseIds);
+        updateWrapper.lambda().set(ExamDetailCourse::getPaperNumber, paperNumber)
+                .set(ExamDetailCourse::getPaperType, relatePaperType)
+                .in(ExamDetailCourse::getId, examDetailCourseIds);
         this.update(updateWrapper);
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskDetailServiceImpl.java

@@ -15,6 +15,7 @@ import com.qmth.distributed.print.business.mapper.ExamTaskDetailMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +64,9 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     @Resource
     TBTaskService tbTaskService;
 
+    @Autowired
+    private ExamTaskPaperLogService examTaskPaperLogService;
+
     @Override
     public boolean enable(ExamTaskDetail examTaskDetail) {
         UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
@@ -90,7 +94,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 
         // 更新试卷编号
         List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listDetailCourseByCourseCodeAndPaperNumber(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
-        examDetailCourseService.updatePaperNumber(examDetailCourses, paperParam.getPaperNumber());
+        examDetailCourseService.updatePaperNumber(examDetailCourses, paperParam.getPaperNumber(), paperParam.getRelatePaperType());
 
         // 更新考生关联类型
         examStudentService.updatePaperType(examDetailCourses, paperParam.getRelatePaperType());
@@ -167,6 +171,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 
     @Override
     public boolean paperUpdate(ExamTaskDetail examTaskDetail) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         // todo 前置校验条件，如打印中不能修改
         QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(ExamTaskDetail::getExamTaskId, examTaskDetail.getExamTaskId());
@@ -187,15 +192,15 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                 List<Map> newPaperAttachmentIdsList = JSONObject.parseArray(newPaperAttachmentIds, Map.class);
                 Map<String, String> newPaperAttachmentIdMap = newPaperAttachmentIdsList.stream().collect(Collectors.toMap(m -> m.get("name").toString(), m -> m.get("attachmentId").toString()));
                 for (String paperType : exposedPaperTypes) {
-                    if(!newPaperAttachmentIdMap.containsKey(paperType)){
+                    if (!newPaperAttachmentIdMap.containsKey(paperType)) {
                         throw ExceptionResultEnum.ERROR.exception("已曝光试卷不能删除");
                     } else {
-                        if(!oldPaperAttachmentIdMap.containsKey(paperType)){
+                        if (!oldPaperAttachmentIdMap.containsKey(paperType)) {
                             throw ExceptionResultEnum.ERROR.exception("原试卷卷型有误");
                         }
                         String newAttachmentId = newPaperAttachmentIdMap.get(paperType);
                         String oldAttachmentId = oldPaperAttachmentIdMap.get(paperType);
-                        if(!newAttachmentId.equals(oldAttachmentId)){
+                        if (!newAttachmentId.equals(oldAttachmentId)) {
                             throw ExceptionResultEnum.ERROR.exception("已曝光试卷不能修改");
                         }
                     }
@@ -207,14 +212,27 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 
         // 不需要审核，直接更新
         ExamTask examTask = examTaskService.getById(examTaskDetail.getExamTaskId());
-        if(examTask.getReview()){
-            // todo 加入临时审核表
+        if (examTask.getReview()) {
+            // 加入临时审核表
+            ExamTaskPaperLog examTaskPaperLog = examTaskPaperLogService.getByExamTaskIdAndReview(examTaskDetail.getExamTaskId(), false);
+            if (examTaskPaperLog == null) {
+                examTaskPaperLog = new ExamTaskPaperLog();
+                examTaskPaperLog.setId(SystemConstant.getDbUuid());
+                examTaskPaperLog.setExamTaskId(examTaskDetail.getExamTaskId());
+                examTaskPaperLog.setReview(false);
+            }
+            examTaskPaperLog.setPaperType(examTaskDetail.getPaperType());
+            examTaskPaperLog.setPaperAttachmentIds(examTaskDetail.getPaperAttachmentIds());
+            examTaskPaperLog.setCardId(examTaskDetail.getCardId());
+            examTaskPaperLog.setCreateId(sysUser.getId());
+            examTaskPaperLog.setCreateTime(System.currentTimeMillis());
+            examTaskPaperLogService.saveOrUpdate(examTaskPaperLog);
         } else {
             UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
             updateWrapper.lambda().set(ExamTaskDetail::getPaperAttachmentIds, examTaskDetail.getPaperAttachmentIds()).eq(ExamTaskDetail::getExamTaskId, examTaskDetail.getExamTaskId());
             this.update(updateWrapper);
         }
-        return false;
+        return true;
     }
 
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskPaperLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.ExamTaskPaperLog;
 import com.qmth.distributed.print.business.mapper.ExamTaskPaperLogMapper;
@@ -17,4 +18,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class ExamTaskPaperLogServiceImpl extends ServiceImpl<ExamTaskPaperLogMapper, ExamTaskPaperLog> implements ExamTaskPaperLogService {
 
+    @Override
+    public ExamTaskPaperLog getByExamTaskIdAndReview(Long examTaskId, boolean review) {
+        QueryWrapper<ExamTaskPaperLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ExamTaskPaperLog::getExamTaskId, examTaskId).eq(ExamTaskPaperLog::getReview, review);
+        return this.getOne(queryWrapper);
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -100,6 +100,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Resource
     AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
 
+    @Autowired
+    private ExamTaskPaperLogService examTaskPaperLogService;
+
 
     @Override
     public List<ExamTask> listByCourseCode(Long schoolId, String code) {
@@ -429,7 +432,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
         List<ExamTask> list = new ArrayList<>();
         Set<String> paperNumbers = new HashSet<>();
-        List<Map<String,String>> userList = task.getUsers();
+        List<Map<String, String>> userList = task.getUsers();
 
         for (Map<String, String> userMap : userList) {
             ExamTask examTask = new ExamTask();
@@ -455,7 +458,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             } else {
                 // 试卷编号生成规则：年月日（例如：20100419）+0000（例如：0001）顺序编号
                 String paperNumber = commonService.createPaperNumber(schoolId);
-                userMap.put("paperNumber",paperNumber);
+                userMap.put("paperNumber", paperNumber);
             }
             examTask.setPaperNumber(userMap.get("paperNumber"));
             examTask.setStartTime(task.getStartTime());
@@ -468,13 +471,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
             String userId = userMap.get("userId");
             String specialty = userMap.get("specialty");
-            if (specialty != null && specialty.length() > 0 && !specialty.equals("null")){
+            if (specialty != null && specialty.length() > 0 && !specialty.equals("null")) {
                 examTask.setSpecialty(specialty);
             }
-            if (userId != null && userId.length() > 0 && !userId.equals("null")){
+            if (userId != null && userId.length() > 0 && !userId.equals("null")) {
                 examTask.setUserId(SystemConstant.convertIdToLong(userId));
                 examTask.setStatus(ExamStatusEnum.READY);
-            }else {
+            } else {
                 examTask.setStatus(ExamStatusEnum.NEW);
             }
             examTask.setReview(basicExamRule.getReview());
@@ -616,18 +619,40 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         // 审核日志
         examTaskReviewLogService.save(taskReviewLog);
 
-        // 更新命题任务状态
-        UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
-        ExamStatusEnum statusEnum;
-        if (taskReviewLog.getReviewStatus().name().equals(ReviewStatusEnum.PASS.name())) {
-            statusEnum = ExamStatusEnum.FINISH;
-            // 校验是否可以提交打印状态
-            commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
+        ExamTaskPaperLog examTaskPaperLog = examTaskPaperLogService.getByExamTaskIdAndReview(taskReviewLog.getExamTaskId(), false);
+        if (examTaskPaperLog == null) {
+            // 更新命题任务状态
+            UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
+            ExamStatusEnum statusEnum;
+            if (taskReviewLog.getReviewStatus().name().equals(ReviewStatusEnum.PASS.name())) {
+                statusEnum = ExamStatusEnum.FINISH;
+                // 校验是否可以提交打印状态
+                commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
+            } else {
+                statusEnum = ExamStatusEnum.STAGE;
+            }
+            updateWrapper.lambda().set(ExamTask::getStatus, statusEnum).set(ExamTask::getReviewStatus, taskReviewLog.getReviewStatus()).eq(ExamTask::getId, taskReviewLog.getExamTaskId());
+            return this.update(updateWrapper);
         } else {
-            statusEnum = ExamStatusEnum.STAGE;
+            // 更新记录表状态
+            examTaskPaperLog.setReview(true);
+            examTaskPaperLog.setReviewStatus(taskReviewLog.getReviewStatus());
+            examTaskPaperLog.setUpdateId(sysUser.getId());
+            examTaskPaperLog.setUpdateTime(System.currentTimeMillis());
+            examTaskPaperLogService.updateById(examTaskPaperLog);
+
+            if (taskReviewLog.getReviewStatus().name().equals(ReviewStatusEnum.PASS.name())) {
+                // 通过，更新正式表数据
+                UpdateWrapper<ExamTaskDetail> examTaskDetailUpdateWrapper = new UpdateWrapper<>();
+                examTaskDetailUpdateWrapper.lambda().set(ExamTaskDetail::getPaperType, examTaskPaperLog.getPaperType())
+                        .set(ExamTaskDetail::getPaperAttachmentIds, examTaskPaperLog.getPaperAttachmentIds())
+                        .set(ExamTaskDetail::getCardId, examTaskPaperLog.getCardId())
+                        .eq(ExamTaskDetail::getExamTaskId, taskReviewLog.getExamTaskId());
+                examTaskDetailService.update(examTaskDetailUpdateWrapper);
+                commonService.checkData(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber(), sysUser);
+            }
+            return true;
         }
-        updateWrapper.lambda().set(ExamTask::getStatus, statusEnum).set(ExamTask::getReviewStatus, taskReviewLog.getReviewStatus()).eq(ExamTask::getId, taskReviewLog.getExamTaskId());
-        return this.update(updateWrapper);
     }
 
     @Transactional

distributed-print-business/src/main/resources/mapper/ExamTaskDetailMapper.xml

@@ -39,7 +39,7 @@
             f.real_name userName,
             d.exposed_paper_type exposedPaperType,
             d.unexposed_paper_type unexposedPaperType,
-            d.relate_paper_type relatePaperType,
+            a.paper_type relatePaperType,
             a.total_subjects totalSubjects
         FROM
         (SELECT
@@ -49,6 +49,7 @@
             b.paper_number,
             b.course_code,
             b.course_name,
+            b.paper_type,
             SUM(b.total_subjects) total_subjects
         FROM
             exam_detail a

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -213,8 +213,12 @@
             sys_user c ON a.user_id = c.id
         LEFT JOIN
             sys_user d ON a.create_id = d.id
+        LEFT JOIN
+            exam_task_paper_log e ON a.id = e.exam_task_id AND e.review = false
         <where>
-            a.enable = true and a.review = true and a.status = 'SUBMIT' and a.review_status is null
+            a.enable = true
+            and a.review = true
+            and ((a.status = 'SUBMIT' and a.review_status is null) or (a.status = 'FINISH' and e.id is not null ))
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
@@ -392,17 +396,21 @@
     <select id="applyGetOne" resultType="com.qmth.distributed.print.business.bean.dto.ExamTaskDetailCardDto">
         SELECT
             a.exam_task_id examTaskId,
-            a.paper_type paperType,
-            a.paper_attachment_ids paperAttachmentIds,
-            a.card_id cardId,
+            ifnull(c.paper_type, a.paper_type) paperType,
+            ifnull(c.paper_attachment_ids, a.paper_attachment_ids) paperAttachmentIds,
+            ifnull(c.card_id, a.card_id) cardId,
             a.paper_confirm_attachment_ids paperConfirmAttachmentIds,
             a.remark,
-            b.make_method makeMethod,
-            b.status
+            ifnull(d.make_method, b.make_method) makeMethod,
+            ifnull(d.status, b.status) status
         FROM
             exam_task_detail a
                 LEFT JOIN
+            exam_task_paper_log c ON a.exam_task_id = c.exam_task_id and c.review = false
+                LEFT JOIN
             exam_card b ON a.card_id = b.id
+                left join
+            exam_card d on c.card_id = d.id
         where a.exam_task_id = #{examTaskId}
     </select>
 

distributed-print/src/main/java/com/qmth/distributed/print/api/ClientController.java

@@ -5,29 +5,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.core.enums.Platform;
-import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.distributed.print.business.bean.auth.AuthBean;
-import com.qmth.distributed.print.business.bean.auth.ExpireTimeBean;
 import com.qmth.distributed.print.business.bean.dto.ClientExamStudentDto;
 import com.qmth.distributed.print.business.bean.dto.ClientExamTaskDto;
 import com.qmth.distributed.print.business.bean.dto.ClientPrintTaskDto;
 import com.qmth.distributed.print.business.bean.params.ClientLoginParam;
 import com.qmth.distributed.print.business.bean.result.LoginResult;
 import com.qmth.distributed.print.business.entity.SysUser;
-import com.qmth.distributed.print.business.entity.TBSession;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
-import com.qmth.distributed.print.business.service.*;
-import com.qmth.distributed.print.business.util.AuthUtil;
-import com.qmth.distributed.print.business.util.ExcelUtil;
-import com.qmth.distributed.print.business.util.RedisUtil;
-import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.SignatureEntityTest;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.distributed.print.business.service.ClientService;
+import com.qmth.distributed.print.business.service.CommonService;
+import com.qmth.distributed.print.business.service.SysUserService;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
-import com.qmth.distributed.print.common.util.SessionUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -95,7 +86,6 @@ public class ClientController {
     /**
      * 试卷打样-列表
      *
-     * @param schoolId    学校ID
      * @param machineCode 机器唯一码
      * @param orgId       机构ID
      * @param printPlanId 印刷计划ID
@@ -109,8 +99,7 @@ public class ClientController {
      */
     @ApiOperation(value = "试卷打样-列表")
     @RequestMapping(value = "/paper_try/list", method = RequestMethod.POST)
-    public Result paperTryList(@RequestParam("schoolId") Long schoolId,
-                               @RequestParam("machineCode") String machineCode,
+    public Result paperTryList(@RequestParam("machineCode") String machineCode,
                                @RequestParam("orgId") Long orgId,
                                @RequestParam(value = "printPlanId", required = false) Long printPlanId,
                                @RequestParam(value = "courseCode", required = false) String courseCode,
@@ -119,29 +108,26 @@ public class ClientController {
                                @RequestParam(value = "isPass", required = false) Boolean isPass,
                                @RequestParam("pageNumber") Integer pageNumber,
                                @RequestParam("pageSize") Integer pageSize) {
-        IPage<ClientExamTaskDto> examTasks = clientService.listTryTask(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass, pageNumber, pageSize);
+        IPage<ClientExamTaskDto> examTasks = clientService.listTryTask(machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
     /**
      * 试卷打样-查看/试印/重印
      *
-     * @param schoolId
      * @param examTaskId
      * @return
      */
     @ApiOperation(value = "试卷打样-查看/试印/重印")
     @RequestMapping(value = "/paper_try/print", method = RequestMethod.POST)
-    public Result paperTryPrint(@RequestParam("schoolId") Long schoolId,
-                                @RequestParam("examTaskId") Long examTaskId) {
-        Map<String, String>  map = clientService.getUrl(schoolId, examTaskId);
+    public Result paperTryPrint(@RequestParam("examTaskId") Long examTaskId) {
+        Map<String, String> map = clientService.getUrl(examTaskId);
         return ResultUtil.ok(map);
     }
 
     /**
      * 试卷打样-批量试印
      *
-     * @param schoolId
      * @param machineCode
      * @param orgId
      * @param printPlanId
@@ -153,22 +139,20 @@ public class ClientController {
      */
     @ApiOperation(value = "试卷打样-批量试印")
     @RequestMapping(value = "/paper_try/print_batch", method = RequestMethod.POST)
-    public Result printBatch(@RequestParam("schoolId") Long schoolId,
-                             @RequestParam("machineCode") String machineCode,
+    public Result printBatch(@RequestParam("machineCode") String machineCode,
                              @RequestParam("orgId") Long orgId,
                              @RequestParam(value = "printPlanId", required = false) Long printPlanId,
                              @RequestParam(value = "courseCode", required = false) String courseCode,
                              @RequestParam(value = "paperNumber", required = false) String paperNumber,
                              @RequestParam(value = "isTry", required = false) Boolean isTry,
                              @RequestParam(value = "isPass", required = false) Boolean isPass) {
-        List<Map<String, String>> urls = clientService.getBatchUrl(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
+        List<Map<String, String>> urls = clientService.getBatchUrl(machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
         return ResultUtil.ok(urls);
     }
 
     /**
      * 试卷打样-标记合格状态
      *
-     * @param schoolId
      * @param machineCode
      * @param isPass
      * @param userId
@@ -176,21 +160,19 @@ public class ClientController {
      */
     @ApiOperation(value = "试卷打样-标记合格状态")
     @RequestMapping(value = "/paper_try/tag_pass", method = RequestMethod.POST)
-    public Result paperTryTagPass(@RequestParam("schoolId") Long schoolId,
-                                  @RequestParam("courseCode") String courseCode,
+    public Result paperTryTagPass(@RequestParam("courseCode") String courseCode,
                                   @RequestParam("courseName") String courseName,
                                   @RequestParam("paperNumber") String paperNumber,
                                   @RequestParam("machineCode") String machineCode,
                                   @RequestParam("isPass") Boolean isPass,
                                   @RequestParam("userId") Long userId) {
-        Boolean isSuccess = clientService.tagPass(schoolId, courseCode, courseName, paperNumber, machineCode, isPass, userId);
+        Boolean isSuccess = clientService.tagPass(courseCode, courseName, paperNumber, machineCode, isPass, userId);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 印刷管理-查询列表
      *
-     * @param schoolId
      * @param machineCode
      * @param orgId
      * @param printPlanId
@@ -209,8 +191,7 @@ public class ClientController {
      */
     @ApiOperation(value = "印刷管理-查询列表")
     @RequestMapping(value = "/print/task_list", method = RequestMethod.POST)
-    public Result printTaskList(@RequestParam("schoolId") Long schoolId,
-                                @RequestParam("machineCode") Long machineCode,
+    public Result printTaskList(@RequestParam("machineCode") Long machineCode,
                                 @RequestParam("orgId") String orgId,
                                 @RequestParam(value = "printPlanId", required = false) String printPlanId,
                                 @RequestParam(value = "status", required = false) String status,
@@ -224,15 +205,15 @@ public class ClientController {
                                 @RequestParam(value = "validate", required = false) Boolean validate,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        IPage<ClientPrintTaskDto> printTaskDtoIPage = clientService.listClientPrintTask(schoolId, machineCode, orgId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, pageNumber, pageSize);
+        IPage<ClientPrintTaskDto> printTaskDtoIPage = clientService.listClientPrintTask(machineCode, orgId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate, pageNumber, pageSize);
         return ResultUtil.ok(printTaskDtoIPage);
     }
 
 
     /**
      * 印刷管理-导出
+     *
      * @param response
-     * @param schoolId
      * @param machineCode
      * @param orgId
      * @param printPlanId
@@ -250,26 +231,24 @@ public class ClientController {
     @ApiOperation(value = "印刷管理-导出")
     @RequestMapping(value = "/print/task_list_export", method = RequestMethod.POST)
     public void printTaskListExport(HttpServletResponse response,
-                                      @RequestParam("schoolId") Long schoolId,
-                                      @RequestParam("machineCode") Long machineCode,
-                                      @RequestParam("orgId") String orgId,
-                                      @RequestParam(value = "printPlanId", required = false) String printPlanId,
-                                      @RequestParam(value = "status", required = false) String status,
-                                      @RequestParam(value = "courseCode", required = false) String courseCode,
-                                      @RequestParam(value = "paperNumber", required = false) String paperNumber,
-                                      @RequestParam(value = "examPlace", required = false) String examPlace,
-                                      @RequestParam(value = "examRoom", required = false) String examRoom,
-                                      @RequestParam(value = "examStartTime", required = false) Long examStartTime,
-                                      @RequestParam(value = "examEndTime", required = false) Long examEndTime,
-                                      @RequestParam(value = "isDownload", required = false) Boolean isDownload,
-                                      @RequestParam(value = "validate", required = false) Boolean validate) throws Exception {
-        clientService.exportClientPrintTask(response, schoolId, machineCode, orgId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate);
+                                    @RequestParam("machineCode") Long machineCode,
+                                    @RequestParam("orgId") String orgId,
+                                    @RequestParam(value = "printPlanId", required = false) String printPlanId,
+                                    @RequestParam(value = "status", required = false) String status,
+                                    @RequestParam(value = "courseCode", required = false) String courseCode,
+                                    @RequestParam(value = "paperNumber", required = false) String paperNumber,
+                                    @RequestParam(value = "examPlace", required = false) String examPlace,
+                                    @RequestParam(value = "examRoom", required = false) String examRoom,
+                                    @RequestParam(value = "examStartTime", required = false) Long examStartTime,
+                                    @RequestParam(value = "examEndTime", required = false) Long examEndTime,
+                                    @RequestParam(value = "isDownload", required = false) Boolean isDownload,
+                                    @RequestParam(value = "validate", required = false) Boolean validate) throws Exception {
+        clientService.exportClientPrintTask(response, machineCode, orgId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate);
     }
 
     /**
      * 印刷管理-汇总数据查询
      *
-     * @param schoolId
      * @param machineCode
      * @param orgId
      * @param printPlanId
@@ -286,8 +265,7 @@ public class ClientController {
      */
     @ApiOperation(value = "印刷管理-汇总数据查询")
     @RequestMapping(value = "/print/task_total_data", method = RequestMethod.POST)
-    public Result printTaskTotalData(@RequestParam("schoolId") Long schoolId,
-                                     @RequestParam("machineCode") Long machineCode,
+    public Result printTaskTotalData(@RequestParam("machineCode") Long machineCode,
                                      @RequestParam("orgId") String orgId,
                                      @RequestParam(value = "printPlanId", required = false) String printPlanId,
                                      @RequestParam(value = "status", required = false) String status,
@@ -307,22 +285,19 @@ public class ClientController {
     /**
      * 印刷管理-查看
      *
-     * @param schoolId
      * @param examDetailId
      * @return
      */
     @ApiOperation(value = "印刷管理-查看")
     @RequestMapping(value = "/print/preview", method = RequestMethod.POST)
-    public Result printPreview(@RequestParam("schoolId") Long schoolId,
-                               @RequestParam("examDetailId") Long examDetailId) {
-        Map<String, String> map = clientService.getUrlByExamDetailId(schoolId, examDetailId);
+    public Result printPreview(@RequestParam("examDetailId") Long examDetailId) {
+        Map<String, String> map = clientService.getUrlByExamDetailId(examDetailId);
         return ResultUtil.ok(map);
     }
 
     /**
      * 印刷管理-印刷/缓存数据
      *
-     * @param schoolId
      * @param examDetailId
      * @param machineCode
      * @param printUser
@@ -330,27 +305,24 @@ public class ClientController {
      */
     @ApiOperation(value = "印刷管理-印刷/缓存数据")
     @RequestMapping(value = "/print/get_print_data", method = RequestMethod.POST)
-    public Result printGetPrintData(@RequestParam("schoolId") Long schoolId,
-                                    @RequestParam("examDetailId") Long examDetailId,
+    public Result printGetPrintData(@RequestParam("examDetailId") Long examDetailId,
                                     @RequestParam("machineCode") String machineCode,
                                     @RequestParam("isPrint") Boolean isPrint,
                                     @RequestParam(value = "printUser", required = false) String printUser) {
-        Map<String, Object> map = clientService.getPrintData(schoolId, examDetailId, machineCode, isPrint, printUser);
+        Map<String, Object> map = clientService.getPrintData(examDetailId, machineCode, isPrint, printUser);
         return ResultUtil.ok(map);
     }
 
     /**
      * 印刷管理-批量缓存数据
      *
-     * @param schoolId
      * @param orgId
      * @param machineCode
      * @return
      */
     @ApiOperation(value = "印刷管理-批量缓存数据")
     @RequestMapping(value = "/print/get_print_data_batch", method = RequestMethod.POST)
-    public Result printGetPrintDataBatch(@RequestParam("schoolId") Long schoolId,
-                                         @RequestParam("machineCode") Long machineCode,
+    public Result printGetPrintDataBatch(@RequestParam("machineCode") Long machineCode,
                                          @RequestParam("orgId") String orgId,
                                          @RequestParam(value = "printPlanId", required = false) String printPlanId,
                                          @RequestParam(value = "status", required = false) String status,
@@ -362,12 +334,11 @@ public class ClientController {
                                          @RequestParam(value = "examEndTime", required = false) Long examEndTime,
                                          @RequestParam(value = "isDownload", required = false) Boolean isDownload,
                                          @RequestParam(value = "validate", required = false) Boolean validate) {
-        List<Map<String, Object>> list = clientService.getPrintDataBatch(schoolId, machineCode, orgId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate);
+        List<Map<String, Object>> list = clientService.getPrintDataBatch(machineCode, orgId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, isDownload, validate);
         return ResultUtil.ok(list);
     }
 
     /**
-     * @param schoolId
      * @param examDetailId
      * @param machineCode
      * @param isDownload
@@ -375,18 +346,16 @@ public class ClientController {
      */
     @ApiOperation(value = "印刷管理-缓存后更新状态")
     @RequestMapping(value = "/print/update_download", method = RequestMethod.POST)
-    public Result updateDownload(@RequestParam("schoolId") Long schoolId,
-                                 @RequestParam("examDetailId") Long examDetailId,
+    public Result updateDownload(@RequestParam("examDetailId") Long examDetailId,
                                  @RequestParam("machineCode") String machineCode,
                                  @RequestParam("isDownload") Boolean isDownload) {
-        Boolean isSuccess = clientService.updateDownload(schoolId, examDetailId, machineCode, isDownload);
+        Boolean isSuccess = clientService.updateDownload(examDetailId, machineCode, isDownload);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 印刷管理-校验
      *
-     * @param schoolId
      * @param examDetailId
      * @param packageCode
      * @param lastCode
@@ -394,35 +363,31 @@ public class ClientController {
      */
     @ApiOperation(value = "印刷管理-校验")
     @RequestMapping(value = "/print/validate_data", method = RequestMethod.POST)
-    public Result dataCheck(@RequestParam("schoolId") Long schoolId,
-                            @RequestParam("examDetailId") Long examDetailId,
+    public Result dataCheck(@RequestParam("examDetailId") Long examDetailId,
                             @RequestParam("packageCode") String packageCode,
                             @RequestParam("lastCode") String lastCode) {
-        Boolean isSuccess = clientService.validateData(schoolId, examDetailId, packageCode, lastCode);
+        Boolean isSuccess = clientService.validateData(examDetailId, packageCode, lastCode);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 印刷管理-更新打印进度
      *
-     * @param schoolId
      * @param examDetailId
      * @param printProgress
      * @return
      */
     @ApiOperation(value = "印刷管理-更新打印进度")
     @RequestMapping(value = "/print/update_progress", method = RequestMethod.POST)
-    public Result updateProgress(@RequestParam("schoolId") Long schoolId,
-                                 @RequestParam("examDetailId") Long examDetailId,
+    public Result updateProgress(@RequestParam("examDetailId") Long examDetailId,
                                  @RequestParam("printProgress") Integer printProgress) {
-        Boolean isSuccess = clientService.updatePrintProgress(schoolId, examDetailId, printProgress);
+        Boolean isSuccess = clientService.updatePrintProgress(examDetailId, printProgress);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 重打-查询考生列表
      *
-     * @param schoolId
      * @param examDetailId
      * @param ticketNumber
      * @param studentName
@@ -431,21 +396,19 @@ public class ClientController {
      */
     @ApiOperation(value = "重打-查询考生列表")
     @RequestMapping(value = "/print/list_student", method = RequestMethod.POST)
-    public Result listStudent(@RequestParam("schoolId") Long schoolId,
-                              @RequestParam("examDetailId") Long examDetailId,
+    public Result listStudent(@RequestParam("examDetailId") Long examDetailId,
                               @RequestParam(value = "ticketNumber", required = false) String ticketNumber,
                               @RequestParam(value = "studentName", required = false) String studentName,
                               @RequestParam(value = "courseCode", required = false) String courseCode,
                               @RequestParam("pageNumber") Integer pageNumber,
                               @RequestParam("pageSize") Integer pageSize) {
-        IPage<ClientExamStudentDto> examStudentDtoIPage = clientService.listStudent(schoolId, examDetailId, ticketNumber, studentName, courseCode, pageNumber, pageSize);
+        IPage<ClientExamStudentDto> examStudentDtoIPage = clientService.listStudent(examDetailId, ticketNumber, studentName, courseCode, pageNumber, pageSize);
         return ResultUtil.ok(examStudentDtoIPage);
     }
 
     /**
      * 重打-内容查询
      *
-     * @param schoolId
      * @param examDetailId
      * @param ticketNumber
      * @param type
@@ -453,11 +416,10 @@ public class ClientController {
      */
     @ApiOperation(value = "重打-内容查询")
     @RequestMapping(value = "/print/get_reprint_data", method = RequestMethod.POST)
-    public Result getReprintData(@RequestParam("schoolId") Long schoolId,
-                                 @RequestParam("examDetailId") Long examDetailId,
+    public Result getReprintData(@RequestParam("examDetailId") Long examDetailId,
                                  @RequestParam("ticketNumber") String ticketNumber,
                                  @RequestParam("type") String type) {
-        Map<String, Object> map = clientService.getReprintData(schoolId, examDetailId, ticketNumber, type);
+        Map<String, Object> map = clientService.getReprintData(examDetailId, ticketNumber, type);
         return ResultUtil.ok(map);
     }
 }