3.3.0 fix

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

@@ -841,7 +841,7 @@ public class ActivitiServiceImpl implements ActivitiService {
             String paperAttachmentIds = examTaskDetail.getPaperAttachmentIds();
             if (StringUtils.isNotBlank(paperAttachmentIds)) {
                 List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(paperAttachmentIds);
-                List<Long> cardIds = new ArrayList<>();
+                List<String> cardIds = new ArrayList<>();
                 for (PaperInfoVo paperInfoVo : paperInfoVoList) {
                     cardIds.add(paperInfoVo.getCardId());
                     paperInfoVo.setCardId(null);

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

@@ -131,8 +131,8 @@ public class DownloadServiceImpl implements DownloadService {
                 }
 
                 // 试卷附件id
-                Long attachmentId = paperInfo.getAttachmentId();
-                if (attachmentId != null) {
+                String attachmentId = paperInfo.getAttachmentId();
+                if (StringUtils.isNotBlank(attachmentId)) {
                     // 试卷
                     BasicAttachment attachment = basicAttachmentMapper.selectById(attachmentId);
                     if (attachment == null) {
@@ -144,9 +144,9 @@ public class DownloadServiceImpl implements DownloadService {
                 }
 
                 // 题卡id
-                Long cardId = paperInfo.getCardId();
+                String cardId = paperInfo.getCardId();
                 // 题卡
-                if (cardId != null) {
+                if (StringUtils.isNotBlank(cardId)) {
                     ExamCard examCard = examCardMapper.selectById(cardId);
 
                     String cardPath = rootPath + File.separator + examTask.getCourseName().replaceAll(" ", "") + SystemConstant.HYPHEN + examTask.getCourseCode() + File.separator + examTask.getPaperNumber();
@@ -252,8 +252,8 @@ public class DownloadServiceImpl implements DownloadService {
                 }
                 // 试卷信息
                 for (PaperInfoVo paperInfoVo : paperInfoVos) {
-                    Long cardId = paperInfoVo.getCardId();
-                    Long attachmentId = paperInfoVo.getAttachmentId();
+                    String cardId = paperInfoVo.getCardId();
+                    String attachmentId = paperInfoVo.getAttachmentId();
                     BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
                     String paperName = null;
                     String paperSuffix = null;
@@ -288,7 +288,7 @@ public class DownloadServiceImpl implements DownloadService {
                     cell.setCourseName(courseName);
                     cell.setPaperNumber(paperNumber);
                     // 题卡
-                    cell.setExamCardId(cardId);
+                    cell.setExamCardId(Long.valueOf(cardId));
                     cell.setCardRuleId(cardRuleId);
                     // 试卷
                     cell.setPaperType(paperType);

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

@@ -825,7 +825,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 
         // 将旧题卡更新为未绑定
         List<PaperInfoVo> oldPaperAttachmentIdsJson = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetailTemp.getPaperAttachmentIds());
-        List<Long> oldCardIds = oldPaperAttachmentIdsJson.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> m.getCardId()).collect(Collectors.toList());
+        List<Long> oldCardIds = oldPaperAttachmentIdsJson.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> Long.parseLong(m.getCardId())).collect(Collectors.toList());
         for (Long cardId : oldCardIds) {
             UpdateWrapper<ExamCard> cardUpdateWrapper = new UpdateWrapper<>();
             cardUpdateWrapper.lambda().set(ExamCard::getUsed, false).eq(ExamCard::getId, cardId);
@@ -834,7 +834,7 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
 
         // 将新题卡更新为已绑定
         List<PaperInfoVo> newPaperAttachmentIdsJson = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetail.getPaperAttachmentIds());
-        List<Long> cardIds = newPaperAttachmentIdsJson.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> m.getCardId()).collect(Collectors.toList());
+        List<Long> cardIds = newPaperAttachmentIdsJson.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> Long.valueOf(m.getCardId())).collect(Collectors.toList());
         for (Long cardId : cardIds) {
             UpdateWrapper<ExamCard> cardUpdateWrapper = new UpdateWrapper<>();
             cardUpdateWrapper.lambda().set(ExamCard::getUsed, true).eq(ExamCard::getId, cardId);

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

@@ -860,8 +860,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
         // 将题卡更新为已绑定
         List<PaperInfoVo> paperAttachmentIdsJson = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetail.getPaperAttachmentIds());
-        List<Long> cardIds = paperAttachmentIdsJson.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> m.getCardId()).collect(Collectors.toList());
-        for (Long cardId : cardIds) {
+        List<String> cardIds = paperAttachmentIdsJson.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> m.getCardId()).collect(Collectors.toList());
+        for (String cardId : cardIds) {
             UpdateWrapper<ExamCard> cardUpdateWrapper = new UpdateWrapper<>();
             cardUpdateWrapper.lambda().set(ExamCard::getUsed, true).eq(ExamCard::getId, cardId);
             examCardService.update(cardUpdateWrapper);
@@ -902,7 +902,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         String paperAttachmentIds = examTaskDetail.getPaperAttachmentIds();
         if (StringUtils.isNotBlank(paperAttachmentIds)) {
             List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(paperAttachmentIds);
-            List<Long> cardIds = new ArrayList<>();
+            List<String> cardIds = new ArrayList<>();
             for (PaperInfoVo paperInfoVo : paperInfoVoList) {
                 cardIds.add(paperInfoVo.getCardId());
                 paperInfoVo.setCardId(null);
@@ -959,7 +959,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetailPdfDownloadDto.getPaperAttachmentIds());
             // 试卷
             for (PaperInfoVo paperInfoVo : paperInfoVoList) {
-                Long attachmentId = paperInfoVo.getAttachmentId();
+                Long attachmentId = Long.valueOf(paperInfoVo.getAttachmentId());
                 String name = paperInfoVo.getName();
                 if (Objects.nonNull(attachmentId)) {
                     BasicAttachment attachment = basicAttachmentService.getById(attachmentId);
@@ -978,7 +978,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 }
 
                 // 题卡
-                Long cardId = paperInfoVo.getCardId();
+                Long cardId = Long.valueOf(paperInfoVo.getCardId());
                 if (cardId != null) {
                     ExamCard examCard = examCardService.getById(cardId);
 
@@ -1215,7 +1215,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             if (StringUtils.isNotBlank(paperAttachmentIds)) {
                 List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(paperAttachmentIds);
                 for (PaperInfoVo paperInfoVo : paperInfoVoList) {
-                    Long cardId = paperInfoVo.getCardId();
+                    Long cardId = Long.valueOf(paperInfoVo.getCardId());
                     ExamCard examCard = examCardService.getById(cardId);
                     if (examCard.getType().equals(CardTypeEnum.CUSTOM) || (examCard.getType().equals(CardTypeEnum.GENERIC) && examCard.getCreateMethod().equals(CardCreateMethodEnum.STANDARD))) {
                         UpdateWrapper<ExamCard> updateWrapper = new UpdateWrapper<>();
@@ -1351,8 +1351,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             // 将题卡更新为已绑定
             String paperAttachmentIds = examTaskDetail.getPaperAttachmentIds();
             List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(paperAttachmentIds);
-            List<Long> cardIds = paperInfoVoList.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> m.getCardId()).collect(Collectors.toList());
-            for (Long cardId : cardIds) {
+            List<String> cardIds = paperInfoVoList.stream().filter(m -> CardTypeEnum.CUSTOM.name().equals(m.getCardType())).map(m -> m.getCardId()).collect(Collectors.toList());
+            for (String cardId : cardIds) {
                 UpdateWrapper<ExamCard> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.lambda().set(ExamCard::getUsed, true).eq(ExamCard::getId, cardId);
                 examCardService.update(updateWrapper);
@@ -1461,10 +1461,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
                         Set<String> classNameSet = new HashSet<>();
                         for (ExamStudent examStudent : examStudents) {
-                            if (StringUtils.isNotBlank(examStudent.getClazzName())) {
+                            if (StudentClazzEnum.BASIC_CLAZZ.equals(examStudent.getStudentClazzType()) && StringUtils.isNotBlank(examStudent.getClazzName())) {
                                 classNameSet.add(examStudent.getClazzName());
                             }
-                            if (StringUtils.isNotBlank(examStudent.getTeachClazzName())) {
+                            if (StudentClazzEnum.TEACH_CLAZZ.equals(examStudent.getStudentClazzType()) && StringUtils.isNotBlank(examStudent.getTeachClazzName())) {
                                 classNameSet.add(examStudent.getTeachClazzName());
                             }
                         }
@@ -2158,7 +2158,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetail.getPaperAttachmentIds());
         for (PaperInfoVo paperInfoVo : paperInfoVoList) {
             // 校验试卷必须绑定题卡
-            Long cardId = paperInfoVo.getCardId();
+            Long cardId = Long.valueOf(paperInfoVo.getCardId());
             if (Objects.isNull(cardId)) {
                 throw ExceptionResultEnum.ERROR.exception("没有绑定题卡");
             }

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

@@ -272,7 +272,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetail.getPaperAttachmentIds());
             ExamCard examCard;
             for (PaperInfoVo paperInfoVo : paperInfoVoList) {
-                Long cardId = paperInfoVo.getCardId();
+                Long cardId = Long.valueOf(paperInfoVo.getCardId());
                 if (Objects.nonNull(cardId)) {
                     examCard = examCardService.getById(cardId);
                     if (Objects.isNull(examCard)) {
@@ -1194,7 +1194,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
                 for (PaperInfoVo paperInfoVo : paperInfoVos) {
                     // 下载试卷
-                    Long attachmentId = paperInfoVo.getAttachmentId();
+                    Long attachmentId = Long.valueOf(paperInfoVo.getAttachmentId());
                     if (Objects.nonNull(attachmentId)) {
                         BasicAttachment paperAttachment = basicAttachmentService.getById(attachmentId);
                         JSONObject jsonObject = JSONObject.parseObject(paperAttachment.getPath());
@@ -1208,7 +1208,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     }
 
                     // 下载题卡
-                    Long cardId = paperInfoVo.getCardId();
+                    Long cardId = Long.valueOf(paperInfoVo.getCardId());
                     if (cardId != null) {
                         String paperType = paperInfoVo.getName();
                         ExamCard examCard = examCardService.getById(cardId);
@@ -1334,7 +1334,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         throw ExceptionResultEnum.ERROR.exception("试卷信息不存在");
                     }
                     for (PaperInfoVo paperInfoVo : paperInfoVoList) {
-                        Long attachmentId = paperInfoVo.getAttachmentId();
+                        Long attachmentId = Long.valueOf(paperInfoVo.getAttachmentId());
                         String name = paperInfoVo.getName();
                         if (Objects.nonNull(attachmentId)) {
                             BasicAttachment attachment = basicAttachmentService.getById(attachmentId);
@@ -1343,7 +1343,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                                 sourceFileList.add(paperFile);
                             }
                         }
-                        Long cardId = paperInfoVo.getCardId();
+                        Long cardId = Long.valueOf(paperInfoVo.getCardId());
                         ExamCard examCard = examCardService.getById(cardId);
                         Optional.ofNullable(examCard).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("找不到答题卡"));
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -1058,8 +1058,8 @@ public class CreatePdfUtil {
         PaperPdfDto paperPdfDto;
         List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetail.getPaperAttachmentIds());
         for (PaperInfoVo paperInfoVo : paperInfoVoList) {
-            Long attachmentId = paperInfoVo.getAttachmentId();
-            if (Objects.nonNull(attachmentId)) {
+            String attachmentId = paperInfoVo.getAttachmentId();
+            if (StringUtils.isNotBlank(attachmentId)) {
                 BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
                 Optional.ofNullable(basicAttachment).orElseThrow(() -> ExceptionResultEnum.ATTACHMENT_IS_NULL.exception("所在路径不存在"));
 

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

@@ -96,7 +96,7 @@ public class WorkController {
             ExamTaskDetail examTaskDetail = examTaskDetailService.findByExamIdAndCourseCodeAndPaperNumber(schoolId, record.getExamId(), record.getCourseCode(), record.getPaperNumber());
             List<PaperInfoVo> paperInfoVos = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetail.getPaperAttachmentIds(), record.getPaperType());
             if (CollectionUtils.isNotEmpty(paperInfoVos)) {
-                record.setCardId(paperInfoVos.get(0).getCardId());
+                record.setCardId(Long.valueOf(paperInfoVos.get(0).getCardId()));
             }
         }
         return ResultUtil.ok(markSettingDtoIPage);

distributed-print/src/main/java/com/qmth/distributed/print/api/mark/MarkSettingController.java

@@ -68,7 +68,7 @@ public class MarkSettingController {
             ExamTaskDetail examTaskDetail = examTaskDetailService.findByExamIdAndCourseCodeAndPaperNumber(schoolId, record.getExamId(), record.getCourseCode(), record.getPaperNumber());
             List<PaperInfoVo> paperInfoVos = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetail.getPaperAttachmentIds(), record.getPaperType());
             if (CollectionUtils.isNotEmpty(paperInfoVos)) {
-                record.setCardId(paperInfoVos.get(0).getCardId());
+                record.setCardId(Long.valueOf(paperInfoVos.get(0).getCardId()));
             }
         }
         return ResultUtil.ok(markSettingDtoIPage);

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/vo/PaperInfoVo.java

@@ -3,8 +3,8 @@ package com.qmth.teachcloud.common.bean.vo;
 public class PaperInfoVo {
 
     private String name;
-    private Long attachmentId;
-    private Long cardId;
+    private String attachmentId;
+    private String cardId;
     private String cardType;
     private String createMethod;
     private String cardTitle;
@@ -23,19 +23,19 @@ public class PaperInfoVo {
         this.name = name;
     }
 
-    public Long getAttachmentId() {
+    public String getAttachmentId() {
         return attachmentId;
     }
 
-    public void setAttachmentId(Long attachmentId) {
+    public void setAttachmentId(String attachmentId) {
         this.attachmentId = attachmentId;
     }
 
-    public Long getCardId() {
+    public String getCardId() {
         return cardId;
     }
 
-    public void setCardId(Long cardId) {
+    public void setCardId(String cardId) {
         this.cardId = cardId;
     }
 

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -164,7 +164,7 @@ public class PrintFinishServiceImpl implements PrintFinishService {
     public void insertScanAnswerCard(ExamDetailCourseInitMarkDto dto, PaperInfoVo paperInfoVo, String content) {
         ExamCard examCard = examCardService.getById(paperInfoVo.getCardId());
         if (examCard != null) {
-            ScanAnswerCard scanAnswerCard = scanAnswerCardService.getByExamIdAndCoursePaperIdAndCardId(dto.getExamId(), dto.getCoursePaperId(), paperInfoVo.getCardId());
+            ScanAnswerCard scanAnswerCard = scanAnswerCardService.getByExamIdAndCoursePaperIdAndCardId(dto.getExamId(), dto.getCoursePaperId(), Long.valueOf(paperInfoVo.getCardId()));
             if (scanAnswerCard != null) {
                 return;
             }
@@ -192,7 +192,7 @@ public class PrintFinishServiceImpl implements PrintFinishService {
                     scanAnswerCard.setPaperNumber(dto.getPaperNumber());
                     scanAnswerCard.setCoursePaperId(dto.getCoursePaperId());
                     scanAnswerCard.setPaperType(dto.getPaperType());
-                    scanAnswerCard.setCardId(paperInfoVo.getCardId());
+                    scanAnswerCard.setCardId(Long.valueOf(paperInfoVo.getCardId()));
                     scanAnswerCard.setNumber(number);
                     scanAnswerCard.setSource(CardSource.WEB);
                     scanAnswerCard.setUri(uploadPath);