3.3.3 update

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

@@ -857,25 +857,25 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         activitiService.taskApprove(map);
 
         // 清除cardId
-        ExamTaskDetail examTaskDetail = examTaskDetailService.getByExamTaskId(examTask.getId());
-        String paperAttachmentIds = examTaskDetail.getPaperAttachmentIds();
-        if (StringUtils.isNotBlank(paperAttachmentIds)) {
-            List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(paperAttachmentIds);
-            List<String> cardIds = new ArrayList<>();
-            for (PaperInfoVo paperInfoVo : paperInfoVoList) {
-                cardIds.add(paperInfoVo.getCardId());
-                paperInfoVo.setCardId(null);
-                paperInfoVo.setCardType(null);
-                paperInfoVo.setCardTitle(null);
-            }
-            examTaskDetail.setPaperAttachmentIds(JSON.toJSONString(paperInfoVoList));
-            examTaskDetailService.updateById(examTaskDetail);
-
-            // 更新题卡为未使用
-            UpdateWrapper<ExamCard> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.lambda().set(ExamCard::getUsed, false).in(ExamCard::getId, cardIds);
-            examCardService.update(updateWrapper);
-        }
+//        ExamTaskDetail examTaskDetail = examTaskDetailService.getByExamTaskId(examTask.getId());
+//        String paperAttachmentIds = examTaskDetail.getPaperAttachmentIds();
+//        if (StringUtils.isNotBlank(paperAttachmentIds)) {
+//            List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(paperAttachmentIds);
+//            List<String> cardIds = new ArrayList<>();
+//            for (PaperInfoVo paperInfoVo : paperInfoVoList) {
+//                cardIds.add(paperInfoVo.getCardId());
+//                paperInfoVo.setCardId(null);
+//                paperInfoVo.setCardType(null);
+//                paperInfoVo.setCardTitle(null);
+//            }
+//            examTaskDetail.setPaperAttachmentIds(JSON.toJSONString(paperInfoVoList));
+//            examTaskDetailService.updateById(examTaskDetail);
+//
+//            // 更新题卡为未使用
+//            UpdateWrapper<ExamCard> updateWrapper = new UpdateWrapper<>();
+//            updateWrapper.lambda().set(ExamCard::getUsed, false).in(ExamCard::getId, cardIds);
+//            examCardService.update(updateWrapper);
+//        }
         return map;
     }
 
@@ -1941,9 +1941,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         TFFlowApprove tfFlowApprove = tfFlowApproveService.getOne(queryWrapper);
         //审核状态
         if (tfFlowApprove != null && !tfFlowApprove.getStatus().equals(FlowStatusEnum.START) && !tfFlowApprove.getStatus().equals(FlowStatusEnum.REJECT) && !tfFlowApprove.getStatus().equals(FlowStatusEnum.CANCEL)) {
-            throw ExceptionResultEnum.ERROR.exception("当前状态无法删除");
+            throw ExceptionResultEnum.ERROR.exception(tfFlowApprove.getStatus().getTitle() + "状态无法删除");
         }
-        this.removeById(id);
+        // 删除命题任务及试卷信息
         this.removeByExamTaskId(id);
         // 删除考场信息
         examDetailService.deleteByExamIdAndPaperNumber(examTask.getSchoolId(), examTask.getExamId(), examTask.getPaperNumber());