3.3.0 fix

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

@@ -191,9 +191,12 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
     public void resetById(Long id) {
         UpdateWrapper<MarkUserGroup> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().set(MarkUserGroup::getFinishCount, null)
+                .set(MarkUserGroup::getValidCount, null)
                 .set(MarkUserGroup::getAvgScore, null)
                 .set(MarkUserGroup::getAvgSpeed, null)
                 .set(MarkUserGroup::getStdevScore, null)
+                .set(MarkUserGroup::getMaxScore, null)
+                .set(MarkUserGroup::getMinScore, null)
                 .eq(MarkUserGroup::getId, id);
         this.update(updateWrapper);
     }

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

@@ -130,7 +130,9 @@ public class ScanPackageServiceImpl extends ServiceImpl<ScanPackageMapper, ScanP
         QueryWrapper<ScanPackage> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<ScanPackage> lw = wrapper.lambda();
         lw.eq(ScanPackage::getExamId, examId);
-        lw.eq(ScanPackage::getCoursePaperId, coursePaperId);
+        if (StringUtils.isNotBlank(coursePaperId)) {
+            lw.eq(ScanPackage::getCoursePaperId, coursePaperId);
+        }
         lw.orderByAsc(ScanPackage::getPackageNo);
         return this.list(wrapper);
     }
@@ -151,10 +153,16 @@ public class ScanPackageServiceImpl extends ServiceImpl<ScanPackageMapper, ScanP
                     tem.add(sp.getPath());
                 }
                 for (ScanPackageVo vo : iPage.getRecords()) {
-                    List<String> pages = map.get(vo.getPackageCode());
-                    pages = pages.stream().map(m -> teachcloudCommonService.filePreview(m)).collect(Collectors.toList());
-                    vo.setPages(pages);
-                    vo.setPagesCount(pages.size());
+                    for (String packageCode : vo.getPackageCode().split(",")) {
+                        if (!map.containsKey(packageCode)) {
+                            continue;
+                        }
+                        List<String> pages = map.get(packageCode);
+                        pages = pages.stream().map(m -> teachcloudCommonService.filePreview(m)).collect(Collectors.toList());
+                        vo.setPages(pages);
+                        vo.setPagesCount(pages.size());
+                    }
+
                 }
             }
         }