客户端bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ClientPrintTaskDto.java

@@ -27,10 +27,12 @@ public class ClientPrintTaskDto {
     private String examRoom;
     @ExcelProperty(name = "单科次A3（页）", width = 30, index = 9)
     private String singlePagesA3;
+    private String singlePagesA4;
     private Integer pagesA3;
     private Integer pagesA4;
     @ExcelProperty(name = "科次", width = 30, index = 10)
     private Integer totalSubjects;
+    private Integer totalPrint;
     private String status;
     @ExcelProperty(name = "印刷状态", width = 30, index = 11)
     private String statusStr;
@@ -161,6 +163,14 @@ public class ClientPrintTaskDto {
         this.singlePagesA3 = singlePagesA3;
     }
 
+    public String getSinglePagesA4() {
+        return singlePagesA4;
+    }
+
+    public void setSinglePagesA4(String singlePagesA4) {
+        this.singlePagesA4 = singlePagesA4;
+    }
+
     public Integer getPagesA3() {
         return pagesA3;
     }
@@ -185,6 +195,14 @@ public class ClientPrintTaskDto {
         this.totalSubjects = totalSubjects;
     }
 
+    public Integer getTotalPrint() {
+        return totalPrint;
+    }
+
+    public void setTotalPrint(Integer totalPrint) {
+        this.totalPrint = totalPrint;
+    }
+
     public String getStatus() {
         return status;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ClientStatus.java

@@ -37,6 +37,13 @@ public class ClientStatus extends BaseEntity implements Serializable {
     @TableField("exam_task_id")
     private Long examTaskId;
 
+    /**
+     * 命题任务ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("print_plan_id")
+    private Long printPlanId;
+
     /**
      * 课程代码
      */
@@ -101,6 +108,14 @@ public class ClientStatus extends BaseEntity implements Serializable {
         this.examTaskId = examTaskId;
     }
 
+    public Long getPrintPlanId() {
+        return printPlanId;
+    }
+
+    public void setPrintPlanId(Long printPlanId) {
+        this.printPlanId = printPlanId;
+    }
+
     public String getCourseCode() {
         return courseCode;
     }

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

@@ -13,9 +13,9 @@ import java.util.Map;
 public interface ClientService {
     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 examTaskId);
+    Map<String, String> getUrl(Long printPlanId, Long examTaskId);
 
-    Boolean tagPass(String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId);
+    Boolean tagPass(Long printPlanId, String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId);
 
     Boolean updatePrintProgress(Long examDetailId, String machineCode, Integer printProgress);
 

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

@@ -3,8 +3,6 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.entity.ClientStatus;
 
-import java.util.List;
-
 /**
  * <p>
  * 客户端下载状态 服务类
@@ -14,5 +12,5 @@ import java.util.List;
  * @since 2021-04-19
  */
 public interface ClientStatusService extends IService<ClientStatus> {
-    Boolean tagPass(Long schoolId, String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId);
+    Boolean tagPass(Long schoolId, Long printPlanId, String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId);
 }

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

@@ -34,7 +34,7 @@ public interface ExamTaskDetailService extends IService<ExamTaskDetail> {
 
     List<ExamTaskDetail> listByTemplateId(Long templateId);
 
-    Map<String, String>  getUrl(Long schoolId, Long examTaskId);
+    Map<String, String>  getUrl(Long schoolId, Long printPlanId, Long examTaskId);
 
     boolean paperUpdate(ExamTaskDetail examTaskDetail);
 

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

@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
-import com.qmth.distributed.print.business.enums.ExamStatusEnum;
-import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.ExcelUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
@@ -68,15 +66,15 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public Map<String, String> getUrl(Long examTaskId) {
+    public Map<String, String> getUrl(Long printPlanId, Long examTaskId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return examTaskDetailService.getUrl(schoolId, examTaskId);
+        return examTaskDetailService.getUrl(schoolId, printPlanId, examTaskId);
     }
 
     @Override
-    public Boolean tagPass(String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId) {
+    public Boolean tagPass(Long printPlanId, 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);
+        return clientStatusService.tagPass(schoolId, printPlanId, courseCode, courseName, paperNumber, machineCode, isPass, userId);
     }
 
     @Override
@@ -302,9 +300,11 @@ public class ClientServiceImpl implements ClientService {
                 }
                 String examTaskId = examDetailCours.get("examTaskId").toString();
                 UpdateWrapper<ExamTaskDetail> examTaskDetailUpdateWrapper = new UpdateWrapper<>();
+                String exposedPaper = String.join(",", exposedPaperSet);
+                String unexposedPaper = String.join(",", unexposedPaperSet);
                 examTaskDetailUpdateWrapper.lambda()
-                        .set(ExamTaskDetail::getExposedPaperType, String.join(",", exposedPaperSet))
-                        .set(ExamTaskDetail::getUnexposedPaperType, String.join(",", unexposedPaperSet))
+                        .set(ExamTaskDetail::getExposedPaperType, StringUtils.isBlank(exposedPaper) ? null : exposedPaper)
+                        .set(ExamTaskDetail::getUnexposedPaperType, StringUtils.isBlank(unexposedPaper) ? null : unexposedPaper)
                         .eq(ExamTaskDetail::getExamTaskId, examTaskId);
                 examTaskDetailService.update(examTaskDetailUpdateWrapper);
             }
@@ -456,10 +456,11 @@ public class ClientServiceImpl implements ClientService {
         List<Map<String, String>> list = new ArrayList<>();
         for (ClientExamTaskDto clientExamTaskDto : clientExamTaskDtos) {
             Map<String, String> map = new HashMap<>();
+            map.put("printPlanId", clientExamTaskDto.getPrintPlanId());
             map.put("courseCode", clientExamTaskDto.getCourseCode());
             map.put("courseName", clientExamTaskDto.getCourseName());
             map.put("paperNumber", clientExamTaskDto.getPaperNumber());
-            Map<String, String> stringMap = examTaskDetailService.getUrl(schoolId, Long.valueOf(clientExamTaskDto.getExamTaskId()));
+            Map<String, String> stringMap = examTaskDetailService.getUrl(schoolId, printPlanId, Long.valueOf(clientExamTaskDto.getExamTaskId()));
             map.putAll(stringMap);
             list.add(map);
         }
@@ -489,7 +490,7 @@ public class ClientServiceImpl implements ClientService {
                 String pEndTime = simpleDateFormat.format(new Date(m.getPrintEndTime()));
                 m.setPrintEndTimeStr(pEndTime);
             }
-            m.setStatusStr(ExamStatusEnum.valueOf(m.getStatus()).getDesc());
+            m.setStatusStr(ExamDetailStatusEnum.valueOf(m.getStatus()).getDesc());
             m.setValidateStr(m.getValidate() ? "是" : "否");
             m.setDownloadStr(m.getDownload() ? "是" : "否");
             return m;

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

@@ -16,13 +16,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class ClientStatusServiceImpl extends ServiceImpl<ClientStatusMapper, ClientStatus> implements ClientStatusService {
 
-    @Autowired
-    private ExamTaskService examTaskService;
-
     @Override
-    public Boolean tagPass(Long schoolId, String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId) {
+    public Boolean tagPass(Long schoolId, Long printPlanId, String courseCode, String courseName, String paperNumber, String machineCode, Boolean isPass, Long userId) {
         QueryWrapper<ClientStatus> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(ClientStatus::getSchoolId, schoolId).eq(ClientStatus::getCourseCode, courseCode).eq(ClientStatus::getPaperNumber, paperNumber).eq(ClientStatus::getMachineCode, machineCode);
+        queryWrapper.lambda().eq(ClientStatus::getSchoolId, schoolId).eq(ClientStatus::getPrintPlanId, printPlanId).eq(ClientStatus::getCourseCode, courseCode).eq(ClientStatus::getPaperNumber, paperNumber).eq(ClientStatus::getMachineCode, machineCode);
         ClientStatus clientStatus = this.getOne(queryWrapper);
         if(clientStatus != null){
             clientStatus.setPass(isPass);
@@ -37,6 +34,7 @@ public class ClientStatusServiceImpl extends ServiceImpl<ClientStatusMapper, Cli
             clientStatus = new ClientStatus();
             clientStatus.setId(SystemConstant.getDbUuid());
             clientStatus.setSchoolId(schoolId);
+            clientStatus.setPrintPlanId(printPlanId);
             clientStatus.setMachineCode(machineCode);
             clientStatus.setCourseCode(courseCode);
             clientStatus.setCourseName(courseName);

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

@@ -80,6 +80,9 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     @Resource
     AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
 
+    @Autowired
+    ClientStatusService clientStatusService;
+
     private final static Logger log = LoggerFactory.getLogger(ExamDetailServiceImpl.class);
 
     @Transactional(rollbackFor = Exception.class)
@@ -366,6 +369,21 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             printPlanUpdateWrapper.lambda().set(ExamPrintPlan::getStatus, PrintPlanStatusEnum.READY).eq(ExamPrintPlan::getId, detail.getPrintPlanId());
             examPrintPlanService.update(printPlanUpdateWrapper);
         }
+
+        // 当关联课程所有考场都撤回，清除提当前计划下打样记录
+//        List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listByExamDetailIdAndStatus(detail.getId());
+//        for (ExamDetailCourse examDetailCours : examDetailCourses) {
+//            List<ExamDetail> examDetailList = this.listByPrintPlanIdAndCourseCodeAndPaperNumber(detail.getSchoolId(), detail.getPrintPlanId(), examDetailCours.getCourseCode(), examDetailCours.getPaperNumber());
+//            long count = examDetailList.stream().filter(m->!m.getStatus().name().equals(ExamDetailStatusEnum.NEW.name()) && !m.getStatus().name().equals(ExamDetailStatusEnum.READY.name())).count();
+//            if(count == 0){
+//                UpdateWrapper<ClientStatus> clientStatusUpdateWrapper = new UpdateWrapper<>();
+//                clientStatusUpdateWrapper.lambda().eq(ClientStatus::getSchoolId, detail.getSchoolId())
+//                        .eq(ClientStatus::getPrintPlanId, detail.getPrintPlanId())
+//                        .eq(ClientStatus::getCourseCode, examDetailCours.getCourseCode())
+//                        .eq(ClientStatus::getPaperNumber, examDetailCours.getPaperNumber());
+//                clientStatusService.remove(clientStatusUpdateWrapper);
+//            }
+//        }
         return true;
     }
 

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

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.io.IOException;
@@ -142,7 +143,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
         ExamTask examTask = examTaskService.getById(paperParam.getExamTaskId());
         // 校验课程关联考场，是否已经提交打印
         Boolean isCreate = commonService.checkExamDetailStatus(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
-        if(isCreate) {
+        if (isCreate) {
             // 提交印刷的考场，不允许修改关联试卷
             List<ExamDetail> examDetails = examDetailService.listByPrintPlanIdAndCourseCodeAndPaperNumber(examTask.getSchoolId(), paperParam.getPrintPlanId(), examTask.getCourseCode(), examTask.getPaperNumber());
             List<ExamDetail> examDetails1 = examDetails.stream().filter(m -> !ExamDetailStatusEnum.NEW.equals(m.getStatus()) && !ExamDetailStatusEnum.READY.equals(m.getStatus())).collect(Collectors.toList());
@@ -230,24 +231,29 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     }
 
     @Override
-    public Map<String, String> getUrl(Long schoolId, Long examTaskId) {
-        QueryWrapper<ExamTaskDetail> examTaskDetailQueryWrapper = new QueryWrapper<>();
-        examTaskDetailQueryWrapper.lambda().eq(ExamTaskDetail::getExamTaskId, examTaskId);
-        ExamTaskDetail examTaskDetail = this.getOne(examTaskDetailQueryWrapper);
-        if (examTaskDetail != null) {
-            String relatePaperType = examTaskDetail.getRelatePaperType();
-            if (StringUtils.isNotBlank(relatePaperType)) {
-                String paperAttachmentIds = examTaskDetail.getPaperAttachmentIds();
-                List<Map> list = JSONObject.parseArray(paperAttachmentIds, Map.class);
-                String attachmentId = null;
-                for (Map map : list) {
-                    String name = map.get("name").toString();
-                    if (relatePaperType.equals(name)) {
-                        attachmentId = map.get("attachmentId").toString();
+    public Map<String, String> getUrl(Long schoolId, Long printPlanId, Long examTaskId) {
+        ExamTask examTask = examTaskService.getById(examTaskId);
+        List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listByPrintPlanIdAndCourseCodeAndPaperNumber(schoolId, printPlanId, examTask.getCourseCode(), examTask.getPaperNumber());
+        if (!CollectionUtils.isEmpty(examDetailCourses)) {
+            ExamDetailCourse examDetailCourse = examDetailCourses.get(0);
+            QueryWrapper<ExamTaskDetail> examTaskDetailQueryWrapper = new QueryWrapper<>();
+            examTaskDetailQueryWrapper.lambda().eq(ExamTaskDetail::getExamTaskId, examTaskId);
+            ExamTaskDetail examTaskDetail = this.getOne(examTaskDetailQueryWrapper);
+            if (examTaskDetail != null) {
+                String relatePaperType = examTaskDetail.getRelatePaperType();
+                if (StringUtils.isNotBlank(relatePaperType)) {
+                    String paperAttachmentIds = examTaskDetail.getPaperAttachmentIds();
+                    List<Map> list = JSONObject.parseArray(paperAttachmentIds, Map.class);
+                    String attachmentId = null;
+                    for (Map map : list) {
+                        String name = map.get("name").toString();
+                        if (name.equals(examDetailCourse.getPaperType())) {
+                            attachmentId = map.get("attachmentId").toString();
+                        }
+                    }
+                    if (StringUtils.isNotBlank(attachmentId)) {
+                        return commonService.filePreviewByAttachmentId(Long.valueOf(attachmentId), false);
                     }
-                }
-                if (StringUtils.isNotBlank(attachmentId)) {
-                    return commonService.filePreviewByAttachmentId(Long.valueOf(attachmentId), false);
                 }
             }
         }

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

@@ -270,6 +270,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Override
     public ExamTaskImportDto importFile(MultipartFile file) throws IOException, NoSuchFieldException {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(file.getInputStream(), Lists.newArrayList(ExamTaskTempDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             Map<String, String> courseCodePaperNumberMap = new HashMap<>();
             List<ExcelError> excelErrorTemp = new ArrayList<>();
@@ -291,7 +292,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
                     // 课程是否存在并且与名称对应
                     QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.lambda().eq(BasicCourse::getCode, userImportDto.getCourseCode());
+                    queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, userImportDto.getCourseCode());
                     BasicCourse course = basicCourseService.getOne(queryWrapper);
                     if (course == null) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程代码]在系统中不存在"));

distributed-print-business/src/main/resources/db/init-table.sql

@@ -241,6 +241,7 @@ CREATE TABLE `client_status`  (
   `school_id` bigint(20) NULL DEFAULT NULL,
   `machine_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '机器唯一码',
   `exam_task_id` bigint(20) NULL COMMENT '命题任务ID',
+  `print_plan_id` bigint(20) NULL COMMENT '印刷计划ID',
   `course_code` varchar(100) NOT NULL COMMENT '课程代码',
   `course_name` varchar(200) NOT NULL COMMENT '课程名称',
   `paper_number` varchar(50) NOT NULL COMMENT '试卷编号',

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

@@ -50,10 +50,6 @@
             exam_task b ON a.school_id = b.school_id
                 AND a.course_code = b.course_code
                 AND a.paper_number = b.paper_number
-                LEFT JOIN
-            exam_task_detail c ON b.id = c.exam_task_id
-                LEFT JOIN
-            exam_card_detail d ON c.card_id = d.card_id
         WHERE
             a.exam_detail_id = #{examDetailId} AND b.status != #{status}
     </select>

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

@@ -137,6 +137,7 @@
             exam_detail b ON a.id = b.print_plan_id
                 JOIN
             (SELECT
+                b.print_plan_id,
                 exam_detail_id,
                     GROUP_CONCAT(CONCAT(a.course_name, '(', a.course_code, ')')) courseNameCode,
                     GROUP_CONCAT(a.paper_number) paperNumber,
@@ -159,7 +160,7 @@
                 AND a.course_code = b.course_code
                 AND a.paper_number = b.paper_number
                 AND b.machine_code = #{machineCode}
-            GROUP BY exam_detail_id) c ON b.id = c.exam_detail_id
+            GROUP BY b.print_plan_id, exam_detail_id) c ON a.id = c.print_plan_id and b.id = c.exam_detail_id
                 LEFT JOIN
             sys_user e ON b.print_user = e.login_name
                 LEFT JOIN

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

@@ -128,8 +128,9 @@ public class ClientController {
      */
     @ApiOperation(value = "试卷打样-查看/试印/重印")
     @RequestMapping(value = "/paper_try/print", method = RequestMethod.POST)
-    public Result paperTryPrint(@RequestParam("examTaskId") Long examTaskId) {
-        Map<String, String> map = clientService.getUrl(examTaskId);
+    public Result paperTryPrint(@RequestParam("printPlanId") Long printPlanId,
+                                @RequestParam("examTaskId") Long examTaskId) {
+        Map<String, String> map = clientService.getUrl(printPlanId, examTaskId);
         return ResultUtil.ok(map);
     }
 
@@ -168,13 +169,14 @@ public class ClientController {
      */
     @ApiOperation(value = "试卷打样-标记合格状态")
     @RequestMapping(value = "/paper_try/tag_pass", method = RequestMethod.POST)
-    public Result paperTryTagPass(@RequestParam("courseCode") String courseCode,
+    public Result paperTryTagPass(@RequestParam("printPlanId") Long printPlanId,
+                                  @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(courseCode, courseName, paperNumber, machineCode, isPass, userId);
+        Boolean isSuccess = clientService.tagPass(printPlanId, courseCode, courseName, paperNumber, machineCode, isPass, userId);
         return ResultUtil.ok(isSuccess);
     }