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

@@ -269,8 +269,11 @@ public class TCStatisticsServiceImpl extends ServiceImpl<TCStatisticsMapper, TCS
         List<TCStatistics> tcStatisticsList = tcStatisticsService.listByIds(ids);
         if (Objects.nonNull(tcStatisticsList) && tcStatisticsList.size() > 0) {
             Set<String> batchNoSet = tcStatisticsList.stream().map(s -> s.getBatchNo()).collect(Collectors.toSet());
-            tcStatisticsService.removeOldJoinData(batchNoSet);
+            QueryWrapper<TCStatisticsTemp> tcStatisticsTempQueryWrapper = new QueryWrapper<>();
+            tcStatisticsTempQueryWrapper.lambda().in(TCStatisticsTemp::getBatchNo, batchNoSet);
+            tcStatisticsTempService.remove(tcStatisticsTempQueryWrapper);
         }
+        tcStatisticsService.removeByIds(ids);
         return ResultUtil.ok(true);
     }
 }