浏览代码

Merge branch 'dev' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev

xiaof 4 年之前
父节点
当前提交
dfde22f48a

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

@@ -332,7 +332,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
         QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
         QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
         tbTaskQueryWrapper.lambda().eq(TBTask::getType, TaskTypeEnum.CREATE_PDF)
         tbTaskQueryWrapper.lambda().eq(TBTask::getType, TaskTypeEnum.CREATE_PDF)
                 .eq(TBTask::getStatus, TaskStatusEnum.FINISH).isNotNull(TBTask::getStatus)
                 .eq(TBTask::getStatus, TaskStatusEnum.FINISH).isNotNull(TBTask::getStatus)
-                .eq(TBTask::getResult, TaskResultEnum.ERROR);
+                .eq(TBTask::getResult, TaskResultEnum.ERROR).last("limit 0,10");
         List<TBTask> tbTasks = this.list(tbTaskQueryWrapper);
         List<TBTask> tbTasks = this.list(tbTaskQueryWrapper);
         if (Objects.nonNull(tbTasks) && tbTasks.size() > 0) {
         if (Objects.nonNull(tbTasks) && tbTasks.size() > 0) {
             for (TBTask tbTask : tbTasks) {
             for (TBTask tbTask : tbTasks) {

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

@@ -142,7 +142,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         } else if (Objects.nonNull(examDetailIds)) {
         } else if (Objects.nonNull(examDetailIds)) {
             examDetailQueryWrapper.lambda().in(ExamDetail::getId, examDetailIds);
             examDetailQueryWrapper.lambda().in(ExamDetail::getId, examDetailIds);
         }
         }
-        examDetailQueryWrapper.lambda().set(ExamDetail::getStatus, ExamDetailStatusEnum.NEW);
+        examDetailQueryWrapper.lambda().set(ExamDetail::getStatus, ExamDetailStatusEnum.NEW)
+                .set(ExamDetail::getAttachmentPath, null);
         detailService.update(examDetailQueryWrapper);
         detailService.update(examDetailQueryWrapper);
 
 
         //所有考场都撤回,印刷任务状态改为就绪
         //所有考场都撤回,印刷任务状态改为就绪