Merge branch 'dev_v3.3.2' into dev_v3.3.3

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

@@ -921,13 +921,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             List<PaperInfoVo> paperInfoVoList = ExamTaskUtil.parsePaperAttachmentPath(examTaskDetailPdfDownloadDto.getPaperAttachmentIds());
             // 试卷
             for (PaperInfoVo paperInfoVo : paperInfoVoList) {
-                String originalFileName = paperInfoVo.getFilename().substring(0, paperInfoVo.getFilename().lastIndexOf("."));
                 Long attachmentId = Long.valueOf(paperInfoVo.getAttachmentId());
                 String name = paperInfoVo.getName();
                 if (Objects.nonNull(attachmentId)) {
                     BasicAttachment attachment = basicAttachmentService.getById(attachmentId);
                     Optional.ofNullable(attachment).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("附件数据异常"));
-                    String fileName = dirPath + "试卷" + SystemConstant.HYPHEN + name + SystemConstant.HYPHEN + originalFileName + attachment.getType();
+                    String fileName = dirPath + "试卷" + SystemConstant.HYPHEN + name  + attachment.getType();
                     fileUploadService.downloadFile(attachment, fileName);
                 }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/kit/TikuUtils.java

@@ -118,7 +118,7 @@ public class TikuUtils {
             if (file.exists()) {
                 return file;
             } else {
-                throw ExceptionResultEnum.ERROR.exception("试卷结构包获取失败");
+                throw ExceptionResultEnum.ERROR.exception("请在题库管理模块，试卷列表里预览试卷，核对试卷内容确认无误后点击确定");
             }
         } catch (Exception e) {
             throw ExceptionResultEnum.ERROR.exception(e.getMessage());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -1281,15 +1281,8 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             }
         }
 
-        Collections.sort(list, (o1, o2) -> {
-            if (o1.getMainNumber() > o2.getMainNumber()) {
-                return 1;
-            } else if (o1.getSubNumber() < o2.getSubNumber()) {
-                return -1;
-            } else {
-                return 0;
-            }
-        });
+        list.sort(Comparator.comparingInt(QuestionVo::getMainNumber).thenComparingInt(QuestionVo::getSubNumber));
+
         for (QuestionVo vo : list) {
             double total = vo.getStudentCount();
             vo.setScoreRate(Calculator.divide(vo.getScoreCount(), total, 2));
@@ -1336,7 +1329,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
         if (list.size() != 0 && totalCount != 0) {
             rate = Calculator.divide(count, totalCount, 2);
         }
-        ScoreRangeVo vo = new ScoreRangeVo(count, start, end, rate * 100);
+        ScoreRangeVo vo = new ScoreRangeVo(count, start, end, Calculator.multiply(rate, 100, 0));
         return vo;
     }