印刷任务管理

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

@@ -0,0 +1,108 @@
+package com.qmth.distributed.print.business.bean.dto;
+
+/**
+ * @Date: 2021/3/31.
+ */
+public class ClientExamTaskDto {
+
+    private String examTaskId;
+    private String printPlanName;
+    private String paperNumber;
+    private String courseCode;
+    private String courseName;
+    private String specialty;
+    private String userId;
+    private String userName;
+    private Boolean isTry;
+    private Boolean isPass;
+    private Long tryTime;
+
+
+    public String getExamTaskId() {
+        return examTaskId;
+    }
+
+    public void setExamTaskId(String examTaskId) {
+        this.examTaskId = examTaskId;
+    }
+
+    public String getPrintPlanName() {
+        return printPlanName;
+    }
+
+    public void setPrintPlanName(String printPlanName) {
+        this.printPlanName = printPlanName;
+    }
+
+    public String getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getSpecialty() {
+        return specialty;
+    }
+
+    public void setSpecialty(String specialty) {
+        this.specialty = specialty;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Boolean getTry() {
+        return isTry;
+    }
+
+    public void setTry(Boolean aTry) {
+        isTry = aTry;
+    }
+
+    public Boolean getPass() {
+        return isPass;
+    }
+
+    public void setPass(Boolean pass) {
+        isPass = pass;
+    }
+
+    public Long getTryTime() {
+        return tryTime;
+    }
+
+    public void setTryTime(Long tryTime) {
+        this.tryTime = tryTime;
+    }
+}

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

@@ -0,0 +1,170 @@
+package com.qmth.distributed.print.business.bean.dto;
+
+/**
+ * @Date: 2021/3/29.
+ */
+public class ClientPrintTaskDto {
+
+    private String examDetailId;
+    private String printPlanId;
+    private String printPlanName;
+    private Long examStartTime;
+    private Long examEndTime;
+    private String courseNameCode;
+    private String paperNumber;
+    private String examPlace;
+    private String examRoom;
+    private String singlePagesA3;
+    private Integer pagesA3;
+    private Integer pagesA4;
+    private Integer totalSubjects;
+    private String status;
+    private Boolean validate;
+    private Long printStartTime;
+    private Long printEndTime;
+    private String packageCode;
+
+    public String getExamDetailId() {
+        return examDetailId;
+    }
+
+    public void setExamDetailId(String examDetailId) {
+        this.examDetailId = examDetailId;
+    }
+
+    public String getPrintPlanId() {
+        return printPlanId;
+    }
+
+    public void setPrintPlanId(String printPlanId) {
+        this.printPlanId = printPlanId;
+    }
+
+    public String getPrintPlanName() {
+        return printPlanName;
+    }
+
+    public void setPrintPlanName(String printPlanName) {
+        this.printPlanName = printPlanName;
+    }
+
+    public Long getExamStartTime() {
+        return examStartTime;
+    }
+
+    public void setExamStartTime(Long examStartTime) {
+        this.examStartTime = examStartTime;
+    }
+
+    public Long getExamEndTime() {
+        return examEndTime;
+    }
+
+    public void setExamEndTime(Long examEndTime) {
+        this.examEndTime = examEndTime;
+    }
+
+    public String getCourseNameCode() {
+        return courseNameCode;
+    }
+
+    public void setCourseNameCode(String courseNameCode) {
+        this.courseNameCode = courseNameCode;
+    }
+
+    public String getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
+    }
+
+    public String getExamPlace() {
+        return examPlace;
+    }
+
+    public void setExamPlace(String examPlace) {
+        this.examPlace = examPlace;
+    }
+
+    public String getExamRoom() {
+        return examRoom;
+    }
+
+    public void setExamRoom(String examRoom) {
+        this.examRoom = examRoom;
+    }
+
+    public String getSinglePagesA3() {
+        return singlePagesA3;
+    }
+
+    public void setSinglePagesA3(String singlePagesA3) {
+        this.singlePagesA3 = singlePagesA3;
+    }
+
+    public Integer getPagesA3() {
+        return pagesA3;
+    }
+
+    public void setPagesA3(Integer pagesA3) {
+        this.pagesA3 = pagesA3;
+    }
+
+    public Integer getPagesA4() {
+        return pagesA4;
+    }
+
+    public void setPagesA4(Integer pagesA4) {
+        this.pagesA4 = pagesA4;
+    }
+
+    public Integer getTotalSubjects() {
+        return totalSubjects;
+    }
+
+    public void setTotalSubjects(Integer totalSubjects) {
+        this.totalSubjects = totalSubjects;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public Boolean getValidate() {
+        return validate;
+    }
+
+    public void setValidate(Boolean validate) {
+        this.validate = validate;
+    }
+
+    public Long getPrintStartTime() {
+        return printStartTime;
+    }
+
+    public void setPrintStartTime(Long printStartTime) {
+        this.printStartTime = printStartTime;
+    }
+
+    public Long getPrintEndTime() {
+        return printEndTime;
+    }
+
+    public void setPrintEndTime(Long printEndTime) {
+        this.printEndTime = printEndTime;
+    }
+
+    public String getPackageCode() {
+        return packageCode;
+    }
+
+    public void setPackageCode(String packageCode) {
+        this.packageCode = packageCode;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/RelatePaperParam.java

@@ -9,6 +9,7 @@ public class RelatePaperParam extends BasePage {
 
     private Long printPlanId;
     private Long examTaskId;
+    private String paperNumber;
     private String relatePaperType;
 
     public Long getPrintPlanId() {
@@ -27,6 +28,14 @@ public class RelatePaperParam extends BasePage {
         this.examTaskId = examTaskId;
     }
 
+    public String getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(String paperNumber) {
+        this.paperNumber = paperNumber;
+    }
+
     public String getRelatePaperType() {
         return relatePaperType;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ClientStatusMapper.java

@@ -0,0 +1,16 @@
+package com.qmth.distributed.print.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.distributed.print.business.entity.ClientStatus;
+
+/**
+ * <p>
+ * 客户端状态 Mapper 接口
+ * </p>
+ *
+ * @author xf
+ * @since 2021-04-19
+ */
+public interface ClientStatusMapper extends BaseMapper<ClientStatus> {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -71,4 +71,5 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
                                           @Param("schoolId") Long schoolId,
                                           @Param("status") String...status);
 
+    IPage<ClientExamTaskDto> listClientExamTaskPage(Page<ClientExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("machineCode") String machineCode, @Param("printPlanId") Long printPlanId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("isTry") Boolean isTry, @Param("isPass") Boolean isPass, @Param("orgIds") Set<Long> orgIds);
 }

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

@@ -0,0 +1,15 @@
+package com.qmth.distributed.print.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.entity.ClientStatus;
+
+/**
+ * <p>
+ * 客户端下载状态 服务类
+ * </p>
+ *
+ * @author xf
+ * @since 2021-04-19
+ */
+public interface ClientStatusService extends IService<ClientStatus> {
+}

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

@@ -161,5 +161,5 @@ public interface CommonService {
      * 根据orgId查询所有子机构ID集合
      * @return
      */
-    public Set<Long> listSubOrgIds();
+    public Set<Long> listSubOrgIds(Long orgId);
 }

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

@@ -25,4 +25,6 @@ public interface ExamDetailCourseService extends IService<ExamDetailCourse> {
     List<ExamDetailCourse> listByExamDetailId(Long examDetailId);
 
     List<ExamDetailCourse> listDetailCourseByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
+
+    void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber);
 }

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

@@ -92,4 +92,5 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     ExamTask getByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
 
+    IPage<ClientExamTaskDto> listTryTask(Long schoolId, String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass, Integer pageNumber, Integer pageSize);
 }

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

@@ -67,7 +67,7 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
         if (StringUtils.isNotBlank(param)) {
             queryWrapper.lambda().like(BasicCardRule::getName, param);
         }
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         return this.baseMapper.list(schoolId, param, orgIds);
     }
 

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

@@ -0,0 +1,14 @@
+package com.qmth.distributed.print.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.entity.ClientStatus;
+import com.qmth.distributed.print.business.mapper.ClientStatusMapper;
+import com.qmth.distributed.print.business.service.ClientStatusService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Date: 2021/4/19.
+ */
+@Service
+public class ClientStatusServiceImpl extends ServiceImpl<ClientStatusMapper, ClientStatus> implements ClientStatusService {
+}

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

@@ -528,25 +528,24 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @Override
-    public Set<Long> listSubOrgIds() {
+    public Set<Long> listSubOrgIds(Long id) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Long orgId = sysUser.getOrgId();
+        Long orgId;
+        if(id == null){
+            orgId = sysUser.getOrgId();
+        } else {
+            orgId = id;
+        }
         if (orgId == null) {
             return null;
         }
         List<OrgDto> orgDtos = sysOrgService.listOrgTree();
-//        String string = "[{\"id\":\"114751029785919488\",\"schoolId\":\"1\",\"code\":\"012453\",\"name\":\"计算机学院\",\"parentId\":null,\"enable\":true,\"children\":[{\"id\":\"114751144823095296\",\"schoolId\":\"1\",\"code\":\"451245\",\"name\":\"硬件学院\",\"parentId\":114751029785919488,\"enable\":true,\"children\":[]}]},{\"id\":\"114751249978490880\",\"schoolId\":\"1\",\"code\":\"42152\",\"name\":\"化学学院\",\"parentId\":null,\"enable\":true,\"children\":[]},{\"id\":\"114751303661387776\",\"schoolId\":\"1\",\"code\":\"en1254\",\"name\":\"外国语学院\",\"parentId\":null,\"enable\":true,\"children\":[]},{\"id\":\"1\",\"schoolId\":\"1\",\"code\":\"O00001\",\"name\":\"物理学院\",\"parentId\":null,\"enable\":true,\"children\":[{\"id\":\"114751422234361856\",\"schoolId\":\"1\",\"code\":\"784512\",\"name\":\"光电系\",\"parentId\":1,\"enable\":true,\"children\":[{\"id\":\"114751422234361857\",\"schoolId\":\"1\",\"code\":\"784512\",\"name\":\"光电系\",\"parentId\":114751422234361856,\"enable\":true,\"children\":[]},{\"id\":\"114751422234361858\",\"schoolId\":\"1\",\"code\":\"784512\",\"name\":\"光电系\",\"parentId\":114751422234361856,\"enable\":true,\"children\":[]}]}]}]";
-//        List<OrgDto> orgDtos = JSONObject.parseArray(string, OrgDto.class);
         Set<Long> stringSet = new HashSet<>();
         stringSet.add(orgId);
         stringSet = getOrgIds(stringSet, orgDtos, orgId);
         return stringSet;
     }
 
-    public static void main(String[] args) {
-        new CommonServiceImpl().listSubOrgIds();
-    }
-
     private Set<Long> getOrgIds(Set<Long> stringSet, List<OrgDto> orgDtos, Long parentId) {
         for (OrgDto orgDto : orgDtos) {
             Long tempParentId = orgDto.getParentId();

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

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
@@ -43,4 +44,10 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
         List<ExamDetailCourse> examDetailCourses = this.list(examDetailCourseQueryWrapper);
         return examDetailCourses;
     }
+
+    @Override
+    public void updatePaperNumber(List<ExamDetailCourse> examDetailCourses, String paperNumber) {
+        UpdateWrapper<ExamDetailCourse> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().set(ExamDetailCourse::getPaperNumber, paperNumber).in(ExamDetailCourse::getId, examDetailCourses);
+    }
 }

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

@@ -98,7 +98,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     @Override
     public IPage<PrintTaskDto> listPrintTask(Long printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<PrintTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<PrintTaskDto> pirntTaskDtoIPage = this.baseMapper.listPrintTask(page, schoolId, printPlanId, status, courseCode, paperNumber, examPlace, examRoom, examStartTime, examEndTime, orgIds);
         return pirntTaskDtoIPage;

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

@@ -60,7 +60,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
     @Transactional(rollbackFor = Exception.class)
     @Override
     public IPage<PrintPlanResult> printPlanPage(Long schoolId, Long printPlanId, PrintPlanStatusEnum status, Long startTime, Long endTime, int pageNumber, int pageSize) {
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         IPage<PrintPlanResult> page = examPrintPlanMapper.findPrintPlanPage(new Page<>(pageNumber, pageSize), schoolId, printPlanId, status, startTime, endTime, orgIds);
         List<PrintPlanResult> list = page.getRecords();
         for (PrintPlanResult printPlanResult : list) {
@@ -89,7 +89,7 @@ public class ExamPrintPlanServiceImpl extends ServiceImpl<ExamPrintPlanMapper, E
             printPlanBriefList.add(new PrintPlanBrief(id, name ,status));
         }*/
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         List<PrintPlanBrief> list = this.baseMapper.list(schoolId, orgIds);
         return list;
     }

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

@@ -77,17 +77,20 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
             throw ExceptionResultEnum.ERROR.exception("有考场已开始打印，不能修改");
         }
 
-        /* // 异常任务中修改类型
         // 更新关联卷型
+        ExamTask newExamTask = examTaskService.getByCourseCodeAndPaperNumber(examTask.getSchoolId(), examTask.getCourseCode(), paperParam.getPaperNumber());
         UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().set(ExamTaskDetail::getRelatePaperType, paperParam.getRelatePaperType()).eq(ExamTaskDetail::getExamTaskId, paperParam.getExamTaskId());
+        updateWrapper.lambda().set(ExamTaskDetail::getRelatePaperType, paperParam.getRelatePaperType()).eq(ExamTaskDetail::getExamTaskId, newExamTask.getId());
         this.update(updateWrapper);
 
+        // 更新试卷编号
+        List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listDetailCourseByCourseCodeAndPaperNumber(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
+        examDetailCourseService.updatePaperNumber(examDetailCourses, paperParam.getPaperNumber());
+
         // 更新考生关联类型
-        examStudentService.updatePaperType(examDetailCourses, paperParam.getRelatePaperType());*/
+        examStudentService.updatePaperType(examDetailCourses, paperParam.getRelatePaperType());
 
         // 重新生成pdf
-        List<ExamDetailCourse> examDetailCourses = examDetailCourseService.listDetailCourseByCourseCodeAndPaperNumber(examTask.getSchoolId(), examTask.getCourseCode(), examTask.getPaperNumber());
         List<Long> examDetailCourseIds = examDetailCourses.stream().map(m -> m.getId()).collect(Collectors.toList());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.CREATE_PDF, paperParam.getPrintPlanId(), sysUser);
@@ -100,7 +103,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     @Override
     public IPage<ExamTaskDetailDto> list(String relateType, Long printPlanId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDetailDto> examDetailDtoIPage = this.baseMapper.listPage(page, schoolId, relateType, printPlanId, courseCode, paperNumber, orgIds);
         return examDetailDtoIPage;

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

@@ -98,7 +98,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Override
     public IPage<ExamTaskDto> list(Boolean enable, String status, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listPage(page, schoolId, enable, status, cardRuleId, courseCode, paperNumber, startTime, endTime, orgIds);
         return examTaskDtoIPage;
@@ -445,9 +445,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     public IPage<ExamTaskDto> listTaskApply(String auditStatus, String reviewStatus, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
-        String[] strings = new String[]{ExamStatusEnum.NEW.name(), ExamStatusEnum.SUBMIT.name(), ExamStatusEnum.FINISH.name()};
+        String[] strings = new String[]{ExamStatusEnum.NEW.name(), ExamStatusEnum.SUBMIT.name()};
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskApply(page, schoolId, auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, strings, sysUser.getId(), orgIds);
         return examTaskDtoIPage;
     }
@@ -455,7 +455,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Override
     public IPage<ExamTaskDto> listTaskReviewUnaudited(String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewUnaudited(page, schoolId, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, orgIds);
         return examTaskDtoIPage;
@@ -464,7 +464,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Override
     public IPage<ExamTaskDto> listTaskReviewAudited(String reviewStatus, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewAudited(page, schoolId, reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, orgIds);
         return examTaskDtoIPage;
@@ -524,7 +524,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Override
     public IPage<ExamTaskDetailDto> listTaskPaper(String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDetailDto> examTaskDtoIPage = this.baseMapper.listTaskPaper(page, schoolId, courseCode, paperNumber, startTime, endTime, orgIds);
         return examTaskDtoIPage;
@@ -731,4 +731,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 .eq(ExamTask::getPaperNumber, paperNumber);
         return this.getOne(queryWrapper);
     }
+
+    @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) {
+        Set<Long> orgIds = commonService.listSubOrgIds(orgId);
+        Page<ClientExamTaskDto> page = new Page<>(pageNumber, pageSize);
+        IPage<ClientExamTaskDto> examTaskDtoIPage = this.baseMapper.listClientExamTaskPage(page, schoolId, machineCode, printPlanId, courseCode, paperNumber, isTry, isPass, orgIds);
+        return examTaskDtoIPage;
+    }
 }

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

@@ -256,7 +256,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public List<BlurryUserDto> listUser(String courseCode, String param) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Set<Long> orgIds = commonService.listSubOrgIds();
+        Set<Long> orgIds = commonService.listSubOrgIds(null);
         return this.baseMapper.listUser(schoolId, RoleTypeEnum.QUESTION_TEACHER.name(), courseCode, param, orgIds);
     }
 

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

@@ -423,6 +423,8 @@
             <include refid="myworkSubmitCommonFoot" />
         </where>
     </select>
+    <select id="listClientExamTaskPage"
+            resultType="com.qmth.distributed.print.business.bean.dto.ClientExamTaskDto"></select>
 
     <sql id="myworkCommonHead">
         SELECT

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

@@ -1,12 +1,17 @@
 package com.qmth.distributed.print.api;
 
+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.distributed.print.business.bean.dto.ClientExamTaskDto;
 import com.qmth.distributed.print.business.entity.SysUser;
+import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.common.util.Result;
+import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -18,28 +23,34 @@ import org.springframework.web.bind.annotation.*;
 @Aac(auth = BOOL.FALSE)
 public class ClientController {
 
+    @Autowired
+    private ExamTaskService examTaskService;
+
+
     /**
      * 登录
+     *
      * @param sysUser
      * @return
      */
     @ApiOperation(value = "登录")
     @RequestMapping(value = "/user/login", method = RequestMethod.POST)
-    public Result login(@RequestBody SysUser sysUser){
+    public Result login(@RequestBody SysUser sysUser) {
 
         return null;
     }
 
     /**
      * 试卷打样-列表
-     * @param schoolId 学校ID
+     *
+     * @param schoolId    学校ID
      * @param machineCode 机器唯一码
-     * @param orgId 机构ID
+     * @param orgId       机构ID
      * @param printPlanId 印刷计划ID
-     * @param courseCode 课程代码
+     * @param courseCode  课程代码
      * @param paperNumber 试卷编号
-     * @param isTry 是否打样
-     * @param isPass 是否合格
+     * @param isTry       是否打样
+     * @param isPass      是否合格
      * @param pageNumber
      * @param pageSize
      * @return
@@ -53,15 +64,16 @@ public class ClientController {
                                @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,
+                               @RequestParam(value = "isPass", required = false) Boolean isPass,
                                @RequestParam("pageNumber") Integer pageNumber,
-                               @RequestParam("pageSize") Integer pageSize){
-
-        return null;
+                               @RequestParam("pageSize") Integer pageSize) {
+        IPage<ClientExamTaskDto> examTasks = examTaskService.listTryTask(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass, pageNumber, pageSize);
+        return ResultUtil.ok(examTasks);
     }
 
     /**
      * 试卷打样-查看/试印/重印
+     *
      * @param schoolId
      * @param examTaskId
      * @return
@@ -69,7 +81,252 @@ public class ClientController {
     @ApiOperation(value = "试卷打样-查看/试印/重印")
     @RequestMapping(value = "/paper_try/print", method = RequestMethod.POST)
     public Result paperTryPrint(@RequestParam("schoolId") Long schoolId,
-                               @RequestParam("examTaskId") Long examTaskId){
+                                @RequestParam("examTaskId") Long examTaskId) {
+
+        return null;
+    }
+
+    /**
+     * 试卷打样-标记合格状态
+     *
+     * @param schoolId
+     * @param examTaskId
+     * @param machineCode
+     * @param isPass
+     * @param courseCode
+     * @param paperNumber
+     * @return
+     */
+    @ApiOperation(value = "试卷打样-标记合格状态")
+    @RequestMapping(value = "/paper_try/tag_pass", method = RequestMethod.POST)
+    public Result paperTryTagPass(@RequestParam("schoolId") Long schoolId,
+                                  @RequestParam("examTaskId") Long examTaskId,
+                                  @RequestParam("machineCode") String machineCode,
+                                  @RequestParam("isPass") Boolean isPass,
+                                  @RequestParam("courseCode") String courseCode,
+                                  @RequestParam("paperNumber") String paperNumber) {
+
+        return null;
+    }
+
+    /**
+     * 印刷管理-查询列表
+     *
+     * @param schoolId
+     * @param machineCode
+     * @param orgId
+     * @param printPlanId
+     * @param status
+     * @param courseCode
+     * @param paperNumber
+     * @param examPlace
+     * @param examRoom
+     * @param examStartTime
+     * @param examEndTime
+     * @param isDownload
+     * @param validate
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "印刷管理-查询列表")
+    @RequestMapping(value = "/print/task_list", method = RequestMethod.POST)
+    public Result printTaskList(@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,
+                                @RequestParam("pageNumber") Integer pageNumber,
+                                @RequestParam("pageSize") Integer pageSize) {
+
+        return null;
+    }
+
+    /**
+     * 印刷管理-汇总数据查询
+     *
+     * @param schoolId
+     * @param machineCode
+     * @param orgId
+     * @param printPlanId
+     * @param status
+     * @param courseCode
+     * @param paperNumber
+     * @param examPlace
+     * @param examRoom
+     * @param examStartTime
+     * @param examEndTime
+     * @param isDownload
+     * @param validate
+     * @return
+     */
+    @ApiOperation(value = "印刷管理-汇总数据查询")
+    @RequestMapping(value = "/print/task_total_data", method = RequestMethod.POST)
+    public Result printTaskTotalData(@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) {
+
+        return null;
+    }
+
+
+    /**
+     * 印刷管理-查看
+     *
+     * @param schoolId
+     * @param orgId
+     * @param examDetailId
+     * @return
+     */
+    @ApiOperation(value = "印刷管理-查看")
+    @RequestMapping(value = "/print/preview", method = RequestMethod.POST)
+    public Result printPreview(@RequestParam("schoolId") Long schoolId,
+                               @RequestParam("orgId") Long orgId,
+                               @RequestParam("examDetailId") Long examDetailId) {
+
+        return null;
+    }
+
+    /**
+     * 印刷管理-印刷/缓存数据
+     *
+     * @param schoolId
+     * @param orgId
+     * @param examDetailId
+     * @param machineCode
+     * @param printUser
+     * @return
+     */
+    @ApiOperation(value = "印刷管理-印刷/缓存数据")
+    @RequestMapping(value = "/print/get_print_data", method = RequestMethod.POST)
+    public Result printGetPrintData(@RequestParam("schoolId") Long schoolId,
+                                    @RequestParam("orgId") Long orgId,
+                                    @RequestParam("examDetailId") Long examDetailId,
+                                    @RequestParam("machineCode") String machineCode,
+                                    @RequestParam("printUser") String printUser) {
+
+        return null;
+    }
+
+    /**
+     * 印刷管理-批量缓存数据
+     *
+     * @param schoolId
+     * @param orgId
+     * @param examDetailId
+     * @param machineCode
+     * @return
+     */
+    @ApiOperation(value = "印刷管理-批量缓存数据")
+    @RequestMapping(value = "/print/get_print_data_batch", method = RequestMethod.POST)
+    public Result printGetPrintDataBatch(@RequestParam("schoolId") Long schoolId,
+                                         @RequestParam("orgId") Long orgId,
+                                         @RequestParam("examDetailId") Long examDetailId,
+                                         @RequestParam("machineCode") String machineCode) {
+
+        return null;
+    }
+
+    /**
+     * 印刷管理-校验
+     *
+     * @param schoolId
+     * @param orgId
+     * @param examDetailId
+     * @param machineCode
+     * @param packageCode
+     * @param lastCode
+     * @return
+     */
+    @ApiOperation(value = "印刷管理-校验")
+    @RequestMapping(value = "/print/data_check", method = RequestMethod.POST)
+    public Result dataCheck(@RequestParam("schoolId") Long schoolId,
+                            @RequestParam("orgId") Long orgId,
+                            @RequestParam("examDetailId") Long examDetailId,
+                            @RequestParam("machineCode") String machineCode,
+                            @RequestParam("packageCode") String packageCode,
+                            @RequestParam("lastCode") String lastCode) {
+
+        return null;
+    }
+
+    /**
+     * 印刷管理-更新打印进度
+     *
+     * @param schoolId
+     * @param orgId
+     * @param examDetailId
+     * @param printProgress
+     * @return
+     */
+    @ApiOperation(value = "印刷管理-更新打印进度")
+    @RequestMapping(value = "/print/update_progress", method = RequestMethod.POST)
+    public Result updateProgress(@RequestParam("schoolId") Long schoolId,
+                                 @RequestParam("orgId") Long orgId,
+                                 @RequestParam("examDetailId") Long examDetailId,
+                                 @RequestParam("printProgress") Integer printProgress) {
+
+        return null;
+    }
+
+    /**
+     * 重打-查询考生列表
+     *
+     * @param schoolId
+     * @param orgId
+     * @param examDetailId
+     * @param ticketNumber
+     * @param studentName
+     * @param courseCode
+     * @return
+     */
+    @ApiOperation(value = "重打-查询考生列表")
+    @RequestMapping(value = "/print/list_student", method = RequestMethod.POST)
+    public Result listStudent(@RequestParam("schoolId") Long schoolId,
+                              @RequestParam("orgId") Long orgId,
+                              @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) {
+
+        return null;
+    }
+
+    /**
+     * 重打-内容查询
+     *
+     * @param schoolId
+     * @param orgId
+     * @param examDetailId
+     * @param ticketNumber
+     * @param type
+     * @return
+     */
+    @ApiOperation(value = "重打-内容查询")
+    @RequestMapping(value = "/print/get_reprint_data", method = RequestMethod.POST)
+    public Result getReprintData(@RequestParam("schoolId") Long schoolId,
+                                 @RequestParam("orgId") Long orgId,
+                                 @RequestParam("examDetailId") Long examDetailId,
+                                 @RequestParam("ticketNumber") String ticketNumber,
+                                 @RequestParam("type") String type) {
 
         return null;
     }

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

@@ -273,13 +273,13 @@ public class ExamPrintPlanController {
     /**
      * 印刷任务管理-查看PDF
      *
-     * @param examDetailId
+     * @param map
      * @return
      */
     @ApiOperation(value = "印刷任务管理-查看PDF")
     @RequestMapping(value = "/task_view_pdf", method = RequestMethod.POST)
-    public Result taskViewPDF(@RequestParam Long examDetailId) {
-        String path = examDetailService.taskViewPDF(examDetailId);
+    public Result taskViewPDF(@RequestBody  Map<String, Long> map) {
+        String path = examDetailService.taskViewPDF(map.get("examDetailId"));
         return ResultUtil.ok(path);
     }