Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java

@@ -150,7 +150,7 @@ public class TEExamController {
                         s.setUpdateId(tbUser.getId());
                         teExamActivityService.saveOrUpdate(s);
                     });
-                    for(TEExamActivity ac:teExamActivityList){
+                    for (TEExamActivity ac : teExamActivityList) {
                         teExamActivityService.updateExamActivityCacheBean(ac.getId());
                     }
                     if (Objects.nonNull(teExam.getForceFinish()) && teExam.getForceFinish().intValue() == 1) {
@@ -314,8 +314,8 @@ public class TEExamController {
                     s.setUpdateTime(null);
                     s.setCode(String.valueOf(redisUtil.getRedisActivityCodeSequence(teExam.getId())));
                 });
-                for(TEExamActivity ac:teExamActivityList){
-                	teExamActivityService.saveOrUpdate(ac);
+                for (TEExamActivity ac : teExamActivityList) {
+                    teExamActivityService.saveOrUpdate(ac);
                 }
             }
         } catch (Exception e) {
@@ -452,7 +452,7 @@ public class TEExamController {
                 });
             }
             notComplete = allCount - alreadyComplete.size();
-            BigDecimal completionRate = new BigDecimal(alreadyComplete.size()).divide(new BigDecimal(allCount)).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal completionRate = new BigDecimal(alreadyComplete.size()).divide(new BigDecimal(allCount), 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
             examPropCountDto = new ExamPropCountDto(examId, allCount, prepareCount.get(), examCount.get(), clientWebsocketStatusCount.get(), monitorStatusSourceCount.get(), alreadyComplete.size(), notComplete, completionRate);
         } else {
             examPropCountDto = new ExamPropCountDto(examId, 0, 0, 0, 0, 0, 0, 0, new BigDecimal(0));

themis-business/src/main/java/com/qmth/themis/business/service/impl/TBAttachmentServiceImpl.java

@@ -72,7 +72,7 @@ public class TBAttachmentServiceImpl extends ServiceImpl<TBAttachmentMapper, TBA
             long size = file.getSize();
             BigDecimal b = new BigDecimal(size);
             BigDecimal num = new BigDecimal(1024);
-            b = b.divide(num).divide(num).setScale(2, BigDecimal.ROUND_HALF_UP);
+            b = b.divide(num, 2, BigDecimal.ROUND_HALF_UP).divide(num, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP);
             if (b.doubleValue() > 200) {
                 throw new BusinessException("文件大小不能超过200MB");
             }
@@ -151,7 +151,7 @@ public class TBAttachmentServiceImpl extends ServiceImpl<TBAttachmentMapper, TBA
         }
         return tbAttachment;
     }
-    
+
     @Override
     @Transactional
     public TBAttachment saveAttachment(File file, String md5, String path, Map<String, Object> map, Long orgId, Long userId) throws IOException {