bug

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

@@ -1330,7 +1330,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 throw ExceptionResultEnum.ERROR.exception("客服制卡方式，不能切换");
             }
 
-            if (MakeMethodEnum.SELF.equals(examCard.getMakeMethod())) {
+            // 删除自建题卡
+            if (!MakeMethodEnum.SELECT.name().equals(examTaskDetail.getMakeMethod())) {
                 UpdateWrapper<ExamCardDetail> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.lambda().eq(ExamCardDetail::getCardId, examTaskDetail.getCardId());
                 examCardDetailService.remove(updateWrapper);
@@ -1368,7 +1369,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         this.removeById(examTaskId);
         ExamTaskDetail examTaskDetail = examTaskDetailService.getByExamTaskId(examTaskId);
         if (examTaskDetail != null) {
-            if (examTaskDetail.getCardId() != null) {
+            if (examTaskDetail.getCardId() != null && !MakeMethodEnum.SELECT.name().equals(examTaskDetail.getMakeMethod())) {
                 examCardService.removeById(examTaskDetail.getCardId());
                 UpdateWrapper<ExamCardDetail> examCardDetailUpdateWrapper = new UpdateWrapper<>();
                 examCardDetailUpdateWrapper.lambda().eq(ExamCardDetail::getCardId, examTaskDetail.getCardId());
@@ -1675,14 +1676,14 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 //        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         // 1.basicInfo 部分
         ExamTask examTask = this.getById(examTaskId);
-        if (Objects.isNull(examTask)){
+        if (Objects.isNull(examTask)) {
             throw ExceptionResultEnum.ERROR.exception("命题任务不存在");
         }
         String paperNumber = examTask.getPaperNumber();
         String paperName = examTask.getPaperName();
         Long teachingRoomId = examTask.getTeachingRoomId();
-        SysOrg teachingRoom = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getId,teachingRoomId).eq(SysOrg::getType,OrgTypeEnum.TEACHING_ROOM));
-        if (Objects.isNull(teachingRoom)){
+        SysOrg teachingRoom = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getId, teachingRoomId).eq(SysOrg::getType, OrgTypeEnum.TEACHING_ROOM));
+        if (Objects.isNull(teachingRoom)) {
             throw ExceptionResultEnum.ERROR.exception("找不到教研室");
         }
         String teachingRoomName = teachingRoom.getName();
@@ -1694,7 +1695,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         // 2.ExamRoomInfo 部分
         List<ExamRoomInfo> examRoomInfoList = new ArrayList<>();
         List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(paperNumber);
-        if (examPackageDetailDatasource.size() > 0){
+        if (examPackageDetailDatasource.size() > 0) {
             Set<Long> examDetailIdSet = examPackageDetailDatasource.stream().map(ExamPackageDetail::getExamDetailId).collect(Collectors.toSet());
             for (Long examDetailId : examDetailIdSet) {
                 // 一个考场下
@@ -1708,11 +1709,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         .collect(Collectors.toList());
 
                 List<BackupMethodEnum> backupMethodEnums = examPackageDetailCell.stream().map(ExamPackageDetail::getBackupMethod).distinct().collect(Collectors.toList());
-                if (backupMethodEnums.size() != 1 && backupMethodEnums.get(0) != BackupMethodEnum.ROOM){
+                if (backupMethodEnums.size() != 1 && backupMethodEnums.get(0) != BackupMethodEnum.ROOM) {
                     throw ExceptionResultEnum.ERROR.exception("印刷计划试卷备份方式必须按考场");
                 }
                 List<Integer> backupCountList = examPackageDetailCell.stream().map(ExamPackageDetail::getBackupCount).distinct().collect(Collectors.toList());
-                if (backupCountList.size() != 1){
+                if (backupCountList.size() != 1) {
                     throw ExceptionResultEnum.ERROR.exception("印刷计划试卷备份数量异常");
                 }
                 // 试卷该考场备份数量
@@ -1724,10 +1725,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     // 处理考试开始结束时间
                     Long cellStartTime = examPackageDetail.getExamStartTime();
                     Long cellEndTime = examPackageDetail.getExamEndTime();
-                    if (examStartTime == null || cellStartTime < examStartTime){
+                    if (examStartTime == null || cellStartTime < examStartTime) {
                         examStartTime = cellStartTime;
                     }
-                    if (examEndTime == null || cellEndTime > examEndTime){
+                    if (examEndTime == null || cellEndTime > examEndTime) {
                         examEndTime = cellEndTime;
                     }
                     // 处理班级和数量
@@ -1736,8 +1737,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     studentCount = studentCount + studentCellCount;
                     clazzIds = clazzIds + clazzIdCell + separator;
                 }
-                clazzIds = clazzIds.substring(0,clazzIds.length() - separator.length());
-                classNames = basicClazzService.findClazzNamesByClazzIds(clazzIds,separator);
+                clazzIds = clazzIds.substring(0, clazzIds.length() - separator.length());
+                classNames = basicClazzService.findClazzNamesByClazzIds(clazzIds, separator);
                 printCount = studentCount + " + " + backupCount;
 
                 // 组装examRoom
@@ -1751,24 +1752,24 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
         // 3.ApprovalInfo部分
         List<ApprovalInfo> approvalInfoList = new ArrayList<>();
-        ApprovalInfo second = examTaskReviewLogService.findOnePassBySetUp(flowId,2);
-        if (Objects.isNull(second)){
+        ApprovalInfo second = examTaskReviewLogService.findOnePassBySetUp(flowId, 2);
+        if (Objects.isNull(second)) {
             throw ExceptionResultEnum.ERROR.exception("未找到主任级审核记录");
         }
-        ApprovalInfo third = examTaskReviewLogService.findOnePassBySetUp(flowId,3);
-        if (Objects.isNull(third)){
+        ApprovalInfo third = examTaskReviewLogService.findOnePassBySetUp(flowId, 3);
+        if (Objects.isNull(third)) {
             throw ExceptionResultEnum.ERROR.exception("未找到院长级审核记录");
         }
         String secondRemark = second.getRemark();
-        if (SystemConstant.strNotNull(secondRemark)){
+        if (SystemConstant.strNotNull(secondRemark)) {
             secondRemark = "通过，" + secondRemark;
-        }else {
+        } else {
             secondRemark = "通过";
         }
         String thirdRemark = third.getRemark();
-        if (SystemConstant.strNotNull(thirdRemark)){
+        if (SystemConstant.strNotNull(thirdRemark)) {
             thirdRemark = "通过，" + thirdRemark;
-        }else {
+        } else {
             thirdRemark = "通过";
         }
         second.setRemark(secondRemark);
@@ -1798,9 +1799,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Transactional
     @Override
-    public void findExamTaskApprovalPdf(HttpServletResponse response,Long examTaskId, String htmlContext) throws Exception {
+    public void findExamTaskApprovalPdf(HttpServletResponse response, Long examTaskId, String htmlContext) throws Exception {
         ExamTask examTask = this.getById(examTaskId);
-        if (Objects.isNull(examTask)){
+        if (Objects.isNull(examTask)) {
             throw ExceptionResultEnum.ERROR.exception("未找到命题任务");
         }
         String fileName = examTask.getPaperNumber() + "审批表";
@@ -1823,7 +1824,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         } else {
             inputStream = new FileInputStream(new File(pdfPath));
         }
-        ConvertUtil.outputFile(response,inputStream,fileName + SystemConstant.PDF_PREFIX);
+        ConvertUtil.outputFile(response, inputStream, fileName + SystemConstant.PDF_PREFIX);
     }
 
     /**