Merge branch 'dev_v2.2.0' into release_v2.2.0

merge

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

@@ -168,6 +168,7 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
     @Override
     @Transactional
     public void freshenJoinData(SysUser sysUser, Set<String> batchNoSet) {
+        TCStatisticsService tcStatisticsService = SpringContextHolder.getBean(TCStatisticsService.class);
         for (String batchNo : batchNoSet) {
             List<TCStatisticsTemp> tcStatisticsTempList = tcStatisticsTempService.findByBatchNoJoin(sysUser.getSchoolId(), batchNo);
             if (Objects.nonNull(tcStatisticsTempList) && tcStatisticsTempList.size() > 0) {
@@ -192,7 +193,6 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
                 }
                 List<TCStatisticsDto> tcStatisticsDtoList = this.findByBatchNoCountJoin(sysUser.getSchoolId(), batchNoNew, orgIds);
                 if (Objects.nonNull(tcStatisticsDtoList) && tcStatisticsDtoList.size() > 0) {
-                    TCStatisticsService tcStatisticsService = SpringContextHolder.getBean(TCStatisticsService.class);
                     QueryWrapper<TCStatistics> tcStatisticsQueryWrapper = new QueryWrapper<>();
                     tcStatisticsQueryWrapper.lambda().eq(TCStatistics::getBatchNo, batchNo);
                     tcStatisticsService.remove(tcStatisticsQueryWrapper);