xiaofei 1 rok temu
rodzic
commit
17a261e8a0

+ 0 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -97,7 +97,6 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     public IPage<TeachCourseResult> teachCoursePage(Long examId, String courseName, int pageNumber, int pageSize) {
     public IPage<TeachCourseResult> teachCoursePage(Long examId, String courseName, int pageNumber, int pageSize) {
         courseName = SystemConstant.translateSpecificSign(courseName);
         courseName = SystemConstant.translateSpecificSign(courseName);
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
         DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(requestUser.getSchoolId(),
                 requestUser.getId(), ServletUtil.getRequest().getServletPath());
                 requestUser.getId(), ServletUtil.getRequest().getServletPath());
         return this.baseMapper.findTeachCoursePage(new Page<>(pageNumber, pageSize), examId, courseName, requestUser.getSchoolId(), dpr);
         return this.baseMapper.findTeachCoursePage(new Page<>(pageNumber, pageSize), examId, courseName, requestUser.getSchoolId(), dpr);

+ 1 - 10
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/PdfTaskLogicServiceImpl.java

@@ -171,17 +171,8 @@ public class PdfTaskLogicServiceImpl implements PdfTaskLogicService {
         UpdateWrapper<ExamDetail> examDetailQueryWrapper = new UpdateWrapper<>();
         UpdateWrapper<ExamDetail> examDetailQueryWrapper = new UpdateWrapper<>();
         LambdaUpdateWrapper<ExamDetail> lambda = examDetailQueryWrapper.lambda();
         LambdaUpdateWrapper<ExamDetail> lambda = examDetailQueryWrapper.lambda();
         lambda.set(ExamDetail::getStatus, ExamDetailStatusEnum.CREATING);
         lambda.set(ExamDetail::getStatus, ExamDetailStatusEnum.CREATING);
-        if (CreatePdfTypeEnum.ALL.equals(tbTaskPdf.getCreateType()) || CreatePdfTypeEnum.PAPER.equals(tbTaskPdf.getCreateType())) {
-            lambda.set(ExamDetail::getAttachmentId, null);
-        }
-        if (CreatePdfTypeEnum.ALL.equals(tbTaskPdf.getCreateType()) || CreatePdfTypeEnum.CARD_A3.equals(tbTaskPdf.getCreateType())) {
-            lambda.set(ExamDetail::getCardAttachmentId, null);
-        }
-        if (CreatePdfTypeEnum.ALL.equals(tbTaskPdf.getCreateType()) || CreatePdfTypeEnum.SIGN.equals(tbTaskPdf.getCreateType())
-                || CreatePdfTypeEnum.PACKAGE.equals(tbTaskPdf.getCreateType()) || CreatePdfTypeEnum.CHECK_IN.equals(tbTaskPdf.getCreateType())) {
-            lambda.set(ExamDetail::getAttachmentPath, null);
-        }
         lambda.eq(ExamDetail::getId, tbTaskPdf.getId());
         lambda.eq(ExamDetail::getId, tbTaskPdf.getId());
+        lambda.eq(ExamDetail::getStatus, ExamDetailStatusEnum.NEW);
         examDetailService.update(examDetailQueryWrapper);
         examDetailService.update(examDetailQueryWrapper);
 
 
         //所有考场都撤回,印刷任务状态改为就绪
         //所有考场都撤回,印刷任务状态改为就绪